diff --git a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp index e4a37cad..4c258a07 100644 --- a/contrib/bobtoolz/dialogs/dialogs-gtk.cpp +++ b/contrib/bobtoolz/dialogs/dialogs-gtk.cpp @@ -250,7 +250,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); ret = eIDOK; @@ -260,7 +260,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -276,7 +276,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -299,7 +299,7 @@ EMessageBoxReturn DoMessageBox( const char* lpText, const char* lpCaption, EMess gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -383,7 +383,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -538,7 +538,7 @@ EMessageBoxReturn DoPolygonBox( PolygonRS* rs ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -780,7 +780,7 @@ EMessageBoxReturn DoBuildStairsBox( BuildStairsRS* rs ){ w = gtk_button_new_with_label( "OK" ); gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -1025,7 +1025,7 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){ w = gtk_button_new_with_label( "OK" ); gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -1188,7 +1188,7 @@ EMessageBoxReturn DoPathPlotterBox( PathPlotterRS* rs ){ gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDYES ) ); gtk_widget_show( w ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); w = gtk_button_new_with_label( "Disable" ); @@ -1278,7 +1278,7 @@ EMessageBoxReturn DoCTFColourChangeBox(){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -1559,7 +1559,7 @@ EMessageBoxReturn DoResetTextureBox( ResetTextureRS* rs ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -1846,7 +1846,7 @@ EMessageBoxReturn DoTrainThingBox( TrainThingRS* rs ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -1984,7 +1984,7 @@ EMessageBoxReturn DoMakeChainBox( MakeChainRS* rs ){ w = gtk_button_new_with_label( "OK" ); gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp index 2c5be6c2..86d21af8 100644 --- a/contrib/camera/dialogs.cpp +++ b/contrib/camera/dialogs.cpp @@ -134,7 +134,7 @@ static gint ci_new( GtkWidget *widget, gpointer data ){ gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_show( w ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); w = gtk_button_new_with_label( "Cancel" ); @@ -416,7 +416,7 @@ static gint ci_rename( GtkWidget *widget, gpointer data ){ gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_show( w ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); w = gtk_button_new_with_label( "Cancel" ); @@ -563,7 +563,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){ gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_show( w ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); w = gtk_button_new_with_label( "Cancel" ); @@ -906,7 +906,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( eIDOK ) ); gtk_widget_show( w ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); w = gtk_button_new_with_label( "Cancel" ); @@ -1359,7 +1359,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){ w = gtk_button_new_with_label( "Close" ); gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( ci_close ), NULL ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index 44393ea1..8e06fa34 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -117,7 +117,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); ret = IDOK; @@ -127,7 +127,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -143,7 +143,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -166,7 +166,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp index 3ac74f61..ea045b2d 100644 --- a/libs/gtkutil/toolbar.cpp +++ b/libs/gtkutil/toolbar.cpp @@ -35,8 +35,8 @@ void toolbar_append( GtkToolbar* toolbar, GtkButton* button, const char* description ){ gtk_widget_show( GTK_WIDGET( button ) ); gtk_button_set_relief( button, GTK_RELIEF_NONE ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_DEFAULT ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); + gtk_widget_set_can_default( GTK_WIDGET( button ), FALSE ); gtk_toolbar_append_element( toolbar, GTK_TOOLBAR_CHILD_WIDGET, GTK_WIDGET( button ), "", description, "", 0, 0, 0 ); } diff --git a/libs/gtkutil/widget.h b/libs/gtkutil/widget.h index 0ee5465e..4e715b1f 100644 --- a/libs/gtkutil/widget.h +++ b/libs/gtkutil/widget.h @@ -172,7 +172,7 @@ typedef ReferenceCaller WidgetQueueDrawCaller; inline void widget_make_default( GtkWidget* widget ){ - GTK_WIDGET_SET_FLAGS( widget, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( widget, TRUE ); gtk_widget_grab_default( widget ); } diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index 7e698682..0aaabe50 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -87,7 +87,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); ret = IDOK; @@ -97,7 +97,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDOK ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -113,7 +113,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); @@ -136,7 +136,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){ gtk_box_pack_start( GTK_BOX( hbox ), w, TRUE, TRUE, 0 ); gtk_signal_connect( GTK_OBJECT( w ), "clicked", GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( IDYES ) ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( w, TRUE ); gtk_widget_grab_default( w ); gtk_widget_show( w ); diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 610078a3..907aeed8 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1694,7 +1694,7 @@ CamWnd::CamWnd() : gtk_widget_ref( m_gl_widget ); gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - GTK_WIDGET_SET_FLAGS( m_gl_widget, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( m_gl_widget, TRUE ); m_sizeHandler = g_signal_connect( G_OBJECT( m_gl_widget ), "size_allocate", G_CALLBACK( camera_size_allocate ), this ); m_exposeHandler = g_signal_connect( G_OBJECT( m_gl_widget ), "expose_event", G_CALLBACK( camera_expose ), this ); diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp index 737e3cb4..4e8eddff 100644 --- a/radiant/entityinspector.cpp +++ b/radiant/entityinspector.cpp @@ -1734,14 +1734,14 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){ { GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Clear All" ) ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); gtk_widget_show( GTK_WIDGET( button ) ); g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearAllKeyValues ), 0 ); gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 ); } { GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "Delete Key" ) ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); gtk_widget_show( GTK_WIDGET( button ) ); g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearKeyValue ), 0 ); gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 ); @@ -1749,7 +1749,7 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){ { GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "<" ) ); gtk_widget_set_tooltip_text( GTK_WIDGET( button ), "Select targeting entities" ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); gtk_widget_show( GTK_WIDGET( button ) ); g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_selectTargeting ), 0 ); gtk_box_pack_start( hbox, GTK_WIDGET( button ), FALSE, FALSE, 0 ); @@ -1757,7 +1757,7 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){ { GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( ">" ) ); gtk_widget_set_tooltip_text( GTK_WIDGET( button ), "Select targets" ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); gtk_widget_show( GTK_WIDGET( button ) ); g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_selectTargets ), 0 ); gtk_box_pack_start( hbox, GTK_WIDGET( button ), FALSE, FALSE, 0 ); @@ -1765,7 +1765,7 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){ { GtkButton* button = GTK_BUTTON( gtk_button_new_with_label( "<->" ) ); gtk_widget_set_tooltip_text( GTK_WIDGET( button ), "Select connected entities" ); - GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( button ), FALSE ); gtk_widget_show( GTK_WIDGET( button ) ); g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_selectConnected ), 0 ); gtk_box_pack_start( hbox, GTK_WIDGET( button ), FALSE, FALSE, 0 ); @@ -1776,7 +1776,7 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){ gtk_widget_show( GTK_WIDGET( image ) ); gtk_container_add( GTK_CONTAINER( button ), GTK_WIDGET( image ) ); gtk_button_set_relief( GTK_BUTTON( button ), GTK_RELIEF_NONE ); - GTK_WIDGET_UNSET_FLAGS( button, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( button, FALSE ); gtk_box_pack_start( hbox, button, FALSE, FALSE, 0 ); gtk_widget_set_tooltip_text( button, "AutoFocus on Selection" ); gtk_widget_show( button ); diff --git a/radiant/gtktheme.cpp b/radiant/gtktheme.cpp index dfcbe8de..c8930af1 100644 --- a/radiant/gtktheme.cpp +++ b/radiant/gtktheme.cpp @@ -204,7 +204,7 @@ GtkWidget* create_rc_window() { gtk_widget_set_name( main_themelist, "main_themelist" ); gtk_widget_show( main_themelist ); gtk_container_add( GTK_CONTAINER( scrolledwindow3 ), main_themelist ); - GTK_WIDGET_SET_FLAGS( main_themelist, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( main_themelist, TRUE ); gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( main_themelist ), FALSE ); label1234 = gtk_label_new( "Theme" ); @@ -318,13 +318,13 @@ GtkWidget* create_rc_window() { gtk_widget_set_name( main_ok_button, "main_ok_button" ); gtk_widget_show( main_ok_button ); gtk_box_pack_end( GTK_BOX( hbox5 ), main_ok_button, TRUE, TRUE, 4 ); - GTK_WIDGET_SET_FLAGS( main_ok_button, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( main_ok_button, TRUE ); main_cancel_button = gtk_button_new_from_stock( "gtk-cancel" ); gtk_widget_set_name( main_cancel_button, "main_cancel_button" ); gtk_widget_show( main_cancel_button ); gtk_box_pack_end( GTK_BOX( hbox5 ), main_cancel_button, TRUE, TRUE, 4 ); - GTK_WIDGET_SET_FLAGS( main_cancel_button, GTK_CAN_DEFAULT ); + gtk_widget_set_can_default( main_cancel_button, TRUE ); main_reset_button = gtk_button_new(); gtk_widget_set_name( main_reset_button, "main_reset_button" ); diff --git a/radiant/modelwindow.cpp b/radiant/modelwindow.cpp index 9b8b0c07..73f82795 100644 --- a/radiant/modelwindow.cpp +++ b/radiant/modelwindow.cpp @@ -1321,7 +1321,7 @@ GtkWidget* ModelBrowser_constructWindow( GtkWindow* toplevel ){ gtk_widget_ref( w ); gtk_widget_set_events( w, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( w, TRUE ); gtk_table_attach_defaults( GTK_TABLE( table ), w, 1, 2, 0, 1 ); gtk_widget_show( w ); diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index d4e9a516..02c9a5fb 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -908,7 +908,7 @@ GtkWindow* PatchInspector::BuildDialog(){ (GtkAttachOptions)( 0 ), (GtkAttachOptions)( 0 ), 0, 0 ); gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 ); - GTK_WIDGET_UNSET_FLAGS( spin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE ); } { GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); @@ -929,7 +929,7 @@ GtkWindow* PatchInspector::BuildDialog(){ (GtkAttachOptions)( 0 ), (GtkAttachOptions)( 0 ), 0, 0 ); gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 ); - GTK_WIDGET_UNSET_FLAGS( spin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE ); } { GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); @@ -950,7 +950,7 @@ GtkWindow* PatchInspector::BuildDialog(){ (GtkAttachOptions)( 0 ), (GtkAttachOptions)( 0 ), 0, 0 ); gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 ); - GTK_WIDGET_UNSET_FLAGS( spin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE ); } { GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); @@ -971,7 +971,7 @@ GtkWindow* PatchInspector::BuildDialog(){ (GtkAttachOptions)( 0 ), (GtkAttachOptions)( 0 ), 0, 0 ); gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 ); - GTK_WIDGET_UNSET_FLAGS( spin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE ); } { GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); @@ -992,7 +992,7 @@ GtkWindow* PatchInspector::BuildDialog(){ (GtkAttachOptions)( 0 ), (GtkAttachOptions)( 0 ), 0, 0 ); gtk_widget_set_usize( GTK_WIDGET( spin ), 16, -2 ); - GTK_WIDGET_UNSET_FLAGS( spin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( GTK_WIDGET( spin ), FALSE ); } } GtkHBox* hbox2 = GTK_HBOX( gtk_hbox_new( TRUE, 5 ) ); diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp index cebb23f6..7f648f5f 100644 --- a/radiant/plugintoolbar.cpp +++ b/radiant/plugintoolbar.cpp @@ -84,8 +84,8 @@ inline GtkToolbarChildType gtktoolbarchildtype_for_toolbarbuttontype( IToolbarBu void toolbar_insert( GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data ){ GtkWidget* widget = gtk_toolbar_append_element( toolbar, gtktoolbarchildtype_for_toolbarbuttontype( type ), 0, text, tooltip, "", GTK_WIDGET( new_plugin_image( icon ) ), handler, data ); if( type != IToolbarButton::eSpace ){ - GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_FOCUS ); - GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_DEFAULT ); + gtk_widget_set_can_focus( widget, FALSE ); + gtk_widget_set_can_default( widget, FALSE ); } } diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index 2c38ba6b..2e4ea048 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -1234,7 +1234,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){ // --> Dunno, but this stuff may be necessary... (Looks like it!) gtk_widget_ref( TexTool::g_textoolWin ); gtk_widget_set_events( TexTool::g_textoolWin, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ); - GTK_WIDGET_SET_FLAGS( TexTool::g_textoolWin, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( TexTool::g_textoolWin, TRUE ); // <-- end stuff... gtk_widget_show( TexTool::g_textoolWin ); gtk_widget_set_usize( TexTool::g_textoolWin, -1, 240 ); //Yeah! diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 6dbf8b38..a2c62b0b 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -2155,7 +2155,7 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){ gtk_widget_ref( w ); gtk_widget_set_events( w, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - GTK_WIDGET_SET_FLAGS( w, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( w, TRUE ); gtk_table_attach_defaults( GTK_TABLE( table ), w, 1, 2, 1, 2 ); gtk_widget_show( w ); diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index d857f5ed..d52b2711 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -715,7 +715,7 @@ XYWnd::XYWnd() : gtk_widget_ref( m_gl_widget ); gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - GTK_WIDGET_SET_FLAGS( m_gl_widget, GTK_CAN_FOCUS ); + gtk_widget_set_can_focus( m_gl_widget, TRUE ); m_sizeHandler = g_signal_connect( G_OBJECT( m_gl_widget ), "size_allocate", G_CALLBACK( xywnd_size_allocate ), this ); m_exposeHandler = g_signal_connect( G_OBJECT( m_gl_widget ), "expose_event", G_CALLBACK( xywnd_expose ), this );