From ef43e62e77f166157029b852d0ac197fc0fba135 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 30 Jul 2006 20:04:10 +0000
Subject: [PATCH] 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   | 1 -
 include/wx/defs.h    | 9 +++++++++
 src/gtk/choice.cpp   | 1 -
 src/xrc/xh_choic.cpp | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 6d4757b3c1..36d9a720e2 100644
--- 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 ce4b3748d3..49d2e48db3 100644
--- 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 ba57eaa3f5..a7f05f679a 100644
--- 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 c6ad605176..c26bf71eea 100644
--- 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)
-- 
2.45.2