Make wxBase compiled for wxMotif compatible with wxbase compiled

with all the other Unix-ish ports. Thanks to Ian Brown for nagging
about this.

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 7653e09b360b91524a9554ff18636a0bbb8f8da7..7e6c5f3235febc9b221d8c9e1f0b835b10dbebc3 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -166,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>
 
 
 #include <wx/vector.h>
 

diff --git a/version-script.in b/version-script.in
index b04b273fad4d342b377a9b11d455575bc5bbe325..8a4d7b2efa2b8513442d9e8aa68475cc59835382 100644 (file)
--- a/version-script.in
+++ b/version-script.in
@@ -10,6 +10,23 @@
 
 @WX_VERSION_TAG@.2 {
     global:
 
 @WX_VERSION_TAG@.2 {
     global:

+        *wxClientDataDictionary*Delete*;
+        *wxClientDataDictionary*DestroyData*;
+        *wxClientDataDictionary*Find*;
+        *wxClientDataDictionary*Get*;
+        *wxClientDataDictionary*Set*wxClientData*;
+        *wxClientDataDictionary*wxClientDataDictionary*;
+        *wxClientDataDictionaryPair*wxClientDataDictionaryPair*;
+        *wxClientDataDictionaryPairVector*at*;
+        *wxClientDataDictionaryPairVector*back*;
+        *wxClientDataDictionaryPairVector*Copy*void*;
+        *wxClientDataDictionaryPairVector*erase*;
+        *wxClientDataDictionaryPairVector*Free*void*;
+        *wxClientDataDictionaryPairVector*front*;
+        *wxClientDataDictionaryPairVector*pop_back*;
+        *wxClientDataDictionaryPairVector*push_back*wxClientDataDictionaryPair*;
+        *wxClientDataDictionaryPairVector*wxClientDataDictionaryPairVector*wxClientDataDictionaryPairVector*;
+        *wxClientDataDictionaryPairVector*wxClientDataDictionaryPairVector*;

         *wxDialog*GetEscapeId*;
         *wxEVT_MEDIA_LOADED*;
         *wxGenericListCtrl*SetItemFont*wxFont*;
         *wxDialog*GetEscapeId*;
         *wxEVT_MEDIA_LOADED*;
         *wxGenericListCtrl*SetItemFont*wxFont*;


@@ -23,6 +40,14 @@
         *wxMessageOutputBest*;
         *wxShadowObject*;
         *wxTopLevelWindowGTK*RequestUserAttention*;
         *wxMessageOutputBest*;
         *wxShadowObject*;
         *wxTopLevelWindowGTK*RequestUserAttention*;

+        *wxVectorBase*Alloc*;
+        *wxVectorBase*Append*void*;
+        *wxVectorBase*clear*;
+        *wxVectorBase*copy*wxVectorBase*;
+        *wxVectorBase*GetItem*;
+        *wxVectorBase*RemoveAt*;
+        *wxVectorBase*size*;
+        *wxVectorBase*wxVectorBase*;

         *wxWizard*FinishLayout*;
         *wxXmlResource*ConvertFileNameToURL*wxString*;
         *wxXmlResource*IsArchive*wxString*;
         *wxWizard*FinishLayout*;
         *wxXmlResource*ConvertFileNameToURL*wxString*;
         *wxXmlResource*IsArchive*wxString*;