quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk_notebook_set_page -> gtk_notebook_set_current_page

Browse Source 
gtk_container_children -> gtk_container_get_children
gtk_notebook_set_page -> gtk_notebook_set_current_page
gtk_widget_hide_all -> gtk_widget_hide
gtk_check_menu_item_set_state -> gtk_check_menu_item_set_active
gtk_radio_menu_item_group -> gtk_radio_menu_item_get_group
This commit is contained in:
Garux 2020-05-22 00:23:41 +03:00
parent dac8fd48a3
commit 495e90e6a9
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/gtkgensurf/gendlgs.cpp
View File

@ -724,14 +724,14 @@ static void main_go( GtkWidget *widget, gpointer data ){
if ( NH < 1 || NH > MAX_ROWS ) { if ( NH < 1 || NH > MAX_ROWS ) {
sprintf( Text, "The number of divisions must be > 0 and no greater than %d.", 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 ); 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; return;
} }
if ( NV < 1 || NV > MAX_ROWS ) { if ( NV < 1 || NV > MAX_ROWS ) {
sprintf( Text, "The number of divisions must be > 0 and no greater than %d.", 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 ); 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; 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 " g_FuncTable.m_pfnMessageBox( g_pWnd, "The \"lower-left\" values must be less than "
"the corresponding \"upper-right\" values in " "the corresponding \"upper-right\" values in "
"the \"Extent\" box.","GenSurf", eMB_OK, eMB_ICONWARNING ); "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; 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 " g_FuncTable.m_pfnMessageBox( g_pWnd,"The \"lower-left\" values must be less than "
"the corresponding \"upper-right\" values in " "the corresponding \"upper-right\" values in "
"the \"Extent\" box.","GenSurf", eMB_OK, eMB_ICONWARNING ); "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; return;
} }
if ( !strlen( Texture[Game][0] ) ) { if ( !strlen( Texture[Game][0] ) ) {
g_FuncTable.m_pfnMessageBox( g_pWnd, "You must supply a texture name.", "GenSurf", eMB_OK, eMB_ICONWARNING ); 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; return;
} }

4
libs/gtkutil/menu.cpp
View File

@ -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* 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 ) ); GtkRadioMenuItem* item = GTK_RADIO_MENU_ITEM( gtk_radio_menu_item_new_with_mnemonic( *group, mnemonic ) );
if ( *group == 0 ) { 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 ) ); gtk_widget_show( GTK_WIDGET( item ) );
check_menu_item_connect_callback( GTK_CHECK_MENU_ITEM( item ), callback ); check_menu_item_connect_callback( GTK_CHECK_MENU_ITEM( item ), callback );
return item; return item;

4
radiant/pluginmenu.cpp
View File

@ -113,11 +113,11 @@ public:
} }
void PluginsMenu_clear(){ 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 ) while ( lst->next )
{ {
gtk_container_remove( GTK_CONTAINER( g_plugins_menu ), GTK_WIDGET( lst->next->data ) ); 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 ) );
} }
} }

2
radiant/preferences.cpp
View File

@ -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; return dialog;
} }

2
radiant/texwindow.cpp
View File

@ -1940,7 +1940,7 @@ void TextureBrowser_toggleSearchButton(){
gtk_widget_show_all( g_TextureBrowser.m_search_button ); gtk_widget_show_all( g_TextureBrowser.m_search_button );
} }
else { else {
gtk_widget_hide_all( g_TextureBrowser.m_search_button ); gtk_widget_hide( g_TextureBrowser.m_search_button );
} }
} }