added wxUSE_SVG

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 3ff6030b50b533ca7b97f72f7a5400f69bfe58a9..c1d09e7c68c53b04392acb699682c26ad1717338 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,16 +12,10 @@
 #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"
 

-#if wxABI_VERSION >= 20602
-

 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,
 typedef int (*wxShadowObjectMethod)(void*, void*);
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,


@@ -38,18 +32,18 @@ class WXDLLIMPEXP_BASE wxShadowObject
 {
 public:
     wxShadowObject() { }
 {
 public:
     wxShadowObject() { }

-    
+

     void AddMethod( const wxString &name, wxShadowObjectMethod method )
     void AddMethod( const wxString &name, wxShadowObjectMethod method )

-    { 
+    {

         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             m_methods[ name ] = method;
         else
             it->second = method;
     }
         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             m_methods[ name ] = method;
         else
             it->second = method;
     }

-    
+

     bool InvokeMethod( const wxString &name, void* window, void* param, int* returnValue )
     bool InvokeMethod( const wxString &name, void* window, void* param, int* returnValue )

-    { 
+    {

         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             return false;
         wxShadowObjectMethods::iterator it = m_methods.find( name );
         if (it == m_methods.end())
             return false;


@@ -59,7 +53,7 @@ public:
             *returnValue = ret;
         return true;
     }
             *returnValue = ret;
         return true;
     }

-    
+

     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -68,7 +62,7 @@ public:
         else
             it->second = initialValue;
     }
         else
             it->second = initialValue;
     }

-    
+

     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -76,7 +70,7 @@ public:
             return;
         it->second = value;
     }
             return;
         it->second = value;
     }

-    
+

     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );


@@ -84,13 +78,12 @@ public:
             return defaultValue;
         return it->second;
     }
             return defaultValue;
         return it->second;
     }

-    
+

 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 
 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 

-#endif // wxABI_VERSION

 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 


@@ -166,11 +159,7 @@ protected:
 
 };
 
 
 };
 

-// 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
 {


@@ -180,12 +169,6 @@ struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
     wxClientData* data;
 };
 
     wxClientData* data;
 };
 

-_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
 // NOTE: this class does not keep track of whether it contains
 // this class is used internally to maintain the association between items
 // of (some subclasses of) wxControlWithItems and their client data
 // NOTE: this class does not keep track of whether it contains


@@ -277,11 +260,8 @@ private:
         return m_vec.size();
     }
 
         return m_vec.size();
     }
 

-    wxClientDataDictionaryPairVector m_vec;
+    wxVector<wxClientDataDictionaryPair> m_vec;

 };
 
 };
 

-#endif // __WXMOTIF__
-
-// ----------------------------------------------------------------------------
-#endif
+#endif // _WX_CLNTDATAH__