]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/combobox.cpp
Made sure the 'best' size doesn't get set for wxChoice
[wxWidgets.git] / src / msw / combobox.cpp
index 6d31e99dbad9b9f263fed7445362e64e53322770..f7c97122e14b98f87e92c5901f35fac8443cffa7 100644 (file)
@@ -170,7 +170,7 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
-        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
@@ -313,7 +313,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     for ( int i = 0; i < n; i++ )
     {