added support for binary data to wxConfig (slightly modified patch 1736788)

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index dd208f111a1c13ae8acdeb33e99a387d1e38b81b..c1d09e7c68c53b04392acb699682c26ad1717338 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,34 +12,38 @@
 #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"
 
 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
 {
 public:
     wxShadowObject() { }
-    
+
     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;
     }
-    
+
     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;
@@ -49,7 +53,7 @@ public:
             *returnValue = ret;
         return true;
     }
-    
+
     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -58,7 +62,7 @@ public:
         else
             it->second = initialValue;
     }
-    
+
     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -66,7 +70,7 @@ public:
             return;
         it->second = value;
     }
-    
+
     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -74,12 +78,13 @@ public:
             return defaultValue;
         return it->second;
     }
-    
+
 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 
+
 // ----------------------------------------------------------------------------
 
 // what kind of client data do we have?
@@ -154,10 +159,7 @@ protected:
 
 };
 
-// not Motif-specific, but currently used only under Motif
-#ifdef __WXMOTIF__
-
-#include <wx/vector.h>
+#include "wx/vector.h"
 
 struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
 {
@@ -167,8 +169,6 @@ struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
     wxClientData* data;
 };
 
-WX_DECLARE_VECTOR(wxClientDataDictionaryPair,wxClientDataDictionaryPairVector);
-
 // 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
@@ -260,11 +260,8 @@ private:
         return m_vec.size();
     }
 
-    wxClientDataDictionaryPairVector m_vec;
+    wxVector<wxClientDataDictionaryPair> m_vec;
 };
 
-#endif // __WXMOTIF__
-
-// ----------------------------------------------------------------------------
-#endif
+#endif // _WX_CLNTDATAH__