X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..355debca0650f70aa8ed4803b2ebc45541e03d9f:/src/mac/carbon/checklst.cpp?ds=sidebyside

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 2f23b84d87..dcaed50c21 100644
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.cpp
+// Name:        src/mac/carbon/checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Stefan Csomor
 // Modified by:
@@ -8,10 +8,9 @@
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
+//
+// new DataBrowser-based version
 
-// ============================================================================
-// headers & declarations
-// ============================================================================
 
 #include "wx/wxprec.h"
 
@@ -21,227 +20,118 @@
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"
+
 #ifndef __DARWIN__
 #include <Appearance.h>
 #endif
 
-// ============================================================================
-// implementation of wxCheckListBox
-// ============================================================================
-
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 
-const short kTextColumnId = 1024 ;
-const short kCheckboxColumnId = 1025 ;
+class wxMacDataBrowserCheckListControl : public wxMacDataBrowserListControl , public wxMacCheckListControl
+{
+public:
+    wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
+    ~wxMacDataBrowserCheckListControl();
 
-// new databrowser based version
+    virtual wxMacListBoxItem* CreateItem();
+    
+    virtual bool            MacIsChecked(unsigned int n) const;
+    virtual void            MacCheck(unsigned int n, bool bCheck = true);
+};
 
-// Listbox item
 void wxCheckListBox::Init()
 {
 }
 
-bool wxCheckListBox::Create(wxWindow *parent,
-                            wxWindowID id,
-                            const wxPoint &pos,
-                            const wxSize &size,
-                            const wxArrayString& 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 )
 {
-    wxCArrayString chs(choices);
+    wxCArrayString chs( choices );
 
-    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
-                  style, validator, name);
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );
 }
 
-#if TARGET_API_MAC_OSX
-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
-    DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
-#else
-static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
-    DataBrowserItemNotification message)
-#endif
+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 )
 {
-    long ref = GetControlReference( browser ) ;
-    if ( ref )
-    {
-        wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-        int i = itemID - 1 ;
-        if (i >= 0 && i < list->GetCount() )
-        {
-            bool trigger = false ;
-            wxCommandEvent event(
-                wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
-            switch( message )
-            {
-                case kDataBrowserItemDeselected :
-                    if ( list->HasMultipleSelection() )
-                        trigger = true ;
-                    break ;
-                case kDataBrowserItemSelected :
-                    trigger = true ;
-                    break ;
-                case kDataBrowserItemDoubleClicked :
-                    event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ;
-                    trigger = true ;
-                    break ;
-                 default :
-                    break ;
-            }
+    m_macIsUserPane = false;
 
-            if ( trigger )
-            {
-                event.SetEventObject( list );
-                if ( list->HasClientObjectData() )
-                    event.SetClientObject( list->GetClientObject(i) );
-                else if ( list->HasClientUntypedData() )
-                    event.SetClientData( list->GetClientData(i) );
-                event.SetString( list->GetString(i) );
-                event.SetInt(i) ;
-                event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
-                wxPostEvent( list->GetEventHandler() , event ) ;
-                // direct notification is not always having the listbox GetSelection() having in synch with event
-                // list->GetEventHandler()->ProcessEvent(event) ;
-            }
-        }
-    }
-}
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  wxT("only one of listbox selection modes can be specified") );
 
+    if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+        return false;
 
-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
-    DataBrowserItemID itemID, DataBrowserPropertyID property,
-    DataBrowserItemDataRef itemData, Boolean changeValue)
-{
-    OSStatus err = errDataBrowserPropertyNotSupported;
+    // this will be increased by our Append command
+    wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style );
+    control->SetClientDataType( m_clientDataItemsType );
+    m_peer = control;
 
-    if ( ! changeValue )
-    {
-        switch (property)
-        {
+    MacPostControlCreate(pos,size);
 
-            case kTextColumnId:
-            {
-                long ref = GetControlReference( browser ) ;
-                if ( ref )
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    int i = itemID - 1 ;
-                    if (i >= 0 && i < list->GetCount() )
-                    {
-                        wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
-                        verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
-                        err = noErr ;
-                    }
-                }
-            }
-            break;
-            case kCheckboxColumnId :
-            {
-                long ref = GetControlReference( browser ) ;
-                if ( ref )
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    int i = itemID - 1 ;
-                    if (i >= 0 && i < list->GetCount() )
-                    {
-                        verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ;
-                        err = noErr ;
-                    }
-                }
-            }
-            break ;
-            case kDataBrowserItemIsEditableProperty:
-            {
-                err = ::SetDataBrowserItemDataBooleanValue(itemData, true);
-            }
-            break;
+	InsertItems( n , choices , 0 );
 
-            default:
-            break;
-        }
-    }
-    else
-    {
-        switch( property )
-        {
-            case kCheckboxColumnId :
-            {
-                long ref = GetControlReference( browser ) ;
-                if ( ref )
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    int i = itemID - 1 ;
-                    if (i >= 0 && i < list->GetCount() )
-                    {
-                        // we have to change this behind the back, since Check() would be triggering another update round
-                        bool newVal = !list->IsChecked( i ) ;
-                        verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , newVal ? kThemeButtonOn : kThemeButtonOff ) ) ;
-                        err = noErr ;
-                        list->m_checks[ i ] = newVal ;
-
-                        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
-                        event.SetInt(i);
-                        event.SetEventObject(list);
-                        list->GetEventHandler()->ProcessEvent(event);
-                    }
-                }
+    // Needed because it is a wxControlWithItems
+    SetBestSize( size );
 
-            }
-            break ;
+    return true;
+}
 
-            default :
-            break ;
-        }
-    }
+// ----------------------------------------------------------------------------
+// wxCheckListBox functions
+// ----------------------------------------------------------------------------
 
-    return err;
-}
-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::IsChecked(unsigned int item) const
 {
-    m_macIsUserPane = false ;
-
-    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
-                  _T("only one of listbox selection modes can be specified") );
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid index in wxCheckListBox::IsChecked") );
 
-    if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
-        return false;
+    return GetPeer()->MacIsChecked( item );
+}
 
-    m_noItems = 0 ; // this will be increased by our append command
-    m_selected = 0;
+void wxCheckListBox::Check(unsigned int item, bool check)
+{
+    wxCHECK_RET( IsValid(item),
+                 wxT("invalid index in wxCheckListBox::Check") );
 
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    bool isChecked = GetPeer()->MacIsChecked( item );
+    if ( check != isChecked )
+    {
+        GetPeer()->MacCheck( item , check );
+    }
+}
 
-    m_peer = new wxMacControl(this) ;
-    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
+wxMacCheckListControl* wxCheckListBox::GetPeer() const 
+{ 
+    return dynamic_cast<wxMacCheckListControl*>(m_peer); 
+}
 
+const short kCheckboxColumnId = 1026;
 
-    DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
-    if ( style & wxLB_MULTIPLE )
-    {
-        options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection  ;
-    }
-    else if ( style & wxLB_EXTENDED )
-    {
-        // default behaviour
-    }
-    else
-    {
-        options += kDataBrowserSelectOnlyOne ;
-    }
-    verify_noerr(m_peer->SetSelectionFlags( options ) );
+wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacDataBrowserListControl( peer, pos, size, style )
+{
+    OSStatus err = noErr;
 
-    DataBrowserListViewColumnDesc columnDesc ;
+    DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;
     columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
 
@@ -252,145 +142,128 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
     columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
     columnDesc.headerBtnDesc.btnFontStyle.style = normal;
-    columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
-
-    // check column
+    columnDesc.headerBtnDesc.titleString = NULL;
 
-    columnDesc.headerBtnDesc.minimumWidth = 30 ;
+    columnDesc.headerBtnDesc.minimumWidth = 30;
     columnDesc.headerBtnDesc.maximumWidth = 30;
 
     columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
     columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
-    columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
-                                            kDataBrowserDefaultPropertyFlags;
-    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
-
-    // text column
-
-    columnDesc.headerBtnDesc.minimumWidth = 0;
-    columnDesc.headerBtnDesc.maximumWidth = 10000;
-
-    columnDesc.propertyDesc.propertyID = kTextColumnId;
-    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-     | kDataBrowserListViewTypeSelectColumn
-#endif
-    ;
-
-
-    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
-
-    verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
-    verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;
-    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite  ) ) ;
-    verify_noerr( m_peer->SetListViewHeaderBtnHeight(0 ) ) ;
-
-    DataBrowserCallbacks callbacks ;
-    callbacks.version = kDataBrowserLatestCallbacks;
-    InitDataBrowserCallbacks(&callbacks);
-    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
-    callbacks.u.v1.itemNotificationCallback =
-#if TARGET_API_MAC_OSX
-        (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
-#else
-        NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
-#endif
-    m_peer->SetCallbacks( &callbacks);
-
-#if 0
-    // shouldn't be necessary anymore under 10.2
-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
-    m_peer->SetNeedsFocusRect( true ) ;
-#endif
-
-    MacPostControlCreate(pos,size) ;
-
-    for ( int i = 0 ; i < n ; i++ )
-    {
-        Append( choices[i] ) ;
-    }
-
-    SetBestSize(size);   // Needed because it is a wxControlWithItems
-
-    return true;
+    columnDesc.propertyDesc.propertyFlags =
+        kDataBrowserPropertyIsMutable
+        | kDataBrowserTableViewSelectionColumn
+        | kDataBrowserDefaultPropertyFlags;
+        
+    err = AddColumn( &columnDesc, 0 );
+    verify_noerr( err );
 }
 
-// ----------------------------------------------------------------------------
-// wxCheckListBox functions
-// ----------------------------------------------------------------------------
-
-bool wxCheckListBox::IsChecked(size_t item) const
+wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()
 {
-    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)
+class wxMacCheckListBoxItem : public wxMacListBoxItem
 {
-    wxCHECK_RET( item < m_checks.GetCount(),
-                 _T("invalid index in wxCheckListBox::Check") );
-
-    bool isChecked = m_checks[item] != 0;
-    if ( check != isChecked )
+public :
+    wxMacCheckListBoxItem()
     {
-        m_checks[item] = check;
-        UInt32 id = item + 1 ;
-        verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+        m_isChecked = false;
     }
-}
+    
+    ~wxMacCheckListBoxItem()
+    {
+    }
+    
+    virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
+        DataBrowserPropertyID property,
+        DataBrowserItemDataRef itemData,
+        bool changeValue ) 
+    {
+        OSStatus err = errDataBrowserPropertyNotSupported;
 
-// ----------------------------------------------------------------------------
-// methods forwarded to wxCheckListBox
-// ----------------------------------------------------------------------------
+        wxCheckListBox *checklist = wxDynamicCast( owner->GetPeer() , wxCheckListBox );
+        wxCHECK_MSG( checklist != NULL , errDataBrowserPropertyNotSupported , wxT("wxCheckListBox expected"));
 
-void wxCheckListBox::Delete(int n)
-{
-    wxCHECK_RET( n < GetCount(), _T("invalid index in wxCheckListBox::Delete") );
+        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;
 
-    wxListBox::Delete(n);
+            default:
+                break;
+            }
+        }
 
-    m_checks.RemoveAt(n);
-}
+        if ( err == errDataBrowserPropertyNotSupported )
+            err = wxMacListBoxItem::GetSetData( owner , property, itemData , changeValue);
 
-int wxCheckListBox::DoAppend(const wxString& item)
-{
-    int pos = wxListBox::DoAppend(item);
+        return err;
+    }
 
-    // the item is initially unchecked
-    m_checks.Insert(false, pos);
+    void Check( bool check ) 
+    {
+        m_isChecked = check;
+    }
+    bool IsChecked() const 
+    {
+         return m_isChecked; 
+    }
 
-    return pos;
-}
+protected :
+    bool        m_isChecked;
+};
 
-void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
+wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem() 
 {
-    wxListBox::DoInsertItems(items, pos);
-
-    size_t count = items.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        m_checks.Insert(false, pos + n);
-    }
+    return new wxMacCheckListBoxItem();
 }
 
-void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck) 
 {
-    // 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);
-    }
+    wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
+    item->Check( bCheck);
+    UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
 }
 
-void wxCheckListBox::DoClear()
+bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const 
 {
-    m_checks.Empty();
+    wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );
+    return item->IsChecked();    
 }
 
+
+
 #endif // wxUSE_CHECKLISTBOX