X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/131b1fba9dbedc86a0b5d7861ca374800f3ad40d..902334c8fac2e7fb7b54170315ff027530c4567b:/src/common/ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 05440cd78f..388af3e6ff 100644
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -109,7 +109,7 @@ void wxItemContainer::Clear()
 
 void wxItemContainer::Delete(unsigned int pos)
 {
-    wxCHECK_RET( pos < GetCount(), _T("invalid index") );
+    wxCHECK_RET( pos < GetCount(), wxT("invalid index") );
 
     if ( HasClientObjectData() )
         ResetItemClientObject(pos);
@@ -123,7 +123,7 @@ void wxItemContainer::Delete(unsigned int pos)
 }
 
 // ----------------------------------------------------------------------------
-// 
+//
 // ----------------------------------------------------------------------------
 
 int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items,
@@ -150,7 +150,7 @@ int
 wxItemContainer::DoInsertOneItem(const wxString& WXUNUSED(item),
                                  unsigned int WXUNUSED(pos))
 {
-    wxFAIL_MSG( _T("Must be overridden if DoInsertItemsInLoop() is used") );
+    wxFAIL_MSG( wxT("Must be overridden if DoInsertItemsInLoop() is used") );
 
     return wxNOT_FOUND;
 }
@@ -165,10 +165,12 @@ void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
     wxASSERT_MSG( !HasClientUntypedData(),
                   wxT("can't have both object and void client data") );
 
+    wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientObject()" );
+
     if ( HasClientObjectData() )
     {
         wxClientData * clientDataOld
-            = wx_static_cast(wxClientData *, DoGetItemClientData(n));
+            = static_cast<wxClientData *>(DoGetItemClientData(n));
         if ( clientDataOld )
             delete clientDataOld;
     }
@@ -188,7 +190,22 @@ wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
     wxCHECK_MSG( HasClientObjectData(), NULL,
                   wxT("this window doesn't have object client data") );
 
-    return wx_static_cast(wxClientData *, DoGetItemClientData(n));
+    wxCHECK_MSG( IsValid(n), NULL,
+                 "Invalid index passed to GetClientObject()" );
+
+    return static_cast<wxClientData *>(DoGetItemClientData(n));
+}
+
+wxClientData *wxItemContainer::DetachClientObject(unsigned int n)
+{
+    wxClientData * const data = GetClientObject(n);
+    if ( data )
+    {
+        // reset the pointer as we don't own it any more
+        DoSetItemClientData(n, NULL);
+    }
+
+    return data;
 }
 
 void wxItemContainer::SetClientData(unsigned int n, void *data)
@@ -202,6 +219,8 @@ void wxItemContainer::SetClientData(unsigned int n, void *data)
     wxASSERT_MSG( HasClientUntypedData(),
                   wxT("can't have both object and void client data") );
 
+    wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientData()" );
+
     DoSetItemClientData(n, data);
 }
 
@@ -210,6 +229,9 @@ void *wxItemContainer::GetClientData(unsigned int n) const
     wxCHECK_MSG( HasClientUntypedData(), NULL,
                   wxT("this window doesn't have void client data") );
 
+    wxCHECK_MSG( IsValid(n), NULL,
+                 "Invalid index passed to GetClientData()" );
+
     return DoGetItemClientData(n);
 }
 
@@ -224,7 +246,7 @@ void wxItemContainer::AssignNewItemClientData(unsigned int pos,
             SetClientObject
             (
                 pos,
-                (wx_reinterpret_cast(wxClientData **, clientData))[n]
+                (reinterpret_cast<wxClientData **>(clientData))[n]
             );
             break;
 
@@ -233,7 +255,7 @@ void wxItemContainer::AssignNewItemClientData(unsigned int pos,
             break;
 
         default:
-            wxFAIL_MSG( _T("unknown client data type") );
+            wxFAIL_MSG( wxT("unknown client data type") );
             // fall through
 
         case wxClientData_None: