move SendSizeEvent() down to wxWindow from wxFrame; added SendSizeEventToParent(...

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 782c17ce7bea190acac0f7c26cfeba8df074d773..47ece481a3592c403b6a34f586d21a5d0249a4c6 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -787,16 +787,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
             const char* stockid;
             if (bitmap.IsOk())
             {
             const char* stockid;
             if (bitmap.IsOk())
             {

-                GtkWidget* image;
-                if (bitmap.HasPixbuf())
-                    image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());
-                else
-                {
-                    GdkPixmap* mask = NULL;
-                    if (bitmap.GetMask())
-                        mask = bitmap.GetMask()->GetBitmap();
-                    image = gtk_image_new_from_pixmap(bitmap.GetPixmap(), mask);
-                }
+                // always use pixbuf, because pixmap mask does not
+                // work with disabled images in some themes
+                GtkWidget* image = gtk_image_new_from_pixbuf(bitmap.GetPixbuf());

                 menuItem = gtk_image_menu_item_new_with_label("");
                 gtk_widget_show(image);
                 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);
                 menuItem = gtk_image_menu_item_new_with_label("");
                 gtk_widget_show(image);
                 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);