X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c6ea7bed145bc5bb8a5c9ac3704af914ca57171..abbcdf3ff7a6d33ff09cbbbf7dbf3aa53d60972b:/src/mac/carbon/listbox.cpp diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index ba5b33e446..6e387a01da 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -9,10 +9,12 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "listbox.h" #endif +#include "wx/wxprec.h" + #include "wx/app.h" #include "wx/listbox.h" #include "wx/button.h" @@ -28,7 +30,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl) #ifndef __WXMAC_OSX__ - EVT_SIZE( wxListBox::OnSize ) +// EVT_SIZE( wxListBox::OnSize ) EVT_CHAR( wxListBox::OnChar ) #endif END_EVENT_TABLE() @@ -40,37 +42,15 @@ const short kTextColumnId = 1024 ; // new databrowserbased version // because of the limited insert -// functionality of DataBrowser, +// functionality of DataBrowser, // we just introduce id s corresponding // to the line number -// Listbox item -wxListBox::wxListBox() -{ - m_noItems = 0; - m_selected = 0; - m_macList = NULL ; -} - -bool wxListBox::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); - - 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, +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 { @@ -88,10 +68,10 @@ static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrow { case kDataBrowserItemDeselected : if ( list->HasMultipleSelection() ) - trigger = true ; + trigger = !list->MacIsSelectionSuppressed() ; break ; case kDataBrowserItemSelected : - trigger = true ; + trigger = !list->MacIsSelectionSuppressed() ; break ; case kDataBrowserItemDoubleClicked : event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ; @@ -112,26 +92,25 @@ static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrow 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) ; - } + // 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 ) { @@ -144,17 +123,42 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, err = noErr ; } } - } + } break; - + default: - + break; } } - + return err; } + + +// Listbox item +wxListBox::wxListBox() +{ + m_noItems = 0; + m_selected = 0; + m_macList = NULL ; + m_suppressSelection = false ; +} + +bool wxListBox::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); + + return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} + bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -167,7 +171,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, 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; @@ -192,21 +196,21 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, { options += kDataBrowserSelectOnlyOne ; } - verify_noerr(m_peer->SetSelectionFlags( options ) ); + verify_noerr(m_peer->SetSelectionFlags( options ) ); DataBrowserListViewColumnDesc columnDesc ; columnDesc.headerBtnDesc.titleOffset = 0; columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; - - columnDesc.headerBtnDesc.btnFontStyle.flags = + + columnDesc.headerBtnDesc.btnFontStyle.flags = kControlUseFontMask | kControlUseJustMask; - + columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; columnDesc.propertyDesc.propertyType = kDataBrowserTextType; columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; columnDesc.headerBtnDesc.minimumWidth = 0; columnDesc.headerBtnDesc.maximumWidth = 10000; - + columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; columnDesc.headerBtnDesc.btnFontStyle.style = normal; columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" ); @@ -215,25 +219,25 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, columnDesc.propertyDesc.propertyType = kDataBrowserTextType; columnDesc.propertyDesc.propertyFlags = #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - kDataBrowserListViewTypeSelectColumn | + kDataBrowserListViewTypeSelectColumn | #endif kDataBrowserTableViewSelectionColumn ; - + 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 = + + callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData); - + callbacks.u.v1.itemNotificationCallback = #if TARGET_API_MAC_OSX (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ; @@ -247,7 +251,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, if ( UMAGetSystemVersion() < 0x1030 ) m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ; #endif - MacPostControlCreate(pos,size) ; for ( int i = 0 ; i < n ; i++ ) @@ -256,13 +259,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, } SetBestSize(size); // Needed because it is a wxControlWithItems - + return TRUE; } wxListBox::~wxListBox() { - m_peer->SetReference( NULL ) ; + m_peer->SetReference( 0 ) ; FreeData() ; // avoid access during destruction if ( m_macList ) @@ -346,7 +349,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) { Clear() ; int n = choices.GetCount(); - + for( int i = 0 ; i < n ; ++i ) { if ( clientData ) @@ -361,7 +364,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) else Append( choices[i] ) ; } - + #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { // first delete old items @@ -371,7 +374,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) m_aItems[ui] = NULL; } m_aItems.Empty(); - + // then create new ones for ( ui = 0; ui < (size_t)m_noItems; ui++ ) { wxOwnerDrawn *pNewItem = CreateItem(ui); @@ -384,14 +387,14 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) int wxListBox::FindString(const wxString& s) const { - + if ( s.Right(1) == wxT("*") ) { wxString search = s.Left( s.Length() - 1 ) ; int len = search.Length() ; Str255 s1 , s2 ; wxMacStringToPascal( search , s2 ) ; - + for ( int i = 0 ; i < m_noItems ; ++ i ) { wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ; @@ -409,14 +412,14 @@ int wxListBox::FindString(const wxString& s) const return i ; } } - + } else { Str255 s1 , s2 ; - + wxMacStringToPascal( s , s2 ) ; - + for ( int i = 0 ; i < m_noItems ; ++ i ) { wxMacStringToPascal( m_stringArray[i] , s1 ) ; @@ -437,34 +440,22 @@ void wxListBox::Clear() MacClear() ; } -void wxListBox::SetSelection(int N, bool select) +void wxListBox::DoSetSelection(int N, bool select) { - if ( N == wxNOT_FOUND ) - { - // unselect everything - int sel = MacGetSelection() ; - if ( sel != wxNOT_FOUND ) - { - UInt32 id = sel + 1 ; - verify_noerr( - m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) - ); - } - - return; - } - - wxCHECK_RET( N >= 0 && N < m_noItems, + wxCHECK_RET( N == wxNOT_FOUND || (N >= 0 && N < m_noItems) , wxT("invalid index in wxListBox::SetSelection") ); - MacSetSelection( N , select ) ; - GetSelections( m_selectionPreImage ) ; + + if ( N == wxNOT_FOUND ) + MacDeselectAll() ; + else + MacSetSelection( N , select ) ; } bool wxListBox::IsSelected(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, wxT("invalid index in wxListBox::Selected") ); - + return MacIsSelected( N ) ; } @@ -472,7 +463,7 @@ void *wxListBox::DoGetItemClientData(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, wxT("invalid index in wxListBox::GetClientData")); - + return (void *)m_dataArray[N]; } @@ -485,7 +476,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data) { wxCHECK_RET( N >= 0 && N < m_noItems, wxT("invalid index in wxListBox::SetClientData") ); - + #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { @@ -495,7 +486,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data) } #endif // wxUSE_OWNER_DRAWN wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ; - + if ( m_dataArray.GetCount() > (size_t) N ) { m_dataArray[N] = (char*) Client_data ; @@ -533,11 +524,11 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { wxCHECK_RET( pos >= 0 && pos <= m_noItems, wxT("invalid index in wxListBox::InsertItems") ); - + InvalidateBestSize(); int nItems = items.GetCount(); - + for ( int i = 0 ; i < nItems ; i++ ) { m_stringArray.Insert( items[i] , pos + i ) ; @@ -560,8 +551,8 @@ wxSize wxListBox::DoGetBestSize() const int wLine; { - wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; - + wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; + if ( m_font.Ok() ) { ::TextFont( m_font.MacGetFontNum() ) ; @@ -574,7 +565,7 @@ wxSize wxListBox::DoGetBestSize() const ::TextSize( 9 ); ::TextFace( 0 ) ; } - + // Find the widest line for(int i = 0; i < GetCount(); i++) { wxString str(GetString(i)); @@ -593,15 +584,15 @@ wxSize wxListBox::DoGetBestSize() const #endif lbWidth = wxMax(lbWidth, wLine); } - + // Add room for the scrollbar lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - + // And just a bit more int cy = 12 ; int cx = ::TextWidth( "X" , 0 , 1 ) ; lbWidth += cx ; - + // don't make the listbox too tall (limit height to around 10 items) but don't // make it too small neither lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10); @@ -618,7 +609,6 @@ int wxListBox::GetCount() const void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { wxControl::Refresh( eraseBack , rect ) ; - // MacRedrawControl() ; } #if wxUSE_OWNER_DRAWN @@ -658,17 +648,51 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) // list box control implementation // ============================================================================ -void wxListBox::MacDelete( int N ) +void wxListBox::MacDelete( int n ) { + wxArrayInt selectionBefore ; + MacGetSelections( selectionBefore ) ; + UInt32 id = m_noItems+1 ; verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; + for ( size_t i = 0 ; i < selectionBefore.GetCount() ; ++i ) + { + int current = selectionBefore[i] ; + if ( current == n ) + { + // selection was deleted + MacSetSelection( current , false ) ; + } + else if ( current > n ) + { + // something behind the deleted item was selected -> move up + MacSetSelection( current - 1 , true ) ; + MacSetSelection( current , false ) ; + } + } + // refresh all verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; } void wxListBox::MacInsert( int n , const wxString& text) { + wxArrayInt selectionBefore ; + MacGetSelections( selectionBefore ) ; + UInt32 id = m_noItems ; // this has already been increased verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; + + for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i ) + { + int current = selectionBefore[i] ; + if ( current >= n ) + { + MacSetSelection( current + 1 , true ) ; + MacSetSelection( current , false ) ; + } + } + + // refresh all verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; } @@ -676,6 +700,7 @@ void wxListBox::MacAppend( const wxString& text) { UInt32 id = m_noItems ; // this has already been increased verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; + // no need to deal with selections nor refreshed, as we have appended } void wxListBox::MacClear() @@ -683,23 +708,34 @@ void wxListBox::MacClear() verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ; } +void wxListBox::MacDeselectAll() +{ + bool former = MacSuppressSelection( true ) ; + verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ; + MacSuppressSelection( former ) ; +} + void wxListBox::MacSetSelection( int n , bool select ) { + bool former = MacSuppressSelection( true ) ; UInt32 id = n + 1 ; - if ( !(GetWindowStyle() & (wxLB_MULTIPLE|wxLB_EXTENDED) ) ) - { - int n = MacGetSelection() ; - if ( n >= 0 ) - { - UInt32 idOld = n + 1 ; - m_peer->SetSelectedItems( 1 , & idOld , kDataBrowserItemsRemove ) ; - } - } + if ( m_peer->IsItemSelected( id ) != select ) { - verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ; + if ( select ) + verify_noerr(m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ; + else + verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ; } MacScrollTo( n ) ; + MacSuppressSelection( former ) ; +} + +bool wxListBox::MacSuppressSelection( bool suppress ) +{ + bool former = m_suppressSelection ; + m_suppressSelection = suppress ; + return former ; } bool wxListBox::MacIsSelected( int n ) const @@ -716,20 +752,26 @@ int wxListBox::MacGetSelection() const return i ; } } - return -1 ; + return -1 ; } int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const { int no_sel = 0 ; - + aSelections.Empty(); - for ( int i = 0 ; i < GetCount() ; ++i ) + + UInt32 first , last ; + m_peer->GetSelectionAnchor( &first , &last ) ; + if ( first != kDataBrowserNoItem ) { - if ( m_peer->IsItemSelected( i + 1 ) ) + for ( size_t i = first ; i <= last ; ++i ) { - aSelections.Add( i ) ; - no_sel++ ; + if ( m_peer->IsItemSelected( i ) ) + { + aSelections.Add( i - 1 ) ; + no_sel++ ; + } } } return no_sel ; @@ -748,74 +790,6 @@ void wxListBox::MacScrollTo( int n ) verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ; } -#if !TARGET_API_MAC_OSX -void wxListBox::OnSize( wxSizeEvent &event) -{ -} -#endif - -void wxListBox::MacSetRedraw( bool doDraw ) -{ - // nothing to do in compositing mode -} - -void wxListBox::MacDoClick() -{/* - wxArrayInt aSelections; - int n ; - size_t count = GetSelections(aSelections); - - if ( count == m_selectionPreImage.GetCount() ) - { - bool hasChanged = false ; - for ( size_t i = 0 ; i < count ; ++i ) - { - if ( aSelections[i] != m_selectionPreImage[i] ) - { - hasChanged = true ; - break ; - } - } - if ( !hasChanged ) - { - return ; - } - } - - m_selectionPreImage = aSelections; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); - event.SetEventObject( this ); - - if ( count > 0 ) - { - n = aSelections[0]; - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); - event.SetString( GetString(n) ); - } - else - { - n = -1; - } - - event.m_commandInt = n; - - GetEventHandler()->ProcessEvent(event); -*/ -} - -void wxListBox::MacDoDoubleClick() -{ -/* - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; -*/ -} - #if !TARGET_API_MAC_OSX void wxListBox::OnChar(wxKeyEvent& event) @@ -823,13 +797,13 @@ void wxListBox::OnChar(wxKeyEvent& event) // todo trigger proper events here event.Skip() ; return ; - + if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER) { wxWindow* parent = GetParent() ; while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) parent = parent->GetParent() ; - + if ( parent && parent->GetDefaultItem() ) { wxButton *def = wxDynamicCast(parent->GetDefaultItem(), @@ -871,10 +845,10 @@ void wxListBox::OnChar(wxKeyEvent& event) { // perform the default key handling first wxControl::OnKeyDown( event ) ; - + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); event.SetEventObject( this ); - + wxArrayInt aSelections; int n, count = GetSelections(aSelections); if ( count > 0 ) @@ -890,9 +864,9 @@ void wxListBox::OnChar(wxKeyEvent& event) { n = -1; } - - event.m_commandInt = n; - + + event.SetInt(n); + GetEventHandler()->ProcessEvent(event); } else @@ -911,20 +885,20 @@ void wxListBox::OnChar(wxKeyEvent& event) SetSelection(line) ; wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); event.SetEventObject( this ); - + if ( HasClientObjectData() ) event.SetClientObject( GetClientObject( line ) ); else if ( HasClientUntypedData() ) event.SetClientData( GetClientData(line) ); event.SetString( GetString(line) ); - - event.m_commandInt = line ; - + + event.SetInt(line); + GetEventHandler()->ProcessEvent(event); } } } } -#endif +#endif // !TARGET_API_MAC_OSX