add "selected_shadow_type" style property

Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenuitem.c: add "selected_shadow_type" style property

diff --git a/ChangeLog b/ChangeLog
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2c98dfd896af17ecbf69a6e1b3877c06cdd8fa04..80caac67962583f7a59f94042854c7f25ffdd85e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sat Apr 20 21:15:11 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenuitem.c: add "selected_shadow_type" style property
+
 Sat Apr 20 12:07:14 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_modify_color_component): Accept

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 194c92f24b19e59bd561608276be25d0c3c85b73..552c0f049845f3ca4bbcd9f32c979da3e65178ba 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -202,6 +202,15 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                     _gtk_marshal_NONE__INT,
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_INT);
+
+  gtk_widget_class_install_style_property_parser (widget_class,
+                                                 g_param_spec_enum ("selected_shadow_type",
+                                                                    "Selected Shadow Type",
+                                                                    "Shadow type when item is selected",
+                                                                    GTK_TYPE_SHADOW_TYPE,
+                                                                    GTK_SHADOW_OUT,
+                                                                    G_PARAM_READABLE),
+                                                 gtk_rc_property_parse_enum);
 }
 
 static void
@@ -587,7 +596,7 @@ gtk_menu_item_paint (GtkWidget    *widget,
 {
   GtkMenuItem *menu_item;
   GtkStateType state_type;
-  GtkShadowType shadow_type;
+  GtkShadowType shadow_type, selected_shadow_type;
   gint width, height;
   gint x, y;
   gint border_width = GTK_CONTAINER (widget)->border_width;
@@ -605,13 +614,18 @@ gtk_menu_item_paint (GtkWidget    *widget,
       
       if ((state_type == GTK_STATE_PRELIGHT) &&
          (GTK_BIN (menu_item)->child))
-       gtk_paint_box (widget->style,
-                      widget->window,
-                      GTK_STATE_PRELIGHT,
-                      GTK_SHADOW_OUT,
-                      area, widget, "menuitem",
-                      x, y, width, height);
-
+       {
+         gtk_widget_style_get (widget,
+                               "selected_shadow_type", &selected_shadow_type,
+                               NULL);
+         gtk_paint_box (widget->style,
+                        widget->window,
+                        GTK_STATE_PRELIGHT,
+                        selected_shadow_type,
+                        area, widget, "menuitem",
+                        x, y, width, height);
+       }
+  
       if (menu_item->submenu && menu_item->show_submenu_indicator)
        {
          GtkRequisition child_requisition;