From 248d0a8970db1501645c2cb7eeea4cf285ede268 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Apr 2007 02:15:24 +0000 Subject: [PATCH] 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 --- include/wx/defs.h | 10 ++++++++++ include/wx/list.h | 16 ---------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 6bb7da9ed4..75191a57e5 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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 */ /* ---------------------------------------------------------------------------- */ diff --git a/include/wx/list.h b/include/wx/list.h index 6324dd1232..7e189ea848 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -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 -- 2.45.2