removed wxUSE_MENU_CALLBACK references: the code inside the #if couldn't compile...

[wxWidgets.git] / include / wx / clntdata.h

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index dd208f111a1c13ae8acdeb33e99a387d1e38b81b..7e6c5f3235febc9b221d8c9e1f0b835b10dbebc3 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -20,9 +20,19 @@
 #include "wx/string.h"
 #include "wx/hashmap.h"
 
+#if wxABI_VERSION >= 20602
+
 typedef int (*wxShadowObjectMethod)(void*, void*);
-WX_DECLARE_STRING_HASH_MAP( wxShadowObjectMethod, wxShadowObjectMethods );
-WX_DECLARE_STRING_HASH_MAP( void*, wxShadowObjectFields );
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
+    wxShadowObjectMethod,
+    wxShadowObjectMethods,
+    class WXDLLIMPEXP_BASE
+);
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
+    void *,
+    wxShadowObjectFields,
+    class WXDLLIMPEXP_BASE
+);
 
 class WXDLLIMPEXP_BASE wxShadowObject
 {
@@ -80,6 +90,8 @@ private:
     wxShadowObjectFields    m_fields;
 };
 
+#endif // wxABI_VERSION
+
 // ----------------------------------------------------------------------------
 
 // what kind of client data do we have?
@@ -154,8 +166,9 @@ protected:
 
 };
 
-// not Motif-specific, but currently used only under Motif
-#ifdef __WXMOTIF__
+// not Motif-specific, but currently used only under Motif,
+// compiled to make wxMotif and wxGTK base libraries compatible
+#if defined(__WXMOTIF__) || wxABI_VERSION >= 20602
 
 #include <wx/vector.h>