Forgot header with OSX prefix

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index ec05cae1468d69a61287c0c09a030dc41e51693b..e9d0dfa06462caefd1de9672dd520b9a07a30196 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -102,7 +102,7 @@ void wxItemContainer::Clear()
             ResetItemClientObject(i);
     }
 
             ResetItemClientObject(i);
     }
 

-    m_clientDataItemsType = wxClientData_None;
+    SetClientDataType(wxClientData_None);

 
     DoClear();
 }
 
     DoClear();
 }


@@ -118,7 +118,7 @@ void wxItemContainer::Delete(unsigned int pos)
 
     if ( IsEmpty() )
     {
 
     if ( IsEmpty() )
     {

-        m_clientDataItemsType = wxClientData_None;
+        SetClientDataType(wxClientData_None);

     }
 }
 
     }
 }
 


@@ -162,23 +162,22 @@ wxItemContainer::DoInsertOneItem(const wxString& WXUNUSED(item),
 
 void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
 {
 
 void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
 {

-    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object ||
-                    m_clientDataItemsType == wxClientData_None,
+    wxASSERT_MSG( !HasClientUntypedData(),

                   wxT("can't have both object and void client data") );
 
                   wxT("can't have both object and void client data") );
 

-    if ( m_clientDataItemsType == wxClientData_Object )
+    if ( HasClientObjectData() )

     {
         wxClientData * clientDataOld
     {
         wxClientData * clientDataOld

-            = wx_static_cast(wxClientData *, DoGetItemClientData(n));
+            = static_cast<wxClientData *>(DoGetItemClientData(n));

         if ( clientDataOld )
             delete clientDataOld;
     }
         if ( clientDataOld )
             delete clientDataOld;
     }

-    else // m_clientDataItemsType == wxClientData_None
+    else // didn't have any client data so far

     {
         // now we have object client data
         DoInitItemClientData();
 
     {
         // now we have object client data
         DoInitItemClientData();
 

-        m_clientDataItemsType = wxClientData_Object;
+        SetClientDataType(wxClientData_Object);

     }
 
     DoSetItemClientData(n, data);
     }
 
     DoSetItemClientData(n, data);


@@ -186,21 +185,21 @@ void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
 
 wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
 {
 
 wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
 {

-    wxCHECK_MSG( m_clientDataItemsType == wxClientData_Object, NULL,
+    wxCHECK_MSG( HasClientObjectData(), NULL,

                   wxT("this window doesn't have object client data") );
 
                   wxT("this window doesn't have object client data") );
 

-    return wx_static_cast(wxClientData *, DoGetItemClientData(n));
+    return static_cast<wxClientData *>(DoGetItemClientData(n));

 }
 
 void wxItemContainer::SetClientData(unsigned int n, void *data)
 {
 }
 
 void wxItemContainer::SetClientData(unsigned int n, void *data)
 {

-    if ( m_clientDataItemsType == wxClientData_None )
+    if ( !HasClientData() )

     {
         DoInitItemClientData();
     {
         DoInitItemClientData();

-        m_clientDataItemsType = wxClientData_Void;
+        SetClientDataType(wxClientData_Void);

     }
 
     }
 

-    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
+    wxASSERT_MSG( HasClientUntypedData(),

                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);
                   wxT("can't have both object and void client data") );
 
     DoSetItemClientData(n, data);


@@ -208,7 +207,7 @@ void wxItemContainer::SetClientData(unsigned int n, void *data)
 
 void *wxItemContainer::GetClientData(unsigned int n) const
 {
 
 void *wxItemContainer::GetClientData(unsigned int n) const
 {

-    wxCHECK_MSG( m_clientDataItemsType == wxClientData_Void, NULL,
+    wxCHECK_MSG( HasClientUntypedData(), NULL,

                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);
                   wxT("this window doesn't have void client data") );
 
     return DoGetItemClientData(n);


@@ -225,7 +224,7 @@ void wxItemContainer::AssignNewItemClientData(unsigned int pos,
             SetClientObject
             (
                 pos,
             SetClientObject
             (
                 pos,

-                (wx_reinterpret_cast(wxClientData **, clientData))[n]
+                (reinterpret_cast<wxClientData **>(clientData))[n]

             );
             break;
 
             );
             break;