reverted the move of wxComboBox styles from wx/defs.h to wx/combobox.h, a lot of existing code (including wxChoice implementation inside wx itself) uses these styles without including wx/combobox.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/combo.h

@@ -45,7 +45,6 @@
 #include "wx/control.h"
 #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
 #include "wx/bitmap.h" // wxBitmap used by-value
-#include "wx/combobox.h"
 
 class WXDLLIMPEXP_CORE wxTextCtrl;
 class WXDLLEXPORT wxComboPopup;

include/wx/defs.h

@@ -1570,6 +1570,15 @@ enum wxBorder
     #define wxPASSWORD        0x0800  /*  wxTE_PASSWORD */
 #endif
 
+/*
+ * wxComboBox style flags
+ */
+#define wxCB_SIMPLE         0x0004
+#define wxCB_SORT           0x0008
+#define wxCB_READONLY       0x0010
+#define wxCB_DROPDOWN       0x0020
+#define wxCB_FILENAME       0x0040
+
 /*
  * wxRadioBox style flags
  */

src/gtk/choice.cpp

@@ -12,7 +12,6 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
-#include "wx/combobox.h"
 
 #ifndef WX_PRECOMP
     #include "wx/arrstr.h"

src/xrc/xh_choic.cpp

@@ -22,7 +22,6 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/choice.h"
-    #include "wx/combobox.h"
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)