emul/fuse
1
0
Fork 0
mirror of https://git.code.sf.net/p/fuse-emulator/fuse synced 2026-01-27 01:41:34 +03:00
Code Activity

Replace deprecated GtkStock.

Browse Source 
Legacy-ID: 5188
This commit is contained in:
Sergio Baldoví
2015-03-22 01:07:50 +00:00
parent 80200e9a85
commit a7e1248820
6 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hacking/ChangeLog
View File

@@ -4743,3 +4743,5 @@
error handling (Sergio).
20150322 menu.c,tape.[c|h]: don't show an error when rewinding an empty tape
(Sergio).
20150322 ui/gtk/{confirm.c,fileselector.c,gtkinternals.h,pokemem.c,stock.c}:
replace deprecated GtkStock (Sergio).

6
ui/gtk/confirm.c
View File

@@ -98,9 +98,9 @@ ui_confirm_save_specific( const char *message )
{
static gtkstock_button btn[] = {
{ GTK_STOCK_NO, G_CALLBACK( set_dont_save ), NULL, DEFAULT_DESTROY, 0, 0, GDK_KEY_VoidSymbol, 0 }, /* override Escape */
{ GTK_STOCK_CANCEL, NULL, NULL, DEFAULT_DESTROY, 0, 0, 0, 0 },
{ GTK_STOCK_SAVE, G_CALLBACK( set_save ), NULL, DEFAULT_DESTROY, 0, 0, 0, 0 }
{ "_No", G_CALLBACK( set_dont_save ), NULL, DEFAULT_DESTROY, 0, 0, 0, 0 },
{ "_Cancel", NULL, NULL, DEFAULT_DESTROY, GDK_KEY_Escape, 0, 0, 0 },
{ "_Save", G_CALLBACK( set_save ), NULL, DEFAULT_DESTROY, 0, 0, 0, 0 }
};
btn[0].actiondata = btn[2].actiondata = &confirm;
gtkstock_create_buttons( dialog, NULL, btn, ARRAY_SIZE( btn ) );

10
ui/gtk/fileselector.c
View File

@@ -40,16 +40,16 @@ run_dialog( const char *title, GtkFileChooserAction action )
const char *button;
if( action == GTK_FILE_CHOOSER_ACTION_SAVE ) {
button = GTK_STOCK_SAVE;
button = "_Save";
} else {
button = GTK_STOCK_OPEN;
button = "_Open";
}
dialog =
gtk_file_chooser_dialog_new( title, GTK_WINDOW( gtkui_window ),
action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
button, GTK_RESPONSE_ACCEPT,
NULL );
action, "_Cancel", GTK_RESPONSE_CANCEL,
button, GTK_RESPONSE_ACCEPT,
NULL );
gtk_dialog_set_default_response( GTK_DIALOG( dialog ), GTK_RESPONSE_ACCEPT );

4
ui/gtk/gtkinternals.h
View File

@@ -89,9 +89,7 @@ typedef struct gtkstock_button {
/* GTK1: create a simple button with the given label.
* "gtk-" prefixes are stripped and are used to select default accel keys.
* GTK2: chooses between stock and normal based on "gtk-" prefix.
*
* Some stock labels are defined below for use with GTK1: their names are the
* same as in GTK2, but the strings are different.
* GTK3: GtkStock has been deprecated, we should not use "gtk-" prefix.
*
* If the target widget is a GtkDialog, then created buttons are put in its
* action area.

2
ui/gtk/pokemem.c
View File

@@ -157,7 +157,7 @@ create_dialog( void )
/* Create Add button for custom pokes */
static const gtkstock_button
add = { "Add", G_CALLBACK( pokemem_add_custom_poke ), NULL, NULL,
add = { "_Add", G_CALLBACK( pokemem_add_custom_poke ), NULL, NULL,
0, 0, 0, 0 };
gtkstock_create_button( GTK_WIDGET( hbox ), accel_group, &add );

69
ui/gtk/stock.c
View File

@@ -71,24 +71,10 @@ gtkstock_create_button( GtkWidget *widget, GtkAccelGroup *accel,
{
GtkWidget *btn;
gboolean link_object = ( button->label[0] == '!' );
gboolean is_stock = !strncmp( button->label, "gtk-", 4 );
if( !accel ) accel = gtkstock_add_accel_group (widget);
if( is_stock ) {
btn = gtk_button_new_from_stock( button->label + link_object );
/* FIXME: for future use
else if( button->shortcut ) {
button = gtk_button_new_with_mnemonic( button->label + link_object )
}
*/
} else {
btn = gtk_button_new_with_label( button->label + link_object +
( is_stock ? 4 : 0 ) );
}
btn = gtk_button_new_with_mnemonic( button->label );
if( GTK_IS_DIALOG( widget ) ) {
GtkWidget *action_area = gtk_dialog_get_action_area( GTK_DIALOG( widget ) );
@@ -112,24 +98,33 @@ gtkstock_create_button( GtkWidget *widget, GtkAccelGroup *accel,
g_signal_connect_swapped( G_OBJECT( btn ), "clicked", button->destroy,
G_OBJECT( widget ) );
if( is_stock ) {
if( !strcmp( button->label, GTK_STOCK_CLOSE ) )
add_click( btn, button, accel, GDK_KEY_Return, 0, GDK_KEY_Escape, 0 );
else if( !strcmp( button->label, GTK_STOCK_OK ) )
add_click( btn, button, accel, GDK_KEY_Return, 0, 0, 0 );
else if( !strcmp( button->label, GTK_STOCK_CANCEL ) )
add_click( btn, button, accel, GDK_KEY_Escape, 0, 0, 0 );
else if( !strcmp( button->label, GTK_STOCK_SAVE ) )
add_click( btn, button, accel, GDK_KEY_S, GDK_MOD1_MASK, 0, 0 );
else if( !strcmp( button->label, GTK_STOCK_YES ) )
add_click( btn, button, accel, GDK_KEY_Y, GDK_MOD1_MASK, GDK_KEY_Return, 0 );
else if( !strcmp( button->label, GTK_STOCK_NO ) )
add_click( btn, button, accel, GDK_KEY_N, GDK_MOD1_MASK, GDK_KEY_Escape, 0 );
else
add_click( btn, button, accel, 0, 0, 0, 0 );
} else {
add_click( btn, button, accel, 0, 0, 0, 0 );
}
GtkWidget *icon = NULL;
if( !strcmp( button->label, "_Close" ) )
icon = gtk_image_new_from_icon_name( "window-close", GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_Open" ) )
icon = gtk_image_new_from_icon_name( "document-open",GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_Save" ) )
icon = gtk_image_new_from_icon_name( "document-save",GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_Add" ) )
icon = gtk_image_new_from_icon_name( "list-add", GTK_ICON_SIZE_BUTTON );
#if !GTK_CHECK_VERSION( 3, 0, 0 )
/* Note: ok/cancel/yes/no icons are not covered by freedesktop's Icon Naming
Specification 0.8.90 */
else if( !strcmp( button->label, "_OK" ) )
icon = gtk_image_new_from_icon_name( GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_Cancel" ) )
icon = gtk_image_new_from_icon_name( GTK_STOCK_CANCEL,
GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_Yes" ) )
icon = gtk_image_new_from_icon_name( GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON );
else if( !strcmp( button->label, "_No" ) )
icon = gtk_image_new_from_icon_name( GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON );
#endif
if( icon ) gtk_button_set_image( GTK_BUTTON( btn ), icon );
add_click( btn, button, accel, 0, 0, 0, 0 );
return btn;
}
@@ -152,8 +147,8 @@ gtkstock_create_ok_cancel( GtkWidget *widget, GtkAccelGroup *accel,
GCallback destroy_ok, GCallback destroy_cancel )
{
gtkstock_button btn[] = {
{ GTK_STOCK_CANCEL, NULL, NULL, NULL, 0, 0, 0, 0 },
{ GTK_STOCK_OK, NULL, NULL, NULL, 0, 0, 0, 0 },
{ "_Cancel", NULL, NULL, NULL, GDK_KEY_Escape, 0, 0, 0 },
{ "_OK", NULL, NULL, NULL, GDK_KEY_Return, 0, 0, 0 },
};
btn[0].destroy = destroy_cancel ? destroy_cancel : NULL;
btn[1].destroy = destroy_ok ? destroy_ok : NULL;
@@ -169,8 +164,8 @@ gtkstock_create_close( GtkWidget *widget, GtkAccelGroup *accel,
GCallback destroy, gboolean esconly )
{
gtkstock_button btn = {
GTK_STOCK_CLOSE, NULL, NULL, (destroy ? destroy : DEFAULT_DESTROY),
(esconly ? GDK_KEY_VoidSymbol : 0), 0, 0, 0
"_Close", NULL, NULL, (destroy ? destroy : DEFAULT_DESTROY),
(esconly ? GDK_KEY_VoidSymbol : GDK_KEY_Return), 0, GDK_KEY_Escape, 0
};
return gtkstock_create_buttons( widget, accel, &btn, 1 );
}