Don't send initial event in ctor

[wxWidgets.git] / src / generic / combog.cpp

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 56af94bb206227cd4082492f5f1f65b5e6d3d83a..8deece85894b5b94fee414730ff7fc1ddea6e638 100644 (file)
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -159,7 +159,8 @@ bool wxGenericComboCtrl::Create(wxWindow *parent,
     border = wxBORDER_NONE;
 
     Customize( wxCC_BUTTON_OUTSIDE_BORDER |
-               wxCC_NO_TEXT_AUTO_SELECT );
+               wxCC_NO_TEXT_AUTO_SELECT |
+               wxCC_BUTTON_STAYS_DOWN );
 
 #endif
 
@@ -265,7 +266,11 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         dc.DrawRectangle(rect2);
     }
 
+#ifndef __WXMAC__  // see note in OnThemeChange
     wxColour winCol = GetBackgroundColour();
+#else
+    wxColour winCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
     dc.SetBrush(winCol);
     dc.SetPen(winCol);
 
@@ -274,7 +279,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     // clear main background
     dc.DrawRectangle(rect);
-
+    
     if ( !m_btn )
     {
         // Standard button rendering