X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45285a6238f84fa48d8a9932c21788d34aef39ca..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/checklst.cpp?ds=sidebyside diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 9b2278c116..5f0fecb5e2 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -1,392 +1,273 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: checklst.cpp +// Name: src/mac/carbon/checklst.cpp // Purpose: implementation of wxCheckListBox class // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // 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" -#include "wx/arrstr.h" -#include "wx/mac/uma.h" -#include +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif -// ============================================================================ -// implementation of wxCheckListBox -// ============================================================================ +#include "wx/mac/uma.h" 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() {} + virtual ~wxMacDataBrowserCheckListControl(); + + virtual wxMacDataItem* CreateItem(); + + virtual bool MacIsChecked(unsigned int n) const; + virtual void MacCheck(unsigned int n, bool bCheck = true); + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserCheckListControl) +}; -// new databrowser based version +IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserCheckListControl , wxMacDataBrowserListControl ) -// 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 ; - } - - 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) ; - } - } - } -} - - -static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, - DataBrowserItemID itemID, DataBrowserPropertyID property, - DataBrowserItemDataRef itemData, Boolean changeValue) -{ - OSStatus err = errDataBrowserPropertyNotSupported; - - if ( ! changeValue ) - { - switch (property) - { - - 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; - - 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); - } - } - - } - break ; - - default : - break ; - } - } - - 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) -{ - m_macIsUserPane = FALSE ; + m_macIsUserPane = false; wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED), - _T("only one of listbox selection modes can be specified") ); - - if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) ) + wxT("only one of listbox selection modes can be specified") ); + + if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) ) return false; - m_noItems = 0 ; // this will be increased by our append command - m_selected = 0; + // this will be increased by our Append command + wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style ); + // TODO CHECK control->SetClientDataType( m_clientDataItemsType ); + m_peer = control; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + MacPostControlCreate(pos,size); - m_peer = new wxMacControl() ; - verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) ); - + InsertItems( n , choices , 0 ); - 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 ) ); + // Needed because it is a wxControlWithItems + SetInitialSize( size ); - DataBrowserListViewColumnDesc columnDesc ; - columnDesc.headerBtnDesc.titleOffset = 0; - columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; - - columnDesc.headerBtnDesc.btnFontStyle.flags = - kControlUseFontMask | kControlUseJustMask; - - columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; - columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; - columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; - columnDesc.headerBtnDesc.btnFontStyle.style = normal; - columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" ); - - // check column - - 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); - - MacPostControlCreate(pos,size) ; - - for ( int i = 0 ; i < n ; i++ ) - { - Append( choices[i] ) ; - } - - SetBestSize(size); // Needed because it is a wxControlWithItems - - return TRUE; + return true; } // ---------------------------------------------------------------------------- // 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") ); - bool isChecked = m_checks[item] != 0; + bool isChecked = GetPeer()->MacIsChecked( item ); if ( check != isChecked ) { - m_checks[item] = check; - UInt32 id = item + 1 ; - verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; + GetPeer()->MacCheck( item , check ); } } -// ---------------------------------------------------------------------------- -// methods forwarded to wxCheckListBox -// ---------------------------------------------------------------------------- +wxMacCheckListControl* wxCheckListBox::GetPeer() const +{ + wxMacDataBrowserCheckListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserCheckListControl); + return lb ? wx_static_cast(wxMacCheckListControl*,lb) : 0 ; +} -void wxCheckListBox::Delete(int n) +const short kCheckboxColumnId = 1026; + +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 wxCheckListBox::Delete") ); + OSStatus err = noErr; + + DataBrowserListViewColumnDesc columnDesc; + columnDesc.headerBtnDesc.titleOffset = 0; + columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; + + columnDesc.headerBtnDesc.btnFontStyle.flags = + kControlUseFontMask | kControlUseJustMask; + + columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; + columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; + columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; + columnDesc.headerBtnDesc.btnFontStyle.style = normal; + columnDesc.headerBtnDesc.titleString = NULL; - wxListBox::Delete(n); + columnDesc.headerBtnDesc.minimumWidth = 30; + columnDesc.headerBtnDesc.maximumWidth = 30; - m_checks.RemoveAt(n); + columnDesc.propertyDesc.propertyID = kCheckboxColumnId; + columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType; + columnDesc.propertyDesc.propertyFlags = + kDataBrowserPropertyIsMutable + | kDataBrowserTableViewSelectionColumn + | kDataBrowserDefaultPropertyFlags; + + err = AddColumn( &columnDesc, 0 ); + verify_noerr( err ); } -int wxCheckListBox::DoAppend(const wxString& item) +wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl() { - 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) +class wxMacCheckListBoxItem : public wxMacListBoxItem { - wxListBox::DoInsertItems(items, pos); +public : + wxMacCheckListBoxItem() + { + m_isChecked = false; + } - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) + virtual ~wxMacCheckListBoxItem() { - 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); + virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner , + DataBrowserPropertyID property, + DataBrowserItemDataRef itemData, + bool changeValue ) + { + OSStatus err = errDataBrowserPropertyNotSupported; + + wxCheckListBox *checklist = wxDynamicCast( owner->GetPeer() , wxCheckListBox ); + wxCHECK_MSG( checklist != NULL , errDataBrowserPropertyNotSupported , wxT("wxCheckListBox expected")); + + 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->HandleWindowEvent( event ); + } + break; + + default: + break; + } + } + + if ( err == errDataBrowserPropertyNotSupported ) + err = wxMacListBoxItem::GetSetData( owner , property, itemData , changeValue); - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) + return err; + } + + void Check( bool check ) { - m_checks.Add(FALSE); + m_isChecked = check; } + bool IsChecked() const + { + return m_isChecked; + } + +protected : + bool m_isChecked; +}; + +wxMacDataItem* wxMacDataBrowserCheckListControl::CreateItem() +{ + return new wxMacCheckListBoxItem(); } -void wxCheckListBox::DoClear() +void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck) { - m_checks.Empty(); + wxMacCheckListBoxItem* item = wx_static_cast(wxMacCheckListBoxItem*, GetItemFromLine( n) ); + item->Check( bCheck); + UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId); } +bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const +{ + wxMacCheckListBoxItem * item = wx_static_cast( wxMacCheckListBoxItem*, GetItemFromLine( n ) ); + return item->IsChecked(); +} + + + #endif // wxUSE_CHECKLISTBOX