X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b88c44e735c80ecee8791f7560f5ee63dd9e9234..42b6a61ef6680602b4893a39e4a42d66bcb2f2a8:/include/wx/clntdata.h

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 8f2d44ded5..f756dcc2a1 100644
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLNTDATAH__
 #define _WX_CLNTDATAH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "clntdata.h"
 #endif
 
@@ -39,7 +39,7 @@ public:
 class WXDLLEXPORT wxStringClientData : public wxClientData
 {
 public:
-    wxStringClientData() { }
+    wxStringClientData() : m_data() { }
     wxStringClientData( const wxString &data ) : m_data(data) { }
     void SetData( const wxString &data ) { m_data = data; }
     const wxString& GetData() const { return m_data; }
@@ -50,12 +50,14 @@ private:
 
 
 
-#if 0
 // This class is a mixin that provides storage and management of "client
 // data."  The client data stored can either be a pointer to a wxClientData
 // object in which case it is managed by the container (i.e.  it will delete
 // the data when it's destroyed) or an untyped pointer which won't be deleted
-// by the window - but not both of them
+// by the container - but not both of them
+//
+// NOTE:  This functionality is currently duplicated in wxEvtHandler in order
+//        to avoid having more than one vtable in that class heirachy.
 
 class WXDLLEXPORT wxClientDataContainer
 {
@@ -92,7 +94,118 @@ protected:
     wxClientDataType m_clientDataType;
 
 };
-#endif
+
+// not Motif-specific, but currently used only under Motif
+#ifdef __WXMOTIF__
+
+#include <wx/vector.h>
+
+struct WXDLLEXPORT wxClientDataDictionaryPair
+{
+    wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { }
+
+    size_t index;
+    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 if it contains
+// wxClientData or void*, the client must ensure that
+// it does not contain a mix of the two, and that
+// DestroyData is called if it contains wxClientData
+class WXDLLEXPORT wxClientDataDictionary
+{
+public:
+    wxClientDataDictionary() {};
+
+    // deletes all the data
+    void DestroyData()
+    {
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+            delete m_vec[i].data;
+        m_vec.clear();
+    }
+
+    // if data for the given index is not present, add it,
+    // if it is present, delete the old data and replace it with
+    // the new one
+    void Set( size_t index, wxClientData* data, bool doDelete )
+    {
+        size_t ptr = Find( index );
+
+        if( !data )
+        {
+            if( ptr == m_vec.size() ) return;
+            if( doDelete )
+                delete m_vec[ptr].data;
+            m_vec.erase( ptr );
+        }
+        else
+        {
+            if( ptr == m_vec.size() )
+            {
+                m_vec.push_back( wxClientDataDictionaryPair( index ) );
+                ptr = m_vec.size() - 1;
+            }
+
+            if( doDelete )
+                delete m_vec[ptr].data;
+            m_vec[ptr].data = data;
+        }
+    }
+
+    // get the data associated with the given index,
+    // return 0 if not found
+    wxClientData* Get( size_t index ) const
+    {
+        size_t it = Find( index );
+        if( it == m_vec.size() ) return 0;
+        return (wxClientData*)m_vec[it].data; // const cast
+    }
+
+    // delete the data associated with the given index
+    // it also decreases by one the indices of all the elements
+    // with an index greater than the given index
+    void Delete( size_t index, bool doDelete )
+    {
+        size_t todel = m_vec.size();
+
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+        {
+            if( m_vec[i].index == index )
+                todel = i;
+            else if( m_vec[i].index > index )
+                --(m_vec[i].index);
+        }
+
+        if( todel != m_vec.size() )
+        {
+            if( doDelete )
+                delete m_vec[todel].data;
+            m_vec.erase( todel );
+        }
+    }
+private:
+    // returns MyVec.size() if not found
+    size_t Find( size_t index ) const
+    {
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+        {
+            if( m_vec[i].index == index )
+                return i;
+        }
+
+        return m_vec.size();
+    }
+
+    wxClientDataDictionaryPairVector m_vec;
+};
+
+#endif // __WXMOTIF__
+
 // ----------------------------------------------------------------------------
 #endif