nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

Stop using deprecated GTK_STOCK_* in GTK3.

Browse Source 
According to the GTK3 docs, we're now supposed to use fixed label
strings instead.
This commit is contained in:
Simon Tatham 2015-08-22 13:50:56 +01:00
parent d155f698b7
commit 6d65a92dfc
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
unix/gtkcompat.h
View File

@ -1,7 +1,7 @@
/* /*
* Header file to make compatibility with older GTK versions less * Header file to make compatibility with older GTK versions less
* painful, by #defining various things that are pure spelling changes * painful, by #defining various things that are pure spelling changes
* between GTK1 and GTK2. * between GTK1 and GTK2, or between 2 and 3.
*/ */
#if !GTK_CHECK_VERSION(2,0,0) #if !GTK_CHECK_VERSION(2,0,0)
@ -156,3 +156,12 @@
#endif #endif
#if GTK_CHECK_VERSION(3,0,0)
#define STANDARD_OK_LABEL "_OK"
#define STANDARD_OPEN_LABEL "_Open"
#define STANDARD_CANCEL_LABEL "_Cancel"
#else
#define STANDARD_OK_LABEL GTK_STOCK_OK
#define STANDARD_OPEN_LABEL GTK_STOCK_OPEN
#define STANDARD_CANCEL_LABEL GTK_STOCK_CANCEL
#endif

4
unix/gtkdlg.c
View File

@ -1674,8 +1674,8 @@ static void filefont_clicked(GtkButton *button, gpointer data)
(uc->ctrl->fileselect.for_writing ? (uc->ctrl->fileselect.for_writing ?
GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_SAVE :
GTK_FILE_CHOOSER_ACTION_OPEN), GTK_FILE_CHOOSER_ACTION_OPEN),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, STANDARD_CANCEL_LABEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, STANDARD_OPEN_LABEL, GTK_RESPONSE_ACCEPT,
(const gchar *)NULL); (const gchar *)NULL);
gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE); gtk_window_set_modal(GTK_WINDOW(filechoose), TRUE);
g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc); g_object_set_data(G_OBJECT(filechoose), "user-data", (gpointer)uc);

4
unix/gtkfont.c
View File

@ -2996,9 +2996,9 @@ unifontsel *unifontsel_new(const char *wintitle)
fs->u.window = GTK_WINDOW(gtk_dialog_new()); fs->u.window = GTK_WINDOW(gtk_dialog_new());
gtk_window_set_title(fs->u.window, wintitle); gtk_window_set_title(fs->u.window, wintitle);
fs->u.cancel_button = gtk_dialog_add_button fs->u.cancel_button = gtk_dialog_add_button
(GTK_DIALOG(fs->u.window), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); (GTK_DIALOG(fs->u.window), STANDARD_CANCEL_LABEL, GTK_RESPONSE_CANCEL);
fs->u.ok_button = gtk_dialog_add_button fs->u.ok_button = gtk_dialog_add_button
(GTK_DIALOG(fs->u.window), GTK_STOCK_OK, GTK_RESPONSE_OK); (GTK_DIALOG(fs->u.window), STANDARD_OK_LABEL, GTK_RESPONSE_OK);
gtk_widget_grab_default(fs->u.ok_button); gtk_widget_grab_default(fs->u.ok_button);
/* /*