X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..a25b76f5f92c3cc116cb4ca53e8e5a6bcd3ff42f:/src/msw/wince/checklst.cpp

diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp
index d5f5274921..067969cbe1 100644
--- a/src/msw/wince/checklst.cpp
+++ b/src/msw/wince/checklst.cpp
@@ -36,8 +36,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxControl)
-
 // ----------------------------------------------------------------------------
 // implementation of wxCheckListBox class
 // ----------------------------------------------------------------------------
@@ -154,11 +152,11 @@ void wxCheckListBox::OnSize(wxSizeEvent& event)
 
 void wxCheckListBox::DoDeleteOneItem(unsigned int n)
 {
-    wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") );
+    wxCHECK_RET( IsValid( n ), wxT("invalid index in wxCheckListBox::Delete") );
 
     if ( !ListView_DeleteItem(GetHwnd(), n) )
     {
-        wxLogLastError(_T("ListView_DeleteItem"));
+        wxLogLastError(wxT("ListView_DeleteItem"));
     }
     m_itemsClientData.RemoveAt(n);
 }
@@ -169,7 +167,7 @@ void wxCheckListBox::DoDeleteOneItem(unsigned int n)
 bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 {
     wxCHECK_MSG( IsValid( uiIndex ), false,
-                 _T("invalid index in wxCheckListBox::IsChecked") );
+                 wxT("invalid index in wxCheckListBox::IsChecked") );
 
     return (ListView_GetCheckState(((HWND)GetHWND()), uiIndex) != 0);
 }
@@ -177,7 +175,7 @@ bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 {
     wxCHECK_RET( IsValid( uiIndex ),
-                 _T("invalid index in wxCheckListBox::Check") );
+                 wxT("invalid index in wxCheckListBox::Check") );
 
     ListView_SetCheckState(((HWND)GetHWND()), uiIndex, bCheck)
 }
@@ -185,20 +183,17 @@ void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 // interface derived from wxListBox and lower classes
 // --------------------------------------------------
 
-void wxCheckListBox::Clear()
+void wxCheckListBox::DoClear()
 {
     unsigned int n = GetCount();
 
     while ( n > 0 )
     {
         n--;
-        Delete(n);
+        DoDeleteOneItem(n);
     }
 
-    m_itemsClientData.Clear();
-
-    wxCHECK_RET( n == GetCount(),
-                 _T("broken wxCheckListBox::Clear()") );
+    wxASSERT_MSG( IsEmpty(), wxT("logic error in DoClear()") );
 }
 
 unsigned int wxCheckListBox::GetCount() const
@@ -237,7 +232,7 @@ wxString wxCheckListBox::GetString(unsigned int n) const
     const int bufSize = 513;
     wxChar buf[bufSize];
     ListView_GetItemText( (HWND)GetHWND(), n, 0, buf, bufSize - 1 );
-    buf[bufSize-1] = _T('\0');
+    buf[bufSize-1] = wxT('\0');
     wxString str(buf);
     return str;
 }
@@ -251,7 +246,7 @@ bool wxCheckListBox::IsSelected(int n) const
 void wxCheckListBox::SetString(unsigned int n, const wxString& s)
 {
     wxCHECK_RET( IsValid( n ),
-                 _T("invalid index in wxCheckListBox::SetString") );
+                 wxT("invalid index in wxCheckListBox::SetString") );
     wxChar *buf = new wxChar[s.length()+1];
     wxStrcpy(buf, s.c_str());
     ListView_SetItemText( (HWND)GetHWND(), n, 0, buf );
@@ -267,10 +262,10 @@ int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter & items,
                                   unsigned int pos,
                                   void **clientData, wxClientDataType type)
 {
-    ListView_SetItemCount( GetHwnd(), GetCount() + count );
-
     const unsigned int count = items.GetCount();
 
+    ListView_SetItemCount( GetHwnd(), GetCount() + count );
+
     int n = wxNOT_FOUND;
 
     for( unsigned int i = 0; i < count; i++ )
@@ -279,7 +274,7 @@ int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter & items,
         wxZeroMemory(newItem);
         newItem.iItem = pos + i;
         n = ListView_InsertItem( (HWND)GetHWND(), & newItem );
-        wxCHECK_MSG( n != -1, -1, _T("Item not added") );
+        wxCHECK_MSG( n != -1, -1, wxT("Item not added") );
         SetString( n, items[i] );
         m_itemsClientData.Insert(NULL, n);
 
@@ -295,7 +290,7 @@ void wxCheckListBox::DoSetFirstItem(int n)
     if(pos == n) return;
     POINT ppt;
     BOOL ret = ListView_GetItemPosition( (HWND)GetHWND(), n, &ppt );
-    wxCHECK_RET( ret == TRUE, _T("Broken DoSetFirstItem") );
+    wxCHECK_RET( ret == TRUE, wxT("Broken DoSetFirstItem") );
     ListView_Scroll( (HWND)GetHWND(), 0, 0 );
     ListView_Scroll( (HWND)GetHWND(), 0, ppt.y );
 }
@@ -348,14 +343,14 @@ bool wxCheckListBox::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     // Check image changed
                     if ((stOld & LVIS_STATEIMAGEMASK) != (stNew & LVIS_STATEIMAGEMASK))
                     {
-                        event.SetEventType(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED);
+                        event.SetEventType(wxEVT_CHECKLISTBOX);
                         event.SetInt(IsChecked(iItem));
                         (void) GetEventHandler()->ProcessEvent(event);
                     }
 
                     if ( (stNew & LVIS_SELECTED) != (stOld & LVIS_SELECTED) )
                     {
-                        eventType = wxEVT_COMMAND_LISTBOX_SELECTED;
+                        eventType = wxEVT_LISTBOX;
 
                         event.SetExtraLong( (stNew & LVIS_SELECTED) != 0 ); // is a selection
                         event.SetInt(iItem);