GNOME.org
 

[gtk-engines] Enable building with gtk-engines with *_DISABLE_DEPRECATED. (bug# 572178)

commit cfa772bc89f427c731d8c6b6fd88c931a5616b3a
Author: Benjamin Berg <benjamin sipsolutions net>
Date:   Wed Dec 30 18:57:52 2009 +0100

    Enable building with gtk-engines with *_DISABLE_DEPRECATED. (bug# 572178)
    
    Note that some engines will not fully support some widgets if compiled
    with deprecated symbols disabled. Some applications, especially those
    that use deprecated widgets, will be drawn with minor rendering glitches.

 engines/clearlooks/src/animation.c           |    9 +++--
 engines/clearlooks/src/animation.h           |    6 +++
 engines/clearlooks/src/clearlooks_rc_style.c |    8 ++--
 engines/clearlooks/src/clearlooks_style.c    |    9 ++++-
 engines/clearlooks/src/support.c             |    4 ++
 engines/clearlooks/src/support.h             |    3 ++
 engines/glide/src/glide_gtk2_drawing.c       |    8 ++++
 engines/mist/src/mist-style.c                |   12 ++++++
 engines/redmond/src/redmond_gtk2_drawing.c   |   11 +++++-
 test/torturetest.c                           |   48 +++++++++++++++----------
 10 files changed, 90 insertions(+), 28 deletions(-)
---
diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
index 820611e..1f7a41f 100644
--- a/engines/clearlooks/src/animation.c
+++ b/engines/clearlooks/src/animation.c
@@ -27,7 +27,7 @@
 
 #include "animation.h"
 
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 #include <glib/gtimer.h>
 
 struct _AnimationInfo {
@@ -330,9 +330,12 @@ clearlooks_animation_cleanup ()
 	
 	stop_timer ();
 }
-#else /* !HAVE_ANIMATION */
+#else /* !HAVE_WORKING_ANIMATION */
+/* Warn here so the message is only displayed once. */
+#warning Disabling animation support as it currently needs deprecated symbols and GTK_DISABLE_DEPRECATED is enabled.
+
 static void clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled()
 {
 	clearlooks_animation_dummy_function_so_wall_shuts_up_when_animations_is_disabled();
 }
-#endif /* HAVE_ANIMATION */
+#endif /* HAVE_WORKING_ANIMATION */
diff --git a/engines/clearlooks/src/animation.h b/engines/clearlooks/src/animation.h
index dec7ea6..4ab6f4e 100644
--- a/engines/clearlooks/src/animation.h
+++ b/engines/clearlooks/src/animation.h
@@ -24,6 +24,10 @@
 #include <config.h>
 
 #ifdef HAVE_ANIMATION
+#ifndef GTK_DISABLE_DEPRECATED
+
+#define HAVE_WORKING_ANIMATION 1
+
 #include <gtk/gtk.h>
 #include <ge-support.h>
 
@@ -36,4 +40,6 @@ GE_INTERNAL void     clearlooks_animation_connect_checkbox (GtkWidget *widget);
 GE_INTERNAL gboolean clearlooks_animation_is_animated (GtkWidget *widget);
 GE_INTERNAL gdouble  clearlooks_animation_elapsed (gpointer data);
 GE_INTERNAL void     clearlooks_animation_cleanup ();
+#endif /* GTK_DISABLE_DEPRECATED */
 #endif /* HAVE_ANIMATION */
+
diff --git a/engines/clearlooks/src/clearlooks_rc_style.c b/engines/clearlooks/src/clearlooks_rc_style.c
index 36865aa..31c464b 100644
--- a/engines/clearlooks/src/clearlooks_rc_style.c
+++ b/engines/clearlooks/src/clearlooks_rc_style.c
@@ -35,7 +35,7 @@
 
 #include "animation.h"
 
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 static void      clearlooks_rc_style_finalize     (GObject                *object);
 #endif
 static GtkStyle *clearlooks_rc_style_create_style (GtkRcStyle             *rc_style);
@@ -127,7 +127,7 @@ clearlooks_rc_style_init (ClearlooksRcStyle *clearlooks_rc)
 	clearlooks_rc->disable_focus = FALSE;
 }
 
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 static void
 clearlooks_rc_style_finalize (GObject *object)
 {
@@ -144,7 +144,7 @@ static void
 clearlooks_rc_style_class_init (ClearlooksRcStyleClass *klass)
 {
 	GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 	GObjectClass    *g_object_class = G_OBJECT_CLASS (klass);
 #endif
 
@@ -152,7 +152,7 @@ clearlooks_rc_style_class_init (ClearlooksRcStyleClass *klass)
 	rc_style_class->create_style = clearlooks_rc_style_create_style;
 	rc_style_class->merge = clearlooks_rc_style_merge;
 
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 	g_object_class->finalize = clearlooks_rc_style_finalize;
 #endif
 }
diff --git a/engines/clearlooks/src/clearlooks_style.c b/engines/clearlooks/src/clearlooks_style.c
index 1dac4a7..eec7cee 100644
--- a/engines/clearlooks/src/clearlooks_style.c
+++ b/engines/clearlooks/src/clearlooks_style.c
@@ -549,11 +549,13 @@ clearlooks_style_draw_box (DRAW_ARGS)
 			                                      widget, &column_index, &columns,
 			                                      &resizable);
 		}
+#ifndef GTK_DISABLE_DEPRECATED
 		else if (GE_IS_CLIST (widget->parent))
 		{
 			clearlooks_clist_get_header_index (GTK_CLIST(widget->parent),
 			                                   widget, &column_index, &columns);
 		}
+#endif
 
 		header.resizable = resizable;
 
@@ -778,7 +780,7 @@ clearlooks_style_draw_box (DRAW_ARGS)
 		ProgressBarParameters progressbar;
 		gdouble               elapsed = 0.0;
 
-#ifdef HAVE_ANIMATION
+#ifdef HAVE_WORKING_ANIMATION
 		if(clearlooks_style->animation && CL_IS_PROGRESS_BAR (widget))
 		{
 			gboolean activity_mode = GTK_PROGRESS (widget)->activity_mode;
@@ -796,7 +798,12 @@ clearlooks_style_draw_box (DRAW_ARGS)
 		{
 			progressbar.orientation = gtk_progress_bar_get_orientation (GTK_PROGRESS_BAR (widget));
 			progressbar.value = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget));
+#ifndef GTK_DISABLE_DEPRECATED
 			progressbar.pulsing = GTK_PROGRESS (widget)->activity_mode;
+#else
+#warning Assuming non-pulsing progress bars because GTK_DISABLE_DEPRECATED is enabled.
+			progressbar.pulsing = FALSE;
+#endif
 		}
 		else
 		{
diff --git a/engines/clearlooks/src/support.c b/engines/clearlooks/src/support.c
index 5ebaaa5..e94584f 100644
--- a/engines/clearlooks/src/support.c
+++ b/engines/clearlooks/src/support.c
@@ -46,6 +46,7 @@ void clearlooks_treeview_get_header_index (GtkTreeView *tv, GtkWidget *header,
 	g_list_free (list_start);
 }
 
+#ifndef GTK_DISABLE_DEPRECATED
 void clearlooks_clist_get_header_index (GtkCList *clist, GtkWidget *button,
                                  gint *column_index, gint *columns)
 {
@@ -61,6 +62,9 @@ void clearlooks_clist_get_header_index (GtkCList *clist, GtkWidget *button,
 		}
 	}
 }
+#else
+#warning Disabling special CList support of clearlooks as GTK_DISABLE_DEPRECATED is enabled.
+#endif
 
 void
 clearlooks_get_parent_bg (const GtkWidget *widget, CairoColor *color)
diff --git a/engines/clearlooks/src/support.h b/engines/clearlooks/src/support.h
index 3f20b89..d820040 100644
--- a/engines/clearlooks/src/support.h
+++ b/engines/clearlooks/src/support.h
@@ -39,10 +39,13 @@ GE_INTERNAL void              clearlooks_treeview_get_header_index (GtkTreeView
                                                  gint         *columns,
                                                  gboolean     *resizable);
 
+#ifndef GTK_DISABLE_DEPRECATED
 GE_INTERNAL void              clearlooks_clist_get_header_index    (GtkCList     *clist,
                                                  GtkWidget    *button,
                                                  gint         *column_index,
                                                  gint         *columns);
+#endif
+
 #ifdef DEVELOPMENT
 #warning clearlooks_get_parent_bg is a bad hack - find out why its needed, and figure out a better way.
 #endif
diff --git a/engines/glide/src/glide_gtk2_drawing.c b/engines/glide/src/glide_gtk2_drawing.c
index 9a32962..dbd38e7 100644
--- a/engines/glide/src/glide_gtk2_drawing.c
+++ b/engines/glide/src/glide_gtk2_drawing.c
@@ -681,6 +681,7 @@ glide_draw_combobox_button (GtkStyle * style,
   		            area, widget, "combo_box_entry", x - thick*2 - focus - focus_padding, y + focus - focus_padding, 
 				width + thick*2 + focus_padding*2, height - focus*2 + focus_padding*2);
         }
+#ifndef GTK_DISABLE_DEPRECATED
       else if (ge_is_combo(widget))
         {
           GtkWidget *entry = widget;
@@ -727,6 +728,9 @@ glide_draw_combobox_button (GtkStyle * style,
 				width + thick*2 + focus_padding*2, height - focus*2 + focus_padding*2);
           }
         }
+#else
+#warning Disabling GtkCombo support because GTK_DiSABLE_DEPRECATED is enabled.
+#endif /* GTK_DISABLE_DEPRECATED */
       else
         {
           GtkWidget *parent = widget;
@@ -819,6 +823,7 @@ glide_draw_combobox_button (GtkStyle * style,
                                 x + focus - focus_padding, y + focus - focus_padding, 
                                 width + thick*2 - focus + focus_padding*2, height - focus*2 + focus_padding*2);
         }
+#ifndef GTK_DISABLE_DEPRECATED
       else if (ge_is_combo(widget))
         {
           GtkWidget *entry = widget;
@@ -852,6 +857,9 @@ glide_draw_combobox_button (GtkStyle * style,
                                 x + focus - focus_padding, y + focus - focus_padding, 
                                 width + thick*2 - focus + focus_padding*2, height - focus*2 + focus_padding*2);
         }
+#else
+#warning Disabling GtkCombo support because GTK_DiSABLE_DEPRECATED is enabled.
+#endif /* GTK_DISABLE_DEPRECATED */
       else
         {
           GtkWidget *parent = widget;
diff --git a/engines/mist/src/mist-style.c b/engines/mist/src/mist-style.c
index 66880a3..697db00 100644
--- a/engines/mist/src/mist-style.c
+++ b/engines/mist/src/mist-style.c
@@ -1161,6 +1161,14 @@ mist_style_draw_resize_grip(GtkStyle *style,
 	cairo_destroy(cr);
 }
 
+#ifndef GTK_DISABLE_DEPRECATED
+#ifndef GDK_DISABLE_DEPRECATED
+#define DISABLE_CUSTOM_STRING_DRAWING
+#warning Disabling custom string drawing so that no deprecated API is used.
+#endif /* GDK_DISABLE_DEPRECATED */
+#endif /* GTK_DISABLE_DEPRECATED */
+
+#ifndef DISABLE_CUSTOM_STRING_DRAWING
 static void
 mist_style_draw_string (GtkStyle      *style,
 	     GdkWindow     *window,
@@ -1186,6 +1194,8 @@ mist_style_draw_string (GtkStyle      *style,
 		gdk_gc_set_clip_rectangle (style->fg_gc[state_type], NULL);
 	}
 }
+#endif /* DISABLE_CUSTOM_STRING_DRAWING */
+
 
 static void
 mist_style_draw_layout (GtkStyle        *style,
@@ -1408,7 +1418,9 @@ mist_style_class_init (MistStyleClass *klass)
 	style_class->draw_extension = mist_style_draw_extension;
 	style_class->draw_handle = mist_style_draw_handle;
 	style_class->draw_resize_grip = mist_style_draw_resize_grip;
+#ifndef DISABLE_CUSTOM_STRING_DRAWING
 	style_class->draw_string = mist_style_draw_string;
+#endif
 	style_class->draw_layout = mist_style_draw_layout;
 	style_class->render_icon = mist_style_render_icon;
 	style_class->draw_focus = mist_style_draw_focus;
diff --git a/engines/redmond/src/redmond_gtk2_drawing.c b/engines/redmond/src/redmond_gtk2_drawing.c
index 8664eed..97b3d8f 100644
--- a/engines/redmond/src/redmond_gtk2_drawing.c
+++ b/engines/redmond/src/redmond_gtk2_drawing.c
@@ -678,6 +678,7 @@ redmond_draw_combobox_button (GtkStyle * style,
           gtk_paint_shadow (style, window, state_type, GTK_SHADOW_IN,
   		            area, widget, "entry", x - 2, y, width, height);
         }
+#ifndef GTK_DISABLE_DEPRECATED
       else if (ge_is_combo(widget))
         {
           GtkWidget *entry = widget;
@@ -690,7 +691,8 @@ redmond_draw_combobox_button (GtkStyle * style,
                parent_style = entry->style;
                parent_state = entry->state;
              }
-          else if (GE_IS_WIDGET(widget->parent))
+          else
+                if (GE_IS_WIDGET(widget->parent))
             {
                entry = widget->parent;
                gtk_widget_ensure_style(entry);
@@ -723,6 +725,9 @@ redmond_draw_combobox_button (GtkStyle * style,
 	 	              &clip, entry, "entry", x - 4, y, width + 2, height);
           }
         }
+#else
+#warning Disabling GtkCombo support because GTK_DiSABLE_DEPRECATED is enabled.
+#endif
       else
         {
           GtkWidget *parent = widget;
@@ -791,6 +796,7 @@ redmond_draw_combobox_button (GtkStyle * style,
           gtk_paint_shadow (style, window, state_type, GTK_SHADOW_IN,
 	  		    area, widget, "entry", x + 2, y, width, height);
         }
+#ifndef GTK_DISABLE_DEPRECATED
       else if (ge_is_combo(widget))
         {
           GtkWidget *entry = widget;
@@ -821,6 +827,9 @@ redmond_draw_combobox_button (GtkStyle * style,
            gtk_paint_shadow (parent_style, window, parent_state, GTK_SHADOW_IN,
 			     area, entry, "entry", x + 2, y, width, height);
         }
+#else
+#warning Disabling GtkCombo support because GTK_DiSABLE_DEPRECATED is enabled.
+#endif /* GTK_DISABLE_DEPRECATED */
       else
         {
           GtkWidget *parent = widget;
diff --git a/test/torturetest.c b/test/torturetest.c
index 9e2f4f9..1357120 100644
--- a/test/torturetest.c
+++ b/test/torturetest.c
@@ -35,7 +35,9 @@ typedef enum {
 	WIDGET_PROGRESS_BAR,
 	WIDGET_MENUBAR,
 	WIDGET_MENUBAR_ITEM,
+#ifndef GTK_DISABLE_DEPRECATED
 	WIDGET_OPTION_MENU,
+#endif /* GTK_DISABLE_DEPRECATED */
 	WIDGET_TOOLBAR,
 	WIDGET_DEFAULT_BUTTON
 } WidgetType;
@@ -60,7 +62,9 @@ widget_type_get_type (void)
 			{ WIDGET_PROGRESS_BAR, "WIDGET_PROGRESS_BAR", "GtkProgessBar" },
 			{ WIDGET_MENUBAR, "WIDGET_MENUBAR", "GtkMenubar" },
 			{ WIDGET_MENUBAR_ITEM, "WIDGET_MENUBAR_ITEM", "GtkMenubar-item" },
+#ifndef GTK_DISABLE_DEPRECATED
 			{ WIDGET_OPTION_MENU, "WIDGET_OPTION_MENU", "GtkOptionMenu" },
+#endif
 			{ WIDGET_TOOLBAR, "WIDGET_TOOLBAR", "GtkToolbar" },
 			{ WIDGET_DEFAULT_BUTTON, "WIDGET_DEFAULT_BUTTON", "GtkButton-has-default" },
 			{ 0, NULL, NULL }
@@ -160,7 +164,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		ARROW_ALL,
 		FILL_ALL,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -186,7 +190,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		EXPANDER_ALL,
 		GDK_WINDOW_EDGE_SOUTH
@@ -199,7 +203,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		ORIENTATION_ALL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -212,7 +216,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		EDGE_ALL
@@ -225,7 +229,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -238,7 +242,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -251,7 +255,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -270,7 +274,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -283,7 +287,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -296,7 +300,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -309,7 +313,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -322,7 +326,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -335,7 +339,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -348,7 +352,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -361,7 +365,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -374,11 +378,12 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
 	},
+#ifndef GTK_DISABLE_DEPRECATED
 	{
 		FUNCTION_BOX,
 		WIDGET_OPTION_MENU,
@@ -387,7 +392,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -400,11 +405,12 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
 	},
+#endif /* GTK_DISABLE_DEPRECATED */
 	{
 		FUNCTION_BOX,
 		WIDGET_TOOLBAR,
@@ -413,7 +419,7 @@ static Test tests[] = {
 		SHADOW_ALL,
 		GTK_ARROW_UP,
 		TRUE,
-		GTK_SIDE_TOP,
+		GTK_POS_TOP,
 		GTK_ORIENTATION_HORIZONTAL,
 		GTK_EXPANDER_EXPANDED,
 		GDK_WINDOW_EDGE_SOUTH
@@ -651,7 +657,11 @@ create_testwidgets ()
 	widgets[WIDGET_MENUBAR] = gtk_menu_bar_new ();
 	widgets[WIDGET_MENUBAR_ITEM] = gtk_menu_item_new_with_label ("blah");
 	gtk_menu_shell_append (GTK_MENU_SHELL (widgets[WIDGET_MENUBAR]), widgets[WIDGET_MENUBAR_ITEM]);
+#ifndef GTK_DISABLE_DEPRECATED
 	widgets[WIDGET_OPTION_MENU] = gtk_option_menu_new ();
+#else
+#warning Not testing engines against GtkOptionMenu
+#endif /* GTK_DISABLE_DEPRECATED */
 	widgets[WIDGET_TOOLBAR] = gtk_toolbar_new ();
 	widgets[WIDGET_DEFAULT_BUTTON] = gtk_button_new_with_label ("blah");
 	/* nasty but *shrug* */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]