X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a64bfdfd0c4bf305ea2882a3c5c1de62124a2e0..1d54b9d29706dbb43de5624bdf4a2aaa74b2350b:/include/wx/clntdata.h

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index a38fa3c585..b2b8cfa1b6 100644
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -20,6 +20,8 @@
 #include "wx/string.h"
 #include "wx/hashmap.h"
 
+#if wxABI_VERSION >= 20602
+
 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,
@@ -88,6 +90,8 @@ private:
     wxShadowObjectFields    m_fields;
 };
 
+#endif // wxABI_VERSION
+
 // ----------------------------------------------------------------------------
 
 // what kind of client data do we have?
@@ -162,10 +166,11 @@ 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>
+#include "wx/vector.h"
 
 struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
 {
@@ -175,7 +180,11 @@ struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
     wxClientData* data;
 };
 
-WX_DECLARE_VECTOR(wxClientDataDictionaryPair,wxClientDataDictionaryPairVector);
+_WX_DECLARE_VECTOR(
+    wxClientDataDictionaryPair,
+    wxClientDataDictionaryPairVector,
+    WXDLLIMPEXP_BASE
+);
 
 // this class is used internally to maintain the association between items
 // of (some subclasses of) wxControlWithItems and their client data