renamed RGBColor setter to avoid former overload being an override

[wxWidgets.git] / src / os2 / combobox.cpp

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index c97801ef8573dbcbef6728f6bda1dadb666a4072..5e86909cb97d724c22f42492c3c5a6008b7267c1 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/os2/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      David Webster
 // Modified by:
@@ -12,13 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/settings.h"
 #endif
 
-#if wxUSE_COMBOBOX
-
 #include "wx/combobox.h"
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"