diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 2f35829e..c6ce5c98 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -724,14 +724,14 @@ static void main_go( GtkWidget *widget, gpointer data ){ if ( NH < 1 || NH > MAX_ROWS ) { sprintf( Text, "The number of divisions must be > 0 and no greater than %d.", MAX_ROWS ); g_FuncTable.m_pfnMessageBox( g_pWnd, Text, "GenSurf", eMB_OK, eMB_ICONWARNING ); - gtk_notebook_set_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); return; } if ( NV < 1 || NV > MAX_ROWS ) { sprintf( Text, "The number of divisions must be > 0 and no greater than %d.", MAX_ROWS ); g_FuncTable.m_pfnMessageBox( g_pWnd, Text, "GenSurf", eMB_OK, eMB_ICONWARNING ); - gtk_notebook_set_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); return; } @@ -739,7 +739,7 @@ static void main_go( GtkWidget *widget, gpointer data ){ g_FuncTable.m_pfnMessageBox( g_pWnd, "The \"lower-left\" values must be less than " "the corresponding \"upper-right\" values in " "the \"Extent\" box.","GenSurf", eMB_OK, eMB_ICONWARNING ); - gtk_notebook_set_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); return; } @@ -747,13 +747,13 @@ static void main_go( GtkWidget *widget, gpointer data ){ g_FuncTable.m_pfnMessageBox( g_pWnd,"The \"lower-left\" values must be less than " "the corresponding \"upper-right\" values in " "the \"Extent\" box.","GenSurf", eMB_OK, eMB_ICONWARNING ); - gtk_notebook_set_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); return; } if ( !strlen( Texture[Game][0] ) ) { g_FuncTable.m_pfnMessageBox( g_pWnd, "You must supply a texture name.", "GenSurf", eMB_OK, eMB_ICONWARNING ); - gtk_notebook_set_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( notebook ), EXTENTS_TAB ); return; } diff --git a/libs/gtkutil/menu.cpp b/libs/gtkutil/menu.cpp index 11cb075e..70cd3106 100644 --- a/libs/gtkutil/menu.cpp +++ b/libs/gtkutil/menu.cpp @@ -126,9 +126,9 @@ GtkCheckMenuItem* create_check_menu_item_with_mnemonic( GtkMenu* menu, const cha GtkRadioMenuItem* new_radio_menu_item_with_mnemonic( GSList** group, const char* mnemonic, const Callback& callback ){ GtkRadioMenuItem* item = GTK_RADIO_MENU_ITEM( gtk_radio_menu_item_new_with_mnemonic( *group, mnemonic ) ); if ( *group == 0 ) { - gtk_check_menu_item_set_state( GTK_CHECK_MENU_ITEM( item ), TRUE ); + gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( item ), TRUE ); } - *group = gtk_radio_menu_item_group( item ); + *group = gtk_radio_menu_item_get_group( item ); gtk_widget_show( GTK_WIDGET( item ) ); check_menu_item_connect_callback( GTK_CHECK_MENU_ITEM( item ), callback ); return item; diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp index 517a624b..a8aad292 100644 --- a/radiant/pluginmenu.cpp +++ b/radiant/pluginmenu.cpp @@ -113,11 +113,11 @@ public: } void PluginsMenu_clear(){ - GList* lst = g_list_find( gtk_container_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) ); + GList* lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) ); while ( lst->next ) { gtk_container_remove( GTK_CONTAINER( g_plugins_menu ), GTK_WIDGET( lst->next->data ) ); - lst = g_list_find( gtk_container_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) ); + lst = g_list_find( gtk_container_get_children( GTK_CONTAINER( g_plugins_menu ) ), GTK_WIDGET( g_plugins_menu_separator ) ); } } diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 3286be28..5c9f2355 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -826,7 +826,7 @@ GtkWindow* PrefsDlg::BuildDialog(){ } } - gtk_notebook_set_page( GTK_NOTEBOOK( m_notebook ), 0 ); + gtk_notebook_set_current_page( GTK_NOTEBOOK( m_notebook ), 0 ); return dialog; } diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index f74aa203..b5b76a8a 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1940,7 +1940,7 @@ void TextureBrowser_toggleSearchButton(){ gtk_widget_show_all( g_TextureBrowser.m_search_button ); } else { - gtk_widget_hide_all( g_TextureBrowser.m_search_button ); + gtk_widget_hide( g_TextureBrowser.m_search_button ); } }