non-pch universal build fix: combo.h should not include combobox.h

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

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 1076027de007c8f3455fa21f0609504e494288a9..db19acef5b161143fd3bd4ef35601d5093f69ead 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -42,14 +42,11 @@
 
 #if wxUSE_COMBOCTRL
 
-
-#include "wx/textctrl.h"
-#include "wx/button.h"
-#include "wx/combobox.h"
+#include "wx/control.h"
 #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
 #include "wx/bitmap.h" // wxBitmap used by-value
 
-
+class WXDLLIMPEXP_CORE wxTextCtrl;
 class WXDLLEXPORT wxComboPopup;
 
 //

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 9d179ac385a39a41a88ecda2868b55eba403baa6..feca13db3c20b19c5245f8549f5bb540e8bd0a5d 100644 (file)
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -31,6 +31,7 @@
 
 #endif
 
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
 
 class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
 {