Fixing SetColumnWidth and selection handling, attempt at fixing ClearAll(), and initi...

[wxWidgets.git] / src / mac / carbon / checklst.cpp

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 7d8bec19e8aebee532dbbf27af91287c41d12b6b..458a6e43f652faaa851d5bc1582b7c652b549319 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -1,382 +1,272 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.cpp
+// Name:        src/mac/carbon/checklst.cpp

 // Purpose:     implementation of wxCheckListBox class
 // Purpose:     implementation of wxCheckListBox class

-// Author:      AUTHOR
-// Modified by: 
-// Created:     ??/??/98
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

+//
+// new DataBrowser-based version

 
 

-// ============================================================================
-// headers & declarations
-// ============================================================================

 
 

-#ifdef __GNUG__
-#pragma implementation "checklst.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

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

+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
+

 #include "wx/mac/uma.h"
 #include "wx/mac/uma.h"

-#include "Appearance.h"

 
 

-// ============================================================================
-// implementation of wxCheckListBox
-// ============================================================================
+#ifndef __DARWIN__
+#include <Appearance.h>
+#endif

 
 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 ) ;
-}
+BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+END_EVENT_TABLE()

 
 

-static pascal void wxMacCheckListDefinition( short message, Boolean isSelected, Rect *drawRect,
-                                     Cell cell, short dataOffset, short dataLength,
-                                     ListHandle listHandle )
+class wxMacDataBrowserCheckListControl : public wxMacDataBrowserListControl , public wxMacCheckListControl

 {
 {

-    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) ;
+public:
+    wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
+    virtual ~wxMacDataBrowserCheckListControl();

 
 

-static ListDefUPP macCheckListDefUPP = NULL ;
+    virtual wxMacListBoxItem* CreateItem();

 
 

-// ----------------------------------------------------------------------------
-// creation
-// ----------------------------------------------------------------------------
+    virtual bool            MacIsChecked(unsigned int n) const;
+    virtual void            MacCheck(unsigned int n, bool bCheck = true);
+};

 
 void wxCheckListBox::Init()
 {
 }
 
 
 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)
+bool wxCheckListBox::Create(
+    wxWindow *parent,
+    wxWindowID id,
+    const wxPoint &pos,
+    const wxSize &size,
+    const wxArrayString& 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 ;
+    wxCArrayString chs( choices );

 
 

-#if TARGET_CARBON
-    Size asize;
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );
+}

 
 

+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_macIsUserPane = false;

 
 

-    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          14, 14, false, &listDef, &m_macControl );
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  wxT("only one of listbox selection modes can be specified") );

 
 

-    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
-                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
+    if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;

 
 

-    SetControlReference(m_macControl, (long) this);
-    SetControlVisibility(m_macControl, false, false);
+    // this will be increased by our Append command
+    wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style );
+    control->SetClientDataType( m_clientDataItemsType );
+    m_peer = control;

 
 

-#else
+    MacPostControlCreate(pos,size);

 
 

-    long    result ;
+    InsertItems( n , choices , 0 );

 
 

-    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 ) ;
+    // Needed because it is a wxControlWithItems
+    SetBestSize( size );

 
 

-    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;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxCheckListBox functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxCheckListBox functions
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
-                 _T("invalid index in wxCheckListBox::IsChecked") );
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid index in wxCheckListBox::IsChecked") );

 
 

-    return m_checks[item] != 0;
+    return GetPeer()->MacIsChecked( item );

 }
 
 }
 

-void wxCheckListBox::Check(size_t item, bool check)
+void wxCheckListBox::Check(unsigned int item, bool check)

 {
 {

-    wxCHECK_RET( item < m_checks.GetCount(),
-                 _T("invalid index in wxCheckListBox::Check") );
+    wxCHECK_RET( IsValid(item),
+                 wxT("invalid index in wxCheckListBox::Check") );

 
 

-    // intermediate var is needed to avoid compiler warning with VC++
-    bool isChecked = m_checks[item] != 0;
+    bool isChecked = GetPeer()->MacIsChecked( item );

     if ( check != isChecked )
     {
     if ( check != isChecked )
     {

-        m_checks[item] = check;
-
-        MacRedrawControl() ;
+        GetPeer()->MacCheck( item , check );

     }
 }
 
     }
 }
 

-// ----------------------------------------------------------------------------
-// methods forwarded to wxListBox
-// ----------------------------------------------------------------------------
+wxMacCheckListControl* wxCheckListBox::GetPeer() const
+{
+    return dynamic_cast<wxMacCheckListControl*>(m_peer);
+}
+
+const short kCheckboxColumnId = 1026;

 
 

-void wxCheckListBox::Delete(int n)
+wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacDataBrowserListControl( peer, pos, size, style )

 {
 {

-    wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") );
+    OSStatus err = noErr;

 
 

-    wxListBox::Delete(n);
+    DataBrowserListViewColumnDesc columnDesc;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;

 
 

-    m_checks.RemoveAt(n);
-}
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;

 
 

-int wxCheckListBox::DoAppend(const wxString& item)
-{
-    int pos = wxListBox::DoAppend(item);
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL;

 
 

-    // the item is initially unchecked
-    m_checks.Insert(FALSE, pos);
+    columnDesc.headerBtnDesc.minimumWidth = 30;
+    columnDesc.headerBtnDesc.maximumWidth = 30;

 
 

-    return pos;
+    columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
+    columnDesc.propertyDesc.propertyFlags =
+        kDataBrowserPropertyIsMutable
+        | kDataBrowserTableViewSelectionColumn
+        | kDataBrowserDefaultPropertyFlags;
+
+    err = AddColumn( &columnDesc, 0 );
+    verify_noerr( err );

 }
 
 }
 

-void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
+wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()

 {
 {

-    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)
+class wxMacCheckListBoxItem : public wxMacListBoxItem

 {
 {

-    // call it first as it does DoClear()
-    wxListBox::DoSetItems(items, clientData);
+public :
+    wxMacCheckListBoxItem()
+    {
+        m_isChecked = false;
+    }

 
 

-    size_t count = items.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    virtual ~wxMacCheckListBoxItem()

     {
     {

-        m_checks.Add(FALSE);

     }
     }

-}

 
 

-void wxCheckListBox::DoClear()
-{
-    m_checks.Empty();
-}
+    virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
+        DataBrowserPropertyID property,
+        DataBrowserItemDataRef itemData,
+        bool changeValue )
+    {
+        OSStatus err = errDataBrowserPropertyNotSupported;

 
 

-BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
-  EVT_CHAR(wxCheckListBox::OnChar)
-  EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
-END_EVENT_TABLE()
+        wxCheckListBox *checklist = wxDynamicCast( owner->GetPeer() , wxCheckListBox );
+        wxCHECK_MSG( checklist != NULL , errDataBrowserPropertyNotSupported , wxT("wxCheckListBox expected"));

 
 

-// this will only work as soon as 
+        if ( !changeValue )
+        {
+            switch (property)
+            {
+                case kCheckboxColumnId:
+                    verify_noerr(SetDataBrowserItemDataButtonValue( itemData, m_isChecked ? kThemeButtonOn : kThemeButtonOff ));
+                    err = noErr;
+                    break;
+
+                case kDataBrowserItemIsEditableProperty:
+                    verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
+                    err = noErr;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            switch (property)
+            {
+            case kCheckboxColumnId:
+                {
+                    // we have to change this behind the back, since Check() would be triggering another update round
+                    bool newVal = !m_isChecked;
+                    verify_noerr(SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff ));
+                    m_isChecked = newVal;
+                    err = noErr;
+
+                    wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
+                    event.SetInt( owner->GetLineFromItem( this ) );
+                    event.SetEventObject( checklist );
+                    checklist->GetEventHandler()->ProcessEvent( event );
+                }
+                break;
+
+            default:
+                break;
+            }
+        }

 
 

-void wxCheckListBox::OnChar(wxKeyEvent& event)
-{
-  if ( event.KeyCode() == WXK_SPACE )
-  {
-    int index = GetSelection() ;
-    if ( index >= 0 )
+        if ( err == errDataBrowserPropertyNotSupported )
+            err = wxMacListBoxItem::GetSetData( owner , property, itemData , changeValue);
+
+        return err;
+    }
+
+    void Check( bool check )

     {
     {

-      Check(index, !IsChecked(index) ) ;
-      wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
-      event.SetInt(index);
-      event.SetEventObject(this);
-      GetEventHandler()->ProcessEvent(event);
+        m_isChecked = check;

     }
     }

-  }
-  else
-    event.Skip();
+    bool IsChecked() const
+    {
+         return m_isChecked;
+    }
+
+protected :
+    bool        m_isChecked;
+};
+
+wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem()
+{
+    return new wxMacCheckListBoxItem();

 }
 
 }
 

-void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
+void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)

 {
 {

-  // clicking on the item selects it, clicking on the checkmark toggles
-  if ( event.GetX() <= 20 /*check width*/ ) {
-    int lineheight ;
-    int topcell ;
-#if TARGET_CARBON
-    Point pt ;
-    GetListCellSize( m_macList , &pt ) ;
-    lineheight = pt.v ;
-    ListBounds visible ;
-    GetListVisibleCells( m_macList , &visible ) ;
-    topcell = visible.top ;
-#else
-    lineheight =  (**m_macList).cellSize.v ;
-    topcell = (**m_macList).visible.top ;
-#endif
-    size_t nItem = ((size_t)event.GetY()) / lineheight + topcell ;
-    
-    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();
-  }
+    wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
+    item->Check( bCheck);
+    UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);

 }
 
 }
 

+bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const
+{
+    wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );
+    return item->IsChecked();
+}
+
+
+

 #endif // wxUSE_CHECKLISTBOX
 #endif // wxUSE_CHECKLISTBOX