fix several bugs in index/position translation code between wx and MSW

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

diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp
index 5f5bf98304b5392b9397dfaffd7ee01627c03394..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,10 +152,9 @@ void wxCheckListBox::OnSize(wxSizeEvent& event)
 // misc overloaded methods
 // -----------------------
 
 // misc overloaded methods
 // -----------------------
 

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

 {
 {

-    wxCHECK_RET( n >= 0 && n < GetCount(),
-                 _T("invalid index in wxCheckListBox::Delete") );
+    wxCHECK_RET( IsValid( n ), _T("invalid index in wxCheckListBox::Delete") );

 
     if ( !ListView_DeleteItem(GetHwnd(), n) )
     {
 
     if ( !ListView_DeleteItem(GetHwnd(), n) )
     {


@@ -169,17 +166,17 @@ void wxCheckListBox::Delete(int n)
 // check items
 // -----------
 
 // check items
 // -----------
 

-bool wxCheckListBox::IsChecked(size_t uiIndex) const
+bool wxCheckListBox::IsChecked(unsigned int uiIndex) const

 {
 {

-    wxCHECK_MSG( uiIndex < (size_t)GetCount(), false,
+    wxCHECK_MSG( IsValid( uiIndex ), false,

                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return (ListView_GetCheckState(((HWND)GetHWND()), uiIndex) != 0);
 }
 
                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return (ListView_GetCheckState(((HWND)GetHWND()), uiIndex) != 0);
 }
 

-void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
+void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)

 {
 {

-    wxCHECK_RET( uiIndex < (size_t)GetCount(),
+    wxCHECK_RET( IsValid( uiIndex ),

                  _T("invalid index in wxCheckListBox::Check") );
 
     ListView_SetCheckState(((HWND)GetHWND()), uiIndex, bCheck)
                  _T("invalid index in wxCheckListBox::Check") );
 
     ListView_SetCheckState(((HWND)GetHWND()), uiIndex, bCheck)


@@ -188,45 +185,51 @@ void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
 // interface derived from wxListBox and lower classes
 // --------------------------------------------------
 
 // interface derived from wxListBox and lower classes
 // --------------------------------------------------
 

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

 {
 {

-    int n = GetCount();
+    unsigned int n = GetCount();

 
     while ( n > 0 )
     {
         n--;
 
     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()") );

 }
 
 }
 

-int wxCheckListBox::GetCount() const
+unsigned int wxCheckListBox::GetCount() const

 {
 {

-    return ListView_GetItemCount( (HWND)GetHWND() );
+    return (unsigned int)ListView_GetItemCount( (HWND)GetHWND() );

 }
 
 int wxCheckListBox::GetSelection() const
 {
 }
 
 int wxCheckListBox::GetSelection() const
 {

+    int i;
+    for (i = 0; (unsigned int)i < GetCount(); i++)
+    {
+        int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED);
+        if (selState == LVIS_SELECTED)
+            return i;
+    }
+

     return wxNOT_FOUND;
 }
 
 int wxCheckListBox::GetSelections(wxArrayInt& aSelections) const
 {
     return wxNOT_FOUND;
 }
 
 int wxCheckListBox::GetSelections(wxArrayInt& aSelections) const
 {

-    int n = GetCount();
-    while ( n > 0 )
+    int i;
+    for (i = 0; (unsigned int)i < GetCount(); i++)

     {
     {

-        n--;
-        if(IsChecked(n)) aSelections.Insert(n,0);
+        int selState = ListView_GetItemState(GetHwnd(), i, LVIS_SELECTED);
+        if (selState == LVIS_SELECTED)
+            aSelections.Add(i);

     }
 
     return aSelections.GetCount();
 }
 
     }
 
     return aSelections.GetCount();
 }
 

-wxString wxCheckListBox::GetString(int n) const
+wxString wxCheckListBox::GetString(unsigned int n) const

 {
     const int bufSize = 513;
     wxChar buf[bufSize];
 {
     const int bufSize = 513;
     wxChar buf[bufSize];


@@ -238,12 +241,13 @@ wxString wxCheckListBox::GetString(int n) const
 
 bool wxCheckListBox::IsSelected(int n) const
 {
 
 bool wxCheckListBox::IsSelected(int n) const
 {

-    return IsChecked(n);
+    int selState = ListView_GetItemState(GetHwnd(), n, LVIS_SELECTED);
+    return (selState == LVIS_SELECTED);

 }
 
 }
 

-void wxCheckListBox::SetString(int n, const wxString& s)
+void wxCheckListBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    wxCHECK_RET( n < GetCount(),
+    wxCHECK_RET( IsValid( n ),

                  _T("invalid index in wxCheckListBox::SetString") );
     wxChar *buf = new wxChar[s.length()+1];
     wxStrcpy(buf, s.c_str());
                  _T("invalid index in wxCheckListBox::SetString") );
     wxChar *buf = new wxChar[s.length()+1];
     wxStrcpy(buf, s.c_str());


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

-int wxCheckListBox::DoAppend(const wxString& item)
-{
-    int n = 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(int n) const
+void* wxCheckListBox::DoGetItemClientData(unsigned int n) const

 {
     return m_itemsClientData.Item(n);
 }
 
 {
     return m_itemsClientData.Item(n);
 }
 

-wxClientData* wxCheckListBox::DoGetItemClientObject(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, int pos)
-{
-    for( size_t i = 0; i < items.GetCount(); i++ )
+    ListView_SetItemCount( GetHwnd(), GetCount() + count );
+
+    int n = wxNOT_FOUND;
+
+    for( unsigned int i = 0; i < count; i++ )

     {
     {

-        Insert(items[i],pos+i);
+        LVITEM newItem;
+        wxZeroMemory(newItem);
+        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)


@@ -293,31 +297,100 @@ void wxCheckListBox::DoSetFirstItem(int n)
     ListView_Scroll( (HWND)GetHWND(), 0, ppt.y );
 }
 
     ListView_Scroll( (HWND)GetHWND(), 0, ppt.y );
 }
 

-void wxCheckListBox::DoSetItemClientData(int n, void* clientData)
+void wxCheckListBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
     m_itemsClientData.Item(n) = clientData;
 }
 
 {
     m_itemsClientData.Item(n) = clientData;
 }
 

-void wxCheckListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxCheckListBox::DoSetSelection(int n, bool select)

 {
 {

-    DoSetItemClientData(n, clientData);
+    ListView_SetItemState(GetHwnd(), n, select ? LVIS_SELECTED : 0, LVIS_SELECTED);

 }
 
 }
 

-void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+bool wxCheckListBox::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)

 {
 {

-    ListView_SetItemCount( GetHwnd(), GetCount() + items.GetCount() );
+    // prepare the event
+    // -----------------
+
+    wxCommandEvent event(wxEVT_NULL, m_windowId);
+    event.SetEventObject(this);

 
 

-    for( size_t i = 0; i < items.GetCount(); i++ )
+    wxEventType eventType = wxEVT_NULL;
+
+    NMHDR *nmhdr = (NMHDR *)lParam;
+
+    if ( nmhdr->hwndFrom == GetHwnd() )

     {
     {

-        int pos = Append(items[i]);
-        if( pos >= 0 && clientData )
-            DoSetItemClientData(pos, clientData[i]);
+        // almost all messages use NM_LISTVIEW
+        NM_LISTVIEW *nmLV = (NM_LISTVIEW *)nmhdr;
+
+        const int iItem = nmLV->iItem;
+
+        bool processed = true;
+        switch ( nmhdr->code )
+        {
+            case LVN_ITEMCHANGED:
+                // we translate this catch all message into more interesting
+                // (and more easy to process) wxWidgets events
+
+                // first of all, we deal with the state change events only and
+                // only for valid items (item == -1 for the virtual list
+                // control)
+                if ( nmLV->uChanged & LVIF_STATE && iItem != -1 )
+                {
+                    // temp vars for readability
+                    const UINT stOld = nmLV->uOldState;
+                    const UINT stNew = nmLV->uNewState;
+
+                    // Check image changed
+                    if ((stOld & LVIS_STATEIMAGEMASK) != (stNew & LVIS_STATEIMAGEMASK))
+                    {
+                        event.SetEventType(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED);
+                        event.SetInt(IsChecked(iItem));
+                        (void) GetEventHandler()->ProcessEvent(event);
+                    }
+
+                    if ( (stNew & LVIS_SELECTED) != (stOld & LVIS_SELECTED) )
+                    {
+                        eventType = wxEVT_COMMAND_LISTBOX_SELECTED;
+
+                        event.SetExtraLong( (stNew & LVIS_SELECTED) != 0 ); // is a selection
+                        event.SetInt(iItem);
+                    }
+                }
+
+                if ( eventType == wxEVT_NULL )
+                {
+                    // not an interesting event for us
+                    return false;
+                }
+
+                break;
+
+            default:
+                processed = false;
+        }
+
+        if ( !processed )
+            return wxControl::MSWOnNotify(idCtrl, lParam, result);
+    }
+    else
+    {
+        // where did this one come from?
+        return false;

     }
     }

-}

 
 

-void wxCheckListBox::DoSetSelection(int n, bool select)
-{
-    Check(n,select);
+    // process the event
+    // -----------------
+
+    event.SetEventType(eventType);
+
+    bool processed = GetEventHandler()->ProcessEvent(event);
+    if ( processed )
+        *result = 0;
+
+    return processed;

 }
 
 }
 

+

 #endif
 #endif