checklist implementation

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

src/mac/carbon/checklst.cpp

@@ -23,57 +23,360 @@
 
 #include "wx/checklst.h"
 
+#include "wx/mac/uma.h"
+#include "Appearance.h"
+
 // ============================================================================
-// implementation
+// implementation of wxCheckListBox
 // ============================================================================
 
-#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-  IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
+
+const short kwxMacListWithVerticalScrollbar = 128 ;
+const short kwxMacListItemHeight = 14 ;
+const short kwxMacListCheckboxWidth = 14 ;
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} ldefRec, *ldefPtr, **ldefHandle;
+
+extern "C"
+{
+static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle ) ;
+}
+
+static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle )
+{
+    FontInfo fontInfo;
+    GrafPtr savePort;
+    GrafPtr grafPtr;
+    RgnHandle savedClipRegion;
+    SInt32 savedPenMode;
+    wxCheckListBox*          list;
+  GetPort(&savePort);
+  SetPort((**listHandle).port);
+  grafPtr = (**listHandle).port ;
+    // typecast our refCon
+    list = (wxCheckListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+    
+    //  Calculate the cell rect.
+    
+    switch( message ) {
+        case lInitMsg:
+            break;
+
+        case lCloseMsg:
+            break;
+
+        case lDrawMsg:
+        {
+            const wxString text = list->m_stringArray[cell.v] ;
+            int checked = list->m_checks[cell.v] ;
+
+            //  Save the current clip region, and set the clip region to the area we are about
+            //  to draw.
+            
+            savedClipRegion = NewRgn();
+            GetClip( savedClipRegion );
+
+            ClipRect( drawRect );
+            EraseRect( drawRect );
+            
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9  );
+            ::TextFace( 0 ) ;
+            ThemeButtonDrawInfo info ;
+            info.state = kThemeStateActive ;
+            info.value = checked ? kThemeButtonOn : kThemeButtonOff ;
+            info.adornment = kThemeAdornmentNone ;
+            Rect checkRect = *drawRect ;
+            checkRect.left +=0 ;
+            checkRect.top +=2 ;
+            checkRect.right = checkRect.left + 12 ;
+            checkRect.bottom = checkRect.top + 10 ;
+            DrawThemeButton(&checkRect,kThemeCheckBox,
+              &info,NULL,NULL, NULL,0);
+
+        MoveTo(drawRect->left + 4 + kwxMacListCheckboxWidth, drawRect->top + 10 );
+ 
+        DrawText(text, 0 , text.Length());
+            //  If the cell is hilited, do the hilite now. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            if( isSelected ) {
+                savedPenMode = GetPortPenMode( grafPtr );
+                SetPortPenMode( grafPtr, hilitetransfermode );
+                PaintRect( drawRect );
+                SetPortPenMode( grafPtr, savedPenMode );
+            }
+            
+            //  Restore the saved clip region.
+            
+            SetClip( savedClipRegion );
+            DisposeRgn( savedClipRegion );
+            }
+            break;
+        case lHiliteMsg:
+            
+            //  Hilite or unhilite the cell. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            GetPort( &grafPtr );
+            savedPenMode = GetPortPenMode( grafPtr );
+            SetPortPenMode( grafPtr, hilitetransfermode );
+            PaintRect( drawRect );
+            SetPortPenMode( grafPtr, savedPenMode );
+            break;
+        default :
+          break ;
+    }
+    SetPort(savePort);  
+}
+
+extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
+
+static ListDefUPP macCheckListDefUPP = NULL ;
+
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
+
+void wxCheckListBox::Init()
+{
+}
+
+bool wxCheckListBox::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint &pos,
+                            const wxSize &size,
+                            int n,
+                            const wxString choices[],
+                            long style,
+                            const wxValidator& validator,
+                            const wxString &name)
+{
+    m_noItems = 0 ; // this will be increased by our append command
+    m_selected = 0;
+    
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+
+    ListDefSpec listDef;
+    listDef.defType = kListDefUserProcType;
+    if ( macCheckListDefUPP == NULL )
+    {
+      macCheckListDefUPP = NewListDefUPP( wxMacCheckListDefinition ); 
+    }
+        listDef.u.userProc = macCheckListDefUPP ;
+
+#if TARGET_CARBON
+    Size asize;
+
+
+    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
+                          14, 14, false, &listDef, &m_macControl );
+
+    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
+
+    SetControlReference(m_macControl, (long) this);
+    SetControlVisibility(m_macControl, false, false);
+
+#else
+
+    long    result ;
+
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
+                  kwxMacListWithVerticalScrollbar , 0 , 0, 
+                  kControlListBoxProc , (long) this ) ;
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+               sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    ldefHandle ldef ;
+    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
+    if (  (**m_macList).listDefProc != NULL )
+    {
+      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
+      (**ldef).function = (void(*)()) listDef.u.userProc;
+      (**m_macList).listDefProc = (Handle) ldef ;
+    }
+        
+    Point pt = (**m_macList).cellSize ;
+    pt.v = 14 ;
+    LCellSize( pt , m_macList ) ;
+    LAddColumn( 1 , 0 , m_macList ) ;
 #endif
+    OptionBits  options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags(m_macList, options);
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+        Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , m_macList ) ;
+
+    return TRUE;
+}
 
 // ----------------------------------------------------------------------------
-// implementation of wxCheckListBox class
+// wxCheckListBox functions
 // ----------------------------------------------------------------------------
 
-// define event table
+bool wxCheckListBox::IsChecked(size_t item) const
-// ------------------
+{
+    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
+                 _T("invalid index in wxCheckListBox::IsChecked") );
+
+    return m_checks[item] != 0;
+}
+
+void wxCheckListBox::Check(size_t item, bool check)
+{
+    wxCHECK_RET( item < m_checks.GetCount(),
+                 _T("invalid index in wxCheckListBox::Check") );
+
+    // intermediate var is needed to avoid compiler warning with VC++
+    bool isChecked = m_checks[item] != 0;
+    if ( check != isChecked )
+    {
+        m_checks[item] = check;
+
+        MacRedrawControl() ;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// methods forwarded to wxListBox
+// ----------------------------------------------------------------------------
+
+void wxCheckListBox::Delete(int n)
+{
+    wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") );
+
+    wxListBox::Delete(n);
+
+    m_checks.RemoveAt(n);
+}
+
+int wxCheckListBox::DoAppend(const wxString& item)
+{
+    int pos = wxListBox::DoAppend(item);
+
+    // the item is initially unchecked
+    m_checks.Insert(FALSE, pos);
+
+    return pos;
+}
+
+void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+    wxListBox::DoInsertItems(items, pos);
+
+    size_t count = items.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_checks.Insert(FALSE, pos + n);
+    }
+}
+
+void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+{
+    // call it first as it does DoClear()
+    wxListBox::DoSetItems(items, clientData);
+
+    size_t count = items.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_checks.Add(FALSE);
+    }
+}
+
+void wxCheckListBox::DoClear()
+{
+    m_checks.Empty();
+}
+
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+  EVT_CHAR(wxCheckListBox::OnChar)
+  EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
 END_EVENT_TABLE()
 
-// control creation
+// this will only work as soon as 
-// ----------------
 
-// def ctor: use Create() to really create the control
+void wxCheckListBox::OnChar(wxKeyEvent& event)
-wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
 {
+  if ( event.KeyCode() == WXK_SPACE )
+  {
+    int index = GetSelection() ;
+    if ( index >= 0 )
+    {
+      Check(index, !IsChecked(index) ) ;
+      wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+      event.SetInt(index);
+      event.SetEventObject(this);
+      GetEventHandler()->ProcessEvent(event);
+    }
+  }
+  else
+    event.Skip();
 }
 
-// ctor which creates the associated control
+void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
-wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
-                               const wxPoint& pos, const wxSize& size,
-                               int nStrings, const wxString choices[],
-                               long style, const wxValidator& val,
-                               const wxString& name)
-              : wxCheckListBoxBase()
 {
-    // TODO: you'll probably need a separate Create instead of using
+  // clicking on the item selects it, clicking on the checkmark toggles
-    // the wxListBox one as here.
+  if ( event.GetX() <= 20 /*check width*/ ) {
-    Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name);
+    int lineheight ;
-}
+    int topcell ;
-
+#if TARGET_CARBON
-// check items
+    Point pt ;
-// -----------
+    GetListCellSize( m_macList , &pt ) ;
-
+    lineheight = pt.v ;
-bool wxCheckListBox::IsChecked(size_t uiIndex) const
+    ListBounds visible ;
-{
+    GetListVisibleCells( m_macList , &visible ) ;
-    // TODO
+    topcell = visible.top ;
-    return FALSE;
+#else
-}
+    lineheight =  (**m_macList).cellSize.v ;
-
+    topcell = (**m_macList).visible.top ;
-void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
+#endif
-{
+    size_t nItem = ((size_t)event.GetY()) / lineheight + topcell ;
-    // TODO
+    
+    if ( nItem < (size_t)m_noItems )
+    {
+      Check(nItem, !IsChecked(nItem) ) ;
+      wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+      event.SetInt(nItem);
+      event.SetEventObject(this);
+      GetEventHandler()->ProcessEvent(event);
+    }
+    //else: it's not an error, just click outside of client zone
+  }
+  else {
+    // implement default behaviour: clicking on the item selects it
+    event.Skip();
+  }
 }
 
 #endif // wxUSE_CHECKLISTBOX
-

src/mac/carbon/listbox.cpp

@@ -124,6 +124,7 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
+const short kwxMacListItemHeight = 14 ;
 
 // ============================================================================
 // list box control implementation
@@ -168,7 +169,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 
     CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          14, 14, false, &listDef, &m_macControl );
+                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
                    sizeof(ListHandle), (Ptr) &m_macList, &asize);
@@ -197,7 +198,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
         
     Point pt = (**m_macList).cellSize ;
-    pt.v = 14 ;
+    pt.v = kwxMacListItemHeight ;
     LCellSize( pt , m_macList ) ;
     LAddColumn( 1 , 0 , m_macList ) ;
 #endif

src/mac/checklst.cpp

@@ -23,57 +23,360 @@
 
 #include "wx/checklst.h"
 
+#include "wx/mac/uma.h"
+#include "Appearance.h"
+
 // ============================================================================
-// implementation
+// implementation of wxCheckListBox
 // ============================================================================
 
-#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-  IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
+
+const short kwxMacListWithVerticalScrollbar = 128 ;
+const short kwxMacListItemHeight = 14 ;
+const short kwxMacListCheckboxWidth = 14 ;
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} ldefRec, *ldefPtr, **ldefHandle;
+
+extern "C"
+{
+static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle ) ;
+}
+
+static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle )
+{
+    FontInfo fontInfo;
+    GrafPtr savePort;
+    GrafPtr grafPtr;
+    RgnHandle savedClipRegion;
+    SInt32 savedPenMode;
+    wxCheckListBox*          list;
+  GetPort(&savePort);
+  SetPort((**listHandle).port);
+  grafPtr = (**listHandle).port ;
+    // typecast our refCon
+    list = (wxCheckListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+    
+    //  Calculate the cell rect.
+    
+    switch( message ) {
+        case lInitMsg:
+            break;
+
+        case lCloseMsg:
+            break;
+
+        case lDrawMsg:
+        {
+            const wxString text = list->m_stringArray[cell.v] ;
+            int checked = list->m_checks[cell.v] ;
+
+            //  Save the current clip region, and set the clip region to the area we are about
+            //  to draw.
+            
+            savedClipRegion = NewRgn();
+            GetClip( savedClipRegion );
+
+            ClipRect( drawRect );
+            EraseRect( drawRect );
+            
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9  );
+            ::TextFace( 0 ) ;
+            ThemeButtonDrawInfo info ;
+            info.state = kThemeStateActive ;
+            info.value = checked ? kThemeButtonOn : kThemeButtonOff ;
+            info.adornment = kThemeAdornmentNone ;
+            Rect checkRect = *drawRect ;
+            checkRect.left +=0 ;
+            checkRect.top +=2 ;
+            checkRect.right = checkRect.left + 12 ;
+            checkRect.bottom = checkRect.top + 10 ;
+            DrawThemeButton(&checkRect,kThemeCheckBox,
+              &info,NULL,NULL, NULL,0);
+
+        MoveTo(drawRect->left + 4 + kwxMacListCheckboxWidth, drawRect->top + 10 );
+ 
+        DrawText(text, 0 , text.Length());
+            //  If the cell is hilited, do the hilite now. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            if( isSelected ) {
+                savedPenMode = GetPortPenMode( grafPtr );
+                SetPortPenMode( grafPtr, hilitetransfermode );
+                PaintRect( drawRect );
+                SetPortPenMode( grafPtr, savedPenMode );
+            }
+            
+            //  Restore the saved clip region.
+            
+            SetClip( savedClipRegion );
+            DisposeRgn( savedClipRegion );
+            }
+            break;
+        case lHiliteMsg:
+            
+            //  Hilite or unhilite the cell. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            GetPort( &grafPtr );
+            savedPenMode = GetPortPenMode( grafPtr );
+            SetPortPenMode( grafPtr, hilitetransfermode );
+            PaintRect( drawRect );
+            SetPortPenMode( grafPtr, savedPenMode );
+            break;
+        default :
+          break ;
+    }
+    SetPort(savePort);  
+}
+
+extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
+
+static ListDefUPP macCheckListDefUPP = NULL ;
+
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
+
+void wxCheckListBox::Init()
+{
+}
+
+bool wxCheckListBox::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxPoint &pos,
+                            const wxSize &size,
+                            int n,
+                            const wxString choices[],
+                            long style,
+                            const wxValidator& validator,
+                            const wxString &name)
+{
+    m_noItems = 0 ; // this will be increased by our append command
+    m_selected = 0;
+    
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+
+    ListDefSpec listDef;
+    listDef.defType = kListDefUserProcType;
+    if ( macCheckListDefUPP == NULL )
+    {
+      macCheckListDefUPP = NewListDefUPP( wxMacCheckListDefinition ); 
+    }
+        listDef.u.userProc = macCheckListDefUPP ;
+
+#if TARGET_CARBON
+    Size asize;
+
+
+    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
+                          14, 14, false, &listDef, &m_macControl );
+
+    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
+
+    SetControlReference(m_macControl, (long) this);
+    SetControlVisibility(m_macControl, false, false);
+
+#else
+
+    long    result ;
+
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
+                  kwxMacListWithVerticalScrollbar , 0 , 0, 
+                  kControlListBoxProc , (long) this ) ;
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+               sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    ldefHandle ldef ;
+    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
+    if (  (**m_macList).listDefProc != NULL )
+    {
+      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
+      (**ldef).function = (void(*)()) listDef.u.userProc;
+      (**m_macList).listDefProc = (Handle) ldef ;
+    }
+        
+    Point pt = (**m_macList).cellSize ;
+    pt.v = 14 ;
+    LCellSize( pt , m_macList ) ;
+    LAddColumn( 1 , 0 , m_macList ) ;
 #endif
+    OptionBits  options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags(m_macList, options);
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+        Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , m_macList ) ;
+
+    return TRUE;
+}
 
 // ----------------------------------------------------------------------------
-// implementation of wxCheckListBox class
+// wxCheckListBox functions
 // ----------------------------------------------------------------------------
 
-// define event table
+bool wxCheckListBox::IsChecked(size_t item) const
-// ------------------
+{
+    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
+                 _T("invalid index in wxCheckListBox::IsChecked") );
+
+    return m_checks[item] != 0;
+}
+
+void wxCheckListBox::Check(size_t item, bool check)
+{
+    wxCHECK_RET( item < m_checks.GetCount(),
+                 _T("invalid index in wxCheckListBox::Check") );
+
+    // intermediate var is needed to avoid compiler warning with VC++
+    bool isChecked = m_checks[item] != 0;
+    if ( check != isChecked )
+    {
+        m_checks[item] = check;
+
+        MacRedrawControl() ;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// methods forwarded to wxListBox
+// ----------------------------------------------------------------------------
+
+void wxCheckListBox::Delete(int n)
+{
+    wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") );
+
+    wxListBox::Delete(n);
+
+    m_checks.RemoveAt(n);
+}
+
+int wxCheckListBox::DoAppend(const wxString& item)
+{
+    int pos = wxListBox::DoAppend(item);
+
+    // the item is initially unchecked
+    m_checks.Insert(FALSE, pos);
+
+    return pos;
+}
+
+void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+    wxListBox::DoInsertItems(items, pos);
+
+    size_t count = items.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_checks.Insert(FALSE, pos + n);
+    }
+}
+
+void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+{
+    // call it first as it does DoClear()
+    wxListBox::DoSetItems(items, clientData);
+
+    size_t count = items.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_checks.Add(FALSE);
+    }
+}
+
+void wxCheckListBox::DoClear()
+{
+    m_checks.Empty();
+}
+
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+  EVT_CHAR(wxCheckListBox::OnChar)
+  EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
 END_EVENT_TABLE()
 
-// control creation
+// this will only work as soon as 
-// ----------------
 
-// def ctor: use Create() to really create the control
+void wxCheckListBox::OnChar(wxKeyEvent& event)
-wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase()
 {
+  if ( event.KeyCode() == WXK_SPACE )
+  {
+    int index = GetSelection() ;
+    if ( index >= 0 )
+    {
+      Check(index, !IsChecked(index) ) ;
+      wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+      event.SetInt(index);
+      event.SetEventObject(this);
+      GetEventHandler()->ProcessEvent(event);
+    }
+  }
+  else
+    event.Skip();
 }
 
-// ctor which creates the associated control
+void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
-wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
-                               const wxPoint& pos, const wxSize& size,
-                               int nStrings, const wxString choices[],
-                               long style, const wxValidator& val,
-                               const wxString& name)
-              : wxCheckListBoxBase()
 {
-    // TODO: you'll probably need a separate Create instead of using
+  // clicking on the item selects it, clicking on the checkmark toggles
-    // the wxListBox one as here.
+  if ( event.GetX() <= 20 /*check width*/ ) {
-    Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name);
+    int lineheight ;
-}
+    int topcell ;
-
+#if TARGET_CARBON
-// check items
+    Point pt ;
-// -----------
+    GetListCellSize( m_macList , &pt ) ;
-
+    lineheight = pt.v ;
-bool wxCheckListBox::IsChecked(size_t uiIndex) const
+    ListBounds visible ;
-{
+    GetListVisibleCells( m_macList , &visible ) ;
-    // TODO
+    topcell = visible.top ;
-    return FALSE;
+#else
-}
+    lineheight =  (**m_macList).cellSize.v ;
-
+    topcell = (**m_macList).visible.top ;
-void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
+#endif
-{
+    size_t nItem = ((size_t)event.GetY()) / lineheight + topcell ;
-    // TODO
+    
+    if ( nItem < (size_t)m_noItems )
+    {
+      Check(nItem, !IsChecked(nItem) ) ;
+      wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
+      event.SetInt(nItem);
+      event.SetEventObject(this);
+      GetEventHandler()->ProcessEvent(event);
+    }
+    //else: it's not an error, just click outside of client zone
+  }
+  else {
+    // implement default behaviour: clicking on the item selects it
+    event.Skip();
+  }
 }
 
 #endif // wxUSE_CHECKLISTBOX
-

src/mac/listbox.cpp

@@ -124,6 +124,7 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
+const short kwxMacListItemHeight = 14 ;
 
 // ============================================================================
 // list box control implementation
@@ -168,7 +169,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 
     CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          14, 14, false, &listDef, &m_macControl );
+                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
                    sizeof(ListHandle), (Ptr) &m_macList, &asize);
@@ -197,7 +198,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
         
     Point pt = (**m_macList).cellSize ;
-    pt.v = 14 ;
+    pt.v = kwxMacListItemHeight ;
     LCellSize( pt , m_macList ) ;
     LAddColumn( 1 , 0 , m_macList ) ;
 #endif