reverted the move of wxComboBox styles from wx/defs.h to wx/combobox.h, a lot of...

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

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 6d4757b3c161f22ebec377a8197fcc0a0d6b690d..36d9a720e2c4ad403bc8d9bc8923e7da5ad6318d 100644 (file)
--- a/include/wx/combo.h
+++ b/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;

diff --git a/include/wx/defs.h b/include/wx/defs.h
index ce4b3748d3cc878522f5e754e10db73279303f30..49d2e48db365305ef7d6195051c2d3a56d03126b 100644 (file)
--- a/include/wx/defs.h
+++ b/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
  */

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index ba57eaa3f57c21ff079aa4e3db007dc1080bfc01..a7f05f679afed006baec1e027f89a933723f5465 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/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"

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index c6ad605176caa2d5388d2c5139211fd1cc3fa5b9..c26bf71eea695b6e33abbf4a39a62568dc058b32 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/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)