Adding label editing to native OS X listctrl.

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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index a38fa3c5851b42d78211b8d6520fc38b07b66362..33fae4c1045b668ea092b765675f92a59410c819 100644 (file)
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,10 +12,6 @@
 #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"
@@ -36,18 +32,18 @@ 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;
@@ -57,7 +53,7 @@ public:
             *returnValue = ret;
         return true;
     }
-    
+
     void AddField( const wxString &name, void* initialValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -66,7 +62,7 @@ public:
         else
             it->second = initialValue;
     }
-    
+
     void SetField( const wxString &name, void* value )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -74,7 +70,7 @@ public:
             return;
         it->second = value;
     }
-    
+
     void* GetField( const wxString &name, void *defaultValue = NULL )
     {
         wxShadowObjectFields::iterator it = m_fields.find( name );
@@ -82,12 +78,13 @@ public:
             return defaultValue;
         return it->second;
     }
-    
+
 private:
     wxShadowObjectMethods   m_methods;
     wxShadowObjectFields    m_fields;
 };
 
+
 // ----------------------------------------------------------------------------
 
 // what kind of client data do we have?
@@ -162,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
 {
@@ -175,7 +169,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
@@ -271,8 +269,5 @@ private:
     wxClientDataDictionaryPairVector m_vec;
 };
 
-#endif // __WXMOTIF__
-
-// ----------------------------------------------------------------------------
-#endif
+#endif // _WX_CLNTDATAH__