X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8769ed11cb9315fbf414d121490982df714b68a..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/gtk/settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 3759a30a32..1be34246f3 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -47,7 +47,8 @@ struct wxSystemObjects
              m_colBtnText,
              m_colMenuItemHighlight,
              m_colTooltip,
-             m_colTooltipText;
+             m_colTooltipText,
+             m_colMenubarBg;
 
     wxFont m_fontSystem;
 };
@@ -67,6 +68,7 @@ void wxClearGtkSystemObjects()
     gs_objects.m_colMenuItemHighlight = wxColour();
     gs_objects.m_colTooltip = wxColour();
     gs_objects.m_colTooltipText = wxColour();
+    gs_objects.m_colMenubarBg = wxColour();
     gs_objects.m_fontSystem = wxNullFont;
 }
 
@@ -80,7 +82,8 @@ enum wxGtkWidgetType
     wxGTK_BUTTON,
     wxGTK_LIST,
     wxGTK_MENUITEM,
-    wxGTK_TEXTCTRL
+    wxGTK_TEXTCTRL,
+    wxGTK_MENUBAR, 
 };
 
 // the colour we need
@@ -120,6 +123,11 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor,
 
         case wxGTK_MENUITEM:
             widget = gtk_menu_item_new();
+            
+        case wxGTK_MENUBAR:
+            widget = gtk_menu_bar_new();
+            break;
+            
     }
 
     GtkStyle *def = gtk_rc_get_style( widget );
@@ -185,7 +193,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_INACTIVEBORDER:
         case wxSYS_COLOUR_BTNFACE:
-        case wxSYS_COLOUR_MENUBAR:
         case wxSYS_COLOUR_3DLIGHT:
             if (!gs_objects.m_colBtnFace.Ok())
             {
@@ -210,6 +217,19 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
             color = gs_objects.m_colWindow;
             break;
 
+
+        case wxSYS_COLOUR_MENUBAR:
+            if (!gs_objects.m_colMenubarBg.Ok())
+            {
+                gdkColor.red =
+                gdkColor.green = 0;
+                gdkColor.blue = 0x9c40;
+                GetColourFromGTKWidget(gdkColor,wxGTK_MENUBAR);
+                gs_objects.m_colMenubarBg = wxColor(gdkColor);
+            }
+            color = gs_objects.m_colMenubarBg;
+            break;
+
         case wxSYS_COLOUR_3DDKSHADOW:
             color = *wxBLACK;
             break;