Refactored wxListBox code so that it correctly implements

wxControlWithItems, and removed some duplicated code.
Implemented wxCheckListBox using the same technique
as wxGTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/motif/checklst.cpp

@@ -39,8 +39,36 @@ END_EVENT_TABLE()
 // control creation
 // ----------------
 
+static const wxString prefixChecked = "[x] ";
+static const wxString prefixUnchecked = "[ ] ";
+static const char checkChar = 'x', uncheckChar = ' ';
+
+static inline const wxString& Prefix(bool checked)
+    { return checked ? prefixChecked : prefixUnchecked; }
+static inline bool IsChecked(const wxString& s)
+    { wxASSERT(s.length() >=4); return s[1] == checkChar; }
+
+static void CopyStringsAddingPrefix(const wxArrayString& orig,
+                                    wxArrayString& copy)
+{
+    copy.Clear();
+
+    for(size_t i = 0; i < orig.GetCount(); ++i )
+        copy[i] = Prefix(FALSE) + orig[i];
+}
+
+static wxString* CopyStringsAddingPrefix(size_t n, const wxString choices[])
+{
+    wxString* copy = new wxString[n];
+
+    for(size_t i = 0; i < n; ++i )
+        copy[i].Add( Prefix(FALSE) + choices[i] );
+
+    return copy;
+}
+
 // def ctor: use Create() to really create the control
-wxCheckListBox::wxCheckListBox() : wxListBox()
+wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
 {
 }
 
@@ -50,25 +78,104 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                int nStrings, const wxString choices[],
                                long style, const wxValidator& val,
                                const wxString& name)
-                               : wxListBox()
+                               : wxCheckListBoxBase()
 {
-    // TODO: you'll probably need a separate Create instead of using
-    // the wxListBox one as here.
-    Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name);
+    Create(parent, id, pos, size, nStrings, choices,
+           style, val, name);
 }
 
+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+                            const wxPoint& pos = wxDefaultPosition,
+                            const wxSize& size = wxDefaultSize,
+                            int n = 0, const wxString choices[] = NULL,
+                            long style = 0,
+                            const wxValidator& validator = wxDefaultValidator,
+                            const wxString& name)
+{
+    wxString* chs = CopyStringsAddingPrefix(n, choices);
+    bool retVal = wxListBox::Create(parent, id, pos, size, n, chs,
+                                    style, validator, name);
+    delete[] chs;
+    return retVal;
+}   
+
 // check items
 // -----------
 
-bool wxCheckListBox::IsChecked(size_t WXUNUSED(uiIndex)) const
+bool wxCheckListBox::IsChecked(size_t uiIndex) const
 {
-    // TODO
-    return FALSE;
+    return ::IsChecked(wxListBox::GetString(uiIndex));
 }
 
-void wxCheckListBox::Check(size_t WXUNUSED(uiIndex), bool WXUNUSED(bCheck))
+void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
 {
-    // TODO
+    wxString label = wxListBox::GetString(uiIndex);
+    if(::IsChecked(label) == bCheck) return;
+    label[1u] = bCheck ? checkChar : uncheckChar;
+    wxListBox::SetString(uiIndex, label);
 }
 
+void wxCheckListBox::DoToggleItem( int n, int x )
+{
+    if( x < 23 )
+    {
+        wxString label = wxListBox::GetString(n);
+        label[1u] = (!::IsChecked(label)) ? checkChar : uncheckChar;
+        wxListBox::SetString(n, label);
 
+        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+        if( HasClientObjectData() )
+            event.SetClientObject( GetClientObject(n) );
+        else if( HasClientUntypedData() )
+            event.SetClientData( GetClientData(n) );
+        event.m_commandInt = n;
+        event.m_extraLong = TRUE;
+        event.SetEventObject(this);
+        event.SetString( GetString( n ) );
+
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+int wxCheckListBox::DoAppend(const wxString& item)
+{
+    return wxListBox::DoAppend( Prefix(FALSE) + item );
+}
+
+int wxCheckListBox::FindString(const wxString& s) const
+{
+    int n1 = wxListBox::FindString(Prefix(FALSE) + s);
+    int n2 = wxListBox::FindString(Prefix(TRUE) + s);
+    int min = wxMin(n1, n2), max = wxMax(n1, n2);
+
+    // why this works:
+    // n1 == -1, n2 == -1 => return -1 OK
+    // n1 != -1 || n2 != -1 => min == -1 => return the other one
+    // both != -1 => return the first one.
+    if( min == -1 ) return max;
+    return min;
+}
+
+void wxCheckListBox::SetString(int n, const wxString& s)
+{
+    wxListBox::SetString( n, Prefix(IsChecked(n)) + s );
+}
+
+wxString wxCheckListBox::GetString(int n) const
+{
+    return wxListBox::GetString(n).substr(4);
+}
+
+void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+    wxArrayString copy;
+    CopyStringsAddingPrefix(items, copy);
+    wxListBox::DoInsertItems(copy, pos);
+}
+
+void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+{
+    wxArrayString copy;
+    CopyStringsAddingPrefix(items, copy);
+    wxListBox::DoSetItems(copy, clientData);
+}