Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-05-19 05:21:20 +00:00
parent 38009079fb
commit dbaf49a996
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/combo.h
View File

@@ -42,14 +42,11 @@
#if wxUSE_COMBOCTRL #if wxUSE_COMBOCTRL
#include "wx/control.h"
#include "wx/textctrl.h"
#include "wx/button.h"
#include "wx/combobox.h"
#include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
#include "wx/bitmap.h" // wxBitmap used by-value #include "wx/bitmap.h" // wxBitmap used by-value
class WXDLLIMPEXP_CORE wxTextCtrl;
class WXDLLEXPORT wxComboPopup; class WXDLLEXPORT wxComboPopup;
// //

1
include/wx/generic/combo.h
View File

@@ -31,6 +31,7 @@
#endif #endif
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
{ {