patch as at http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/92350 thanks

[wxWidgets.git] / src / msw / wince / checklst.cpp

diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp
index b0044c84439f0409b7339624a475988040b56e68..334f86fd51fbd5b4739cf17235f87094f0767c40 100644 (file)
--- a/src/msw/wince/checklst.cpp
+++ b/src/msw/wince/checklst.cpp
@@ -21,18 +21,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_CHECKLISTBOX
 
 #endif
 
 #if wxUSE_CHECKLISTBOX
 

-#ifndef WX_PRECOMP
-#endif
-

 #include "wx/checklst.h"
 
 #include "wx/checklst.h"
 

-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -118,7 +116,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     m_itemsClientData.SetCount(n);
 
     // now we can compute our best size correctly, so do it if necessary
     m_itemsClientData.SetCount(n);
 
     // now we can compute our best size correctly, so do it if necessary

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -154,7 +152,7 @@ void wxCheckListBox::OnSize(wxSizeEvent& event)
 // misc overloaded methods
 // -----------------------
 
 // misc overloaded methods
 // -----------------------
 

-void wxCheckListBox::Delete(unsigned int n)
+void wxCheckListBox::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") );
 
 {
     wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") );
 


@@ -187,20 +185,17 @@ void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 // interface derived from wxListBox and lower classes
 // --------------------------------------------------
 
 // interface derived from wxListBox and lower classes
 // --------------------------------------------------
 

-void wxCheckListBox::Clear()
+void wxCheckListBox::DoClear()

 {
     unsigned int n = GetCount();
 
     while ( n > 0 )
     {
         n--;
 {
     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(), _T("logic error in DoClear()") );

 }
 
 unsigned int wxCheckListBox::GetCount() const
 }
 
 unsigned int wxCheckListBox::GetCount() const


@@ -260,44 +255,35 @@ void wxCheckListBox::SetString(unsigned int n, const wxString& s)
     delete [] buf;
 }
 
     delete [] buf;
 }
 

-int wxCheckListBox::DoAppend(const wxString& item)
-{
-    int n = (int)GetCount();
-    LVITEM newItem;
-    wxZeroMemory(newItem);
-    newItem.iItem = n;
-    int ret = ListView_InsertItem( (HWND)GetHWND(), & newItem );
-    wxCHECK_MSG( n == ret , -1, _T("Item not added") );
-    SetString( ret , item );
-    m_itemsClientData.Insert(NULL, ret);
-    return ret;
-}
-

 void* wxCheckListBox::DoGetItemClientData(unsigned int n) const
 {
     return m_itemsClientData.Item(n);
 }
 
 void* wxCheckListBox::DoGetItemClientData(unsigned int n) const
 {
     return m_itemsClientData.Item(n);
 }
 

-wxClientData* wxCheckListBox::DoGetItemClientObject(unsigned int n) const
+int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                                  unsigned int pos,
+                                  void **clientData, wxClientDataType type)

 {
 {

-    return (wxClientData *)DoGetItemClientData(n);
-}
+    const unsigned int count = items.GetCount();

 
 

-void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
-{
-    wxCHECK_RET( IsValidInsert( pos ),
-                 wxT("invalid index in wxListBox::InsertItems") );
+    ListView_SetItemCount( GetHwnd(), GetCount() + count );

 
 

-    for( unsigned int i = 0; i < items.GetCount(); i++ )
+    int n = wxNOT_FOUND;
+
+    for( unsigned int i = 0; i < count; i++ )

     {
         LVITEM newItem;
         wxZeroMemory(newItem);
     {
         LVITEM newItem;
         wxZeroMemory(newItem);

-        newItem.iItem = i+pos;
-        int ret = ListView_InsertItem( (HWND)GetHWND(), & newItem );
-        wxASSERT_MSG( int(i+pos) == ret , _T("Item not added") );
-        SetString( ret , items[i] );
-        m_itemsClientData.Insert(NULL, ret);
+        newItem.iItem = pos + i;
+        n = ListView_InsertItem( (HWND)GetHWND(), & newItem );
+        wxCHECK_MSG( n != -1, -1, _T("Item not added") );
+        SetString( n, items[i] );
+        m_itemsClientData.Insert(NULL, n);
+
+        AssignNewItemClientData(n, clientData, i, type);

     }
     }

+
+    return n;

 }
 
 void wxCheckListBox::DoSetFirstItem(int n)
 }
 
 void wxCheckListBox::DoSetFirstItem(int n)


@@ -316,23 +302,6 @@ void wxCheckListBox::DoSetItemClientData(unsigned int n, void* clientData)
     m_itemsClientData.Item(n) = clientData;
 }
 
     m_itemsClientData.Item(n) = clientData;
 }
 

-void wxCheckListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, clientData);
-}
-
-void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
-{
-    ListView_SetItemCount( GetHwnd(), GetCount() + items.GetCount() );
-
-    for( unsigned int i = 0; i < items.GetCount(); i++ )
-    {
-        int pos = Append(items[i]);
-        if( pos >= 0 && clientData )
-            DoSetItemClientData(pos, clientData[i]);
-    }
-}
-

 void wxCheckListBox::DoSetSelection(int n, bool select)
 {
     ListView_SetItemState(GetHwnd(), n, select ? LVIS_SELECTED : 0, LVIS_SELECTED);
 void wxCheckListBox::DoSetSelection(int n, bool select)
 {
     ListView_SetItemState(GetHwnd(), n, select ? LVIS_SELECTED : 0, LVIS_SELECTED);