]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/combobox.cpp
corrected path splitting for mac relative paths
[wxWidgets.git] / src / os2 / combobox.cpp
index bf7feb68607fe3fd64820cffc9dee551fd6e0165..fc4697b255af247b86d2a9fe607e18ade0997afd 100644 (file)
@@ -15,7 +15,8 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include "wx/setup.h"
+    #include "wx/setup.h"
+    #include "wx/settings.h"
 #endif
 
 #if wxUSE_COMBOBOX
 #endif
 
 #if wxUSE_COMBOBOX
@@ -140,9 +141,9 @@ bool wxComboBox::Create(
     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.
     //
     // 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));
 
 
-    SetFont(pParent->GetFont());
+    SetFont(*wxSMALL_FONT);
 
     int                             i;
 
 
     int                             i;