X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6e644ef2d35230f9d4a5c0bb89b98edd3e4d6c69:/src/mac/carbon/checklst.cpp diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 1e2fdf8469..2f23b84d87 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -2,22 +2,18 @@ // Name: 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: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ // headers & declarations // ============================================================================ -#ifdef __GNUG__ -#pragma implementation "checklst.h" -#endif - -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_CHECKLISTBOX @@ -25,7 +21,9 @@ #include "wx/arrstr.h" #include "wx/mac/uma.h" +#ifndef __DARWIN__ #include +#endif // ============================================================================ // implementation of wxCheckListBox @@ -62,10 +60,10 @@ bool wxCheckListBox::Create(wxWindow *parent, } #if TARGET_API_MAC_OSX -static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, +static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData) #else -static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, +static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message) #endif { @@ -73,139 +71,135 @@ static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrow if ( ref ) { wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; - for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) - if ( list->m_idArray[i] == (long) itemID ) + int i = itemID - 1 ; + if (i >= 0 && i < list->GetCount() ) + { + bool trigger = false ; + wxCommandEvent event( + wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() ); + switch( message ) { - 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) ; + case kDataBrowserItemDeselected : + if ( list->HasMultipleSelection() ) trigger = true ; - break ; - default : - break ; - } + 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 ); - list->GetEventHandler()->ProcessEvent(event) ; - } - - 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, +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 ) ; - for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) - if ( list->m_idArray[i] == (long) itemID ) - { - wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ; - verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ; - err = noErr ; - break ; - } - } - } - break; - case kCheckboxColumnId : - { - long ref = GetControlReference( browser ) ; - if ( ref ) - { - wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; - for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) - if ( list->m_idArray[i] == (long) itemID ) - { - verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ; - err = noErr ; - break ; - } - } - } - 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 ) ; - for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) - if ( list->m_idArray[i] == (long) itemID ) - { - // 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 ; - } - } - - } - break ; - - default : - break ; - } - } - - return err; + 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, @@ -215,24 +209,22 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, 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) ) return false; m_noItems = 0 ; // this will be increased by our append command m_selected = 0; - m_nextId = 1 ; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - ControlRef browser ; - verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , (ControlRef *)&m_macControl ) ); - browser = (ControlRef) m_macControl ; + m_peer = new wxMacControl(this) ; + verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) ); + DataBrowserSelectionFlags options = kDataBrowserDragSelect ; if ( style & wxLB_MULTIPLE ) @@ -247,64 +239,70 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, { options += kDataBrowserSelectOnlyOne ; } - verify_noerr(SetDataBrowserSelectionFlags (browser, options ) ); + verify_noerr(m_peer->SetSelectionFlags( options ) ); 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( "" ); + 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.headerBtnDesc.minimumWidth = 30 ; + columnDesc.headerBtnDesc.maximumWidth = 30; - columnDesc.propertyDesc.propertyID = kCheckboxColumnId; - columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType; - columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn | + columnDesc.propertyDesc.propertyID = kCheckboxColumnId; + columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType; + columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn | kDataBrowserDefaultPropertyFlags; - verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ; + verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ; // text column - columnDesc.headerBtnDesc.minimumWidth = 0; - columnDesc.headerBtnDesc.maximumWidth = 10000; + columnDesc.headerBtnDesc.minimumWidth = 0; + columnDesc.headerBtnDesc.maximumWidth = 10000; - columnDesc.propertyDesc.propertyID = kTextColumnId; - columnDesc.propertyDesc.propertyType = kDataBrowserTextType; - columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn + 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 + | kDataBrowserListViewTypeSelectColumn #endif - ; + ; + - - verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ; + verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ; - verify_noerr(::AutoSizeDataBrowserListViewColumns( browser ) ) ; - verify_noerr(::SetDataBrowserHasScrollBars( browser , false , true ) ) ; - verify_noerr(::SetDataBrowserTableViewHiliteStyle( browser, kDataBrowserTableViewFillHilite ) ) ; - verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( browser , 0 ) ) ; + 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 = + callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData); + callbacks.u.v1.itemNotificationCallback = #if TARGET_API_MAC_OSX - (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ; + (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ; #else - NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ; + 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 - SetDataBrowserCallbacks(browser, &callbacks); MacPostControlCreate(pos,size) ; @@ -314,8 +312,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, } SetBestSize(size); // Needed because it is a wxControlWithItems - - return TRUE; + + return true; } // ---------------------------------------------------------------------------- @@ -324,7 +322,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, bool wxCheckListBox::IsChecked(size_t item) const { - wxCHECK_MSG( item < m_checks.GetCount(), FALSE, + wxCHECK_MSG( item < m_checks.GetCount(), false, _T("invalid index in wxCheckListBox::IsChecked") ); return m_checks[item] != 0; @@ -335,13 +333,12 @@ 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; - UInt32 id = m_idArray[item] ; - verify_noerr( ::UpdateDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; + UInt32 id = item + 1 ; + verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; } } @@ -363,7 +360,7 @@ int wxCheckListBox::DoAppend(const wxString& item) int pos = wxListBox::DoAppend(item); // the item is initially unchecked - m_checks.Insert(FALSE, pos); + m_checks.Insert(false, pos); return pos; } @@ -375,7 +372,7 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos) size_t count = items.GetCount(); for ( size_t n = 0; n < count; n++ ) { - m_checks.Insert(FALSE, pos + n); + m_checks.Insert(false, pos + n); } } @@ -387,7 +384,7 @@ void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData) size_t count = items.GetCount(); for ( size_t n = 0; n < count; n++ ) { - m_checks.Add(FALSE); + m_checks.Add(false); } }