mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

seek: Define the new combobox API to the old functions if using older GTK

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=632653
This commit is contained in:
Sebastian Dröge 2010-10-28 15:13:45 +02:00 committed by Tim-Philipp Müller
parent 4aca6bac9e
commit 9f9e5f80aa
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/examples/seek/jsseek.c
View file

@ -50,6 +50,13 @@
GST_DEBUG_CATEGORY_STATIC (seek_debug); GST_DEBUG_CATEGORY_STATIC (seek_debug);
#define GST_CAT_DEFAULT (seek_debug) #define GST_CAT_DEFAULT (seek_debug)
#if (!GTK_CHECK_VERSION(2, 23, 0) || GTK_CHECK_VERSION(2, 90, 0)) && !GTK_CHECK_VERSION(2, 91, 1)
#define gtk_combo_box_text_new gtk_combo_box_new_text
#define gtk_combo_box_text_append_text gtk_combo_box_append_text
#define gtk_combo_box_text_remove gtk_combo_box_remove_text
#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
#endif
#if !GTK_CHECK_VERSION (2, 17, 7) #if !GTK_CHECK_VERSION (2, 17, 7)
static void static void
gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a) gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a)
@ -2796,17 +2803,11 @@ main (int argc, char **argv)
step = gtk_expander_new ("step options"); step = gtk_expander_new ("step options");
hbox = gtk_hbox_new (FALSE, 0); hbox = gtk_hbox_new (FALSE, 0);
#if (GTK_CHECK_VERSION(2, 23, 0) && !GTK_CHECK_VERSION(2, 90, 0)) || GTK_CHECK_VERSION(2, 91, 1)
format_combo = gtk_combo_box_text_new (); format_combo = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo), gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo),
"frames"); "frames");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo), gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo),
"time (ms)"); "time (ms)");
#else
format_combo = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (format_combo), "frames");
gtk_combo_box_append_text (GTK_COMBO_BOX (format_combo), "time (ms)");
#endif
gtk_combo_box_set_active (GTK_COMBO_BOX (format_combo), 0); gtk_combo_box_set_active (GTK_COMBO_BOX (format_combo), 0);
gtk_box_pack_start (GTK_BOX (hbox), format_combo, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (hbox), format_combo, FALSE, FALSE, 2);

13
tests/examples/seek/seek.c
View file

@ -37,6 +37,13 @@
#endif #endif
#include <gst/interfaces/xoverlay.h> #include <gst/interfaces/xoverlay.h>
#if (!GTK_CHECK_VERSION(2, 23, 0) || GTK_CHECK_VERSION(2, 90, 0)) && !GTK_CHECK_VERSION(2, 91, 1)
#define gtk_combo_box_text_new gtk_combo_box_new_text
#define gtk_combo_box_text_append_text gtk_combo_box_append_text
#define gtk_combo_box_text_remove gtk_combo_box_remove_text
#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
#endif
GST_DEBUG_CATEGORY_STATIC (seek_debug); GST_DEBUG_CATEGORY_STATIC (seek_debug);
#define GST_CAT_DEFAULT (seek_debug) #define GST_CAT_DEFAULT (seek_debug)
@ -2741,17 +2748,11 @@ main (int argc, char **argv)
step = gtk_expander_new ("step options"); step = gtk_expander_new ("step options");
hbox = gtk_hbox_new (FALSE, 0); hbox = gtk_hbox_new (FALSE, 0);
#if (GTK_CHECK_VERSION(2, 23, 0) && !GTK_CHECK_VERSION(2, 90, 0)) || GTK_CHECK_VERSION(2, 91, 1)
format_combo = gtk_combo_box_text_new (); format_combo = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo), gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo),
"frames"); "frames");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo), gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (format_combo),
"time (ms)"); "time (ms)");
#else
format_combo = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (format_combo), "frames");
gtk_combo_box_append_text (GTK_COMBO_BOX (format_combo), "time (ms)");
#endif
gtk_combo_box_set_active (GTK_COMBO_BOX (format_combo), 0); gtk_combo_box_set_active (GTK_COMBO_BOX (format_combo), 0);
gtk_box_pack_start (GTK_BOX (hbox), format_combo, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (hbox), format_combo, FALSE, FALSE, 2);