move wxKEY_XXX constants to wx/defs.h from wx/list.h and wx/hash.h to avoid duplicati...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6bb7da9ed420f8afdf96e81a2e303cd2b92ad806..75191a57e5000b0e828448ffe895c463b89761aa 100644 (file)
--- 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 6324dd12327c27ddc0787db32f154e55fc53d8ca..7e189ea848a992ee5f06704743ff4816fe7fc774 100644 (file)
--- 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