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@40386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,15 +14,6 @@
|
|||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* wxComboBox style flags
|
|
||||||
*/
|
|
||||||
#define wxCB_SIMPLE 0x0004
|
|
||||||
#define wxCB_SORT 0x0008
|
|
||||||
#define wxCB_READONLY 0x0010
|
|
||||||
#define wxCB_DROPDOWN 0x0020
|
|
||||||
#define wxCB_FILENAME 0x0040
|
|
||||||
|
|
||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
|
extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
|
||||||
|
Reference in New Issue
Block a user