more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 7653e09b360b91524a9554ff18636a0bbb8f8da7..33908648573d3e5c7598eaa44b7dcb6b4dab823e 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "clntdata.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/hashmap.h"
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/hashmap.h"


@@ -166,10 +162,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
 {
 
 struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
 {


@@ -179,7 +176,11 @@ struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
     wxClientData* data;
 };
 
     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
 
 // this class is used internally to maintain the association between items
 // of (some subclasses of) wxControlWithItems and their client data