LinGui: fix deprecated GTK_STOCK_*

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5968 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 7563eb9263987ee0b430a45633db81b42e66d3ea..01a9353387fe7c0562f67bd60c0b29bded92737f 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1215,8 +1215,8 @@ destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
     dialog = gtk_file_chooser_dialog_new ("Choose Destination",
                       NULL,
                       GTK_FILE_CHOOSER_ACTION_SAVE,
-                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                      GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                      GHB_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                       NULL);
     gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), destname);
     basename = g_path_get_basename(destname);

diff --git a/gtk/src/ghbcompat.h b/gtk/src/ghbcompat.h
index 2acaa63b9727220072988b2cef86210d89349c8e..2c4ba99ad6cf870ba328a63f2ea2d2ff8242e4b1 100644 (file)
--- a/gtk/src/ghbcompat.h
+++ b/gtk/src/ghbcompat.h
@@ -38,4 +38,14 @@ static inline gboolean gtk_widget_get_realized(GtkWidget *widget)
 #define GHB_PAUSE_ICON "media-playback-pause"
 #endif
 
+#if !GTK_CHECK_VERSION(3, 10, 0)
+#define GHB_STOCK_OPEN      GTK_STOCK_OPEN
+#define GHB_STOCK_CANCEL    GTK_STOCK_CANCEL
+#define GHB_STOCK_SAVE      GTK_STOCK_SAVE
+#else
+#define GHB_STOCK_OPEN      "_Open"
+#define GHB_STOCK_CANCEL    "_Cancel"
+#define GHB_STOCK_SAVE      "_Save"
+#endif
+
 #endif // _GHB_COMPAT_H_

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 8562401e7c3facac98b5d8de30362ac8ff054707..d2ea4c022cd78452f5e861aafb47b61d032c2473 100644 (file)
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -3721,8 +3721,8 @@ preset_import_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 
     dialog = gtk_file_chooser_dialog_new("Import Preset", NULL,
                 GTK_FILE_CHOOSER_ACTION_OPEN,
-                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                GHB_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                 NULL);
 
     filter = gtk_file_filter_new();
@@ -3843,8 +3843,8 @@ preset_export_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 
     dialog = gtk_file_chooser_dialog_new("Export Preset", NULL,
                 GTK_FILE_CHOOSER_ACTION_SAVE,
-                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                GHB_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                GHB_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                 NULL);
 
     exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory");