X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/131b1fba9dbedc86a0b5d7861ca374800f3ad40d..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/ctrlsub.h

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index c71a878352..82a98dfdfb 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -30,7 +30,7 @@
 // implements an extended interface deriving from this one)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxItemContainerImmutable
+class WXDLLIMPEXP_CORE wxItemContainerImmutable
 {
 public:
     wxItemContainerImmutable() { }
@@ -73,7 +73,7 @@ public:
     bool SetStringSelection(const wxString& s);
 
     // return the selected string or empty string if none
-    wxString GetStringSelection() const;
+    virtual wxString GetStringSelection() const;
 
     // this is the same as SetSelection( for single-selection controls but
     // reads better for multi-selection ones
@@ -97,7 +97,7 @@ protected:
 // in this case DoInsertItem() needs to be overridden.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable
+class WXDLLIMPEXP_CORE wxItemContainer : public wxItemContainerImmutable
 {
 private:
     // AppendItems() and InsertItems() helpers just call DoAppend/InsertItems()
@@ -122,7 +122,7 @@ private:
     int AppendItems(const wxArrayStringsAdapter& items, void **clientData)
     {
         wxASSERT_MSG( GetClientDataType() != wxClientData_Object,
-                      _T("can't mix different types of client data") );
+                      wxT("can't mix different types of client data") );
 
         return AppendItems(items, clientData, wxClientData_Void);
     }
@@ -131,9 +131,9 @@ private:
                     wxClientData **clientData)
     {
         wxASSERT_MSG( GetClientDataType() != wxClientData_Void,
-                      _T("can't mix different types of client data") );
+                      wxT("can't mix different types of client data") );
 
-        return AppendItems(items, wx_reinterpret_cast(void **, clientData),
+        return AppendItems(items, reinterpret_cast<void **>(clientData),
                            wxClientData_Object);
     }
 
@@ -142,17 +142,17 @@ private:
                     void **clientData,
                     wxClientDataType type)
     {
-        wxASSERT_MSG( !IsSorted(), _T("can't insert items in sorted control") );
+        wxASSERT_MSG( !IsSorted(), wxT("can't insert items in sorted control") );
 
         wxCHECK_MSG( pos <= GetCount(), wxNOT_FOUND,
-                     _T("position out of range") );
+                     wxT("position out of range") );
 
         // not all derived classes handle empty arrays correctly in
         // DoInsertItems() and besides it really doesn't make much sense to do
         // this (for append it could correspond to creating an initially empty
         // control but why would anybody need to insert 0 items?)
         wxCHECK_MSG( !items.IsEmpty(), wxNOT_FOUND,
-                     _T("need something to insert") );
+                     wxT("need something to insert") );
 
         return DoInsertItems(items, pos, clientData, type);
     }
@@ -167,7 +167,7 @@ private:
                      void **clientData)
     {
         wxASSERT_MSG( GetClientDataType() != wxClientData_Object,
-                      _T("can't mix different types of client data") );
+                      wxT("can't mix different types of client data") );
 
         return InsertItems(items, pos, clientData, wxClientData_Void);
     }
@@ -177,10 +177,10 @@ private:
                      wxClientData **clientData)
     {
         wxASSERT_MSG( GetClientDataType() != wxClientData_Void,
-                      _T("can't mix different types of client data") );
+                      wxT("can't mix different types of client data") );
 
         return InsertItems(items, pos,
-                           wx_reinterpret_cast(void **, clientData),
+                           reinterpret_cast<void **>(clientData),
                            wxClientData_Object);
     }
 
@@ -296,8 +296,13 @@ public:
     void SetClientData(unsigned int n, void* clientData);
     void* GetClientData(unsigned int n) const;
 
+    // SetClientObject() takes ownership of the pointer, GetClientObject()
+    // returns it but keeps the ownership while DetachClientObject() expects
+    // the caller to delete the pointer and also resets the internally stored
+    // one to NULL for this item
     void SetClientObject(unsigned int n, wxClientData* clientData);
     wxClientData* GetClientObject(unsigned int n) const;
+    wxClientData* DetachClientObject(unsigned int n);
 
     // return the type of client data stored in this control: usually it just
     // returns m_clientDataItemsType but must be overridden in the controls
@@ -412,7 +417,7 @@ private:
     wxClientData* GetClientObject(unsigned int n) const                    \
         { return wxItemContainer::GetClientObject(n); }
 
-class WXDLLEXPORT wxControlWithItemsBase : public wxControl,
+class WXDLLIMPEXP_CORE wxControlWithItemsBase : public wxControl,
                                            public wxItemContainer
 {
 public:
@@ -437,7 +442,7 @@ protected:
     void InitCommandEventWithItems(wxCommandEvent& event, int n);
 
 private:
-    DECLARE_NO_COPY_CLASS(wxControlWithItemsBase)
+    wxDECLARE_NO_COPY_CLASS(wxControlWithItemsBase);
 };
 
 // define the platform-specific wxControlWithItems class
@@ -446,14 +451,14 @@ private:
 #elif defined(__WXMOTIF__)
     #include "wx/motif/ctrlsub.h"
 #else
-    class WXDLLEXPORT wxControlWithItems : public wxControlWithItemsBase
+    class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
     {
     public:
         wxControlWithItems() { }
 
     private:
         DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-        DECLARE_NO_COPY_CLASS(wxControlWithItems)
+        wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
     };
 #endif