Allow setting background images on menus. (#169532, Benjamin Otte)

2005-04-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
	images on menus.  (#169532, Benjamin Otte)

diff --git a/ChangeLog b/ChangeLog
index 07d0042030291635e1725b5ff040b5359f42c86d..c227fed36c265b06f953b7e36c31faf03a1bd6b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
+       images on menus.  (#169532, Benjamin Otte)
+       
        * gtk/updateiconcache.c (write_card16, write_card32): Avoid
        unaligned access.  (#172947)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 07d0042030291635e1725b5ff040b5359f42c86d..c227fed36c265b06f953b7e36c31faf03a1bd6b9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
+       images on menus.  (#169532, Benjamin Otte)
+       
        * gtk/updateiconcache.c (write_card16, write_card32): Avoid
        unaligned access.  (#172947)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 07d0042030291635e1725b5ff040b5359f42c86d..c227fed36c265b06f953b7e36c31faf03a1bd6b9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background
+       images on menus.  (#169532, Benjamin Otte)
+       
        * gtk/updateiconcache.c (write_card16, write_card32): Avoid
        unaligned access.  (#172947)
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 38c950ad4886f5bbc70efa124a56133318b4ad79..a9c0b4bf4c2f9ddbddd62178c8c5aeea0254b7b0 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2495,6 +2495,15 @@ gtk_menu_paint (GtkWidget      *widget,
                           arrow_size, arrow_size);
        }
     }
+  else if (event->window == menu->bin_window)
+    {
+      gtk_paint_box (widget->style,
+                    menu->bin_window,
+                    GTK_STATE_NORMAL,
+                    GTK_SHADOW_OUT,
+                    NULL, widget, "menu",
+                    -border_x, -border_y, width, height);
+    }
 }
 
 static gboolean