summaryrefslogtreecommitdiff
path: root/gtk/gtkstyle.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-08-06 05:58:19 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-08-06 05:58:19 +0000
commit97f4c323eb889606a3441a5ee05638f0cb8bb7c1 (patch)
tree6f8d4dd300a33afbd3de104c142a7998ee635fef /gtk/gtkstyle.c
parent65d844f07411d949903d1b96022b4d4f833d2c1c (diff)
downloadgdk-pixbuf-97f4c323eb889606a3441a5ee05638f0cb8bb7c1.tar.gz
Only get the indicator-size and indicator-spacing style properties for
2006-08-06 Matthias Clasen <mclasen@redhat.com> * gtk/gtkstyle.c (option_menu_get_props): Only get the indicator-size and indicator-spacing style properties for GtkOptionMenu. (#349859, Benjamin Otte)
Diffstat (limited to 'gtk/gtkstyle.c')
-rw-r--r--gtk/gtkstyle.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ff7c99f3f..1d10533a0 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -30,6 +30,9 @@
#include <string.h>
#include "gtkgc.h"
#include "gtkmarshalers.h"
+#undef GTK_DISABLE_DEPRECATED
+#include "gtkoptionmenu.h"
+#define GTK_DISABLE_DEPRECATED
#include "gtkrc.h"
#include "gtkspinbutton.h"
#include "gtkstyle.h"
@@ -3221,7 +3224,7 @@ option_menu_get_props (GtkWidget *widget,
GtkRequisition *tmp_size = NULL;
GtkBorder *tmp_spacing = NULL;
- if (widget)
+ if (GTK_IS_OPTION_MENU (widget))
gtk_widget_style_get (widget,
"indicator-size", &tmp_size,
"indicator-spacing", &tmp_spacing,