move wxKEY_XXX constants to wx/defs.h from wx/list.h and wx/hash.h to avoid duplicating their declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1695,6 +1695,16 @@ enum wxBackgroundStyle
|
||||
wxBG_STYLE_CUSTOM
|
||||
};
|
||||
|
||||
/*
|
||||
* Key types used by (old style) lists and hashes.
|
||||
*/
|
||||
enum wxKeyType
|
||||
{
|
||||
wxKEY_NONE,
|
||||
wxKEY_INTEGER,
|
||||
wxKEY_STRING
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
/* standard IDs */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
@@ -60,22 +60,6 @@ typedef wxObjectListNode wxNode;
|
||||
//
|
||||
typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if !defined(wxENUM_KEY_TYPE_DEFINED)
|
||||
#define wxENUM_KEY_TYPE_DEFINED
|
||||
|
||||
enum wxKeyType
|
||||
{
|
||||
wxKEY_NONE,
|
||||
wxKEY_INTEGER,
|
||||
wxKEY_STRING
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#if wxUSE_STL
|
||||
|
||||
#define wxLIST_COMPATIBILITY
|
||||
|
Reference in New Issue
Block a user