X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e42e45a9ddf8b220a91ede9f81acbb9b6e333678..9c4e5c709e53aa5508930a3b363326625bdf99b3:/src/mac/carbon/listbox.cpp diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index f6c1403b1c..7be9b0d4b1 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: listbox.cpp // Purpose: wxListBox -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -15,132 +15,144 @@ #include "wx/app.h" #include "wx/listbox.h" +#include "wx/button.h" #include "wx/settings.h" +#include "wx/toplevel.h" #include "wx/dynarray.h" #include "wx/log.h" #include "wx/utils.h" -#ifndef __DARWIN__ -// #include "extldef.h" -#endif #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl) - EVT_SIZE( wxListBox::OnSize ) +#if !__WXMAC_OSX__ + EVT_SIZE( wxListBox::OnSize ) + EVT_CHAR( wxListBox::OnChar ) +#endif END_EVENT_TABLE() #endif #include "wx/mac/uma.h" +const short kTextColumnId = 1024 ; -typedef struct { - unsigned short instruction; - void (*function)(); -} ldefRec, *ldefPtr, **ldefHandle; +// new databrowserbased version -extern "C" +// Listbox item +wxListBox::wxListBox() { -static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, - Cell cell, short dataOffset, short dataLength, - ListHandle listHandle ) ; + m_noItems = 0; + m_selected = 0; + m_macList = NULL ; } -static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, - Cell cell, short dataOffset, short dataLength, - ListHandle listHandle ) +bool wxListBox::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) { - FontInfo fontInfo; - GrafPtr savePort; - GrafPtr grafPtr; - RgnHandle savedClipRegion; - SInt32 savedPenMode; - wxListBox* list; - GetPort(&savePort); - SetPort((**listHandle).port); - grafPtr = (**listHandle).port ; - // typecast our refCon - list = (wxListBox*) 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] ; - - // 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 ); - - - MoveTo(drawRect->left + 4 , drawRect->top + 10 ); - ::TextFont( kFontIDMonaco ) ; - ::TextSize( 9 ); - ::TextFace( 0 ) ; - - 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) ; -const short kwxMacListWithVerticalScrollbar = 128 ; + wxCArrayString chs(choices); -// ============================================================================ -// list box control implementation -// ============================================================================ + return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} -// Listbox item -wxListBox::wxListBox() +#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 { - m_noItems = 0; - m_selected = 0; - m_macList = NULL ; + long ref = GetControlReference( browser ) ; + if ( ref ) + { + wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ; + for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) + if ( list->m_idArray[i] == (long) itemID ) + { + 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) ; + } + break ; + } + } } -static ListDefUPP macListDefUPP = NULL ; +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 ) + { + wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ; + 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; + + default: + + break; + } + } + + return err; +} bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -149,100 +161,111 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { + 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 ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; - ListDefSpec listDef; - listDef.defType = kListDefUserProcType; - if ( macListDefUPP == NULL ) - { - macListDefUPP = NewListDefUPP( wxMacListDefinition ); - } - listDef.u.userProc = macListDefUPP ; -#if TARGET_CARBON - Size asize; - - - CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true, - 14, 14, false, &listDef, &m_macControl ); + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag, - sizeof(ListHandle), (Ptr) &m_macList, &asize); + m_peer = new wxMacControl() ; + verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) ); - SetControlReference(m_macControl, (long) this); - SetControlVisibility(m_macControl, false, false); - -#else - long result ; - - m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , - kwxMacListWithVerticalScrollbar , 0 , 0, - kControlListBoxProc , (long) this ) ; - ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , - sizeof( ListHandle ) , (char*) &m_macList , &result ) ; - - 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; + DataBrowserSelectionFlags options = kDataBrowserDragSelect ; if ( style & wxLB_MULTIPLE ) { - options += lNoExtend ; + options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ; } else if ( style & wxLB_EXTENDED ) { - options += lExtendDrag ; + // default behaviour } else { - options = lOnlyOne ; + options += kDataBrowserSelectOnlyOne ; } - SetListSelectionFlags(m_macList, 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.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( "" ); + + columnDesc.propertyDesc.propertyID = kTextColumnId; + columnDesc.propertyDesc.propertyType = kDataBrowserTextType; + columnDesc.propertyDesc.propertyFlags = +#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + 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; - MacPostControlCreate() ; + 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] ) ; + Append( choices[i] ) ; } - - LSetDrawingMode( true , m_macList ) ; + SetBestSize(size); // Needed because it is a wxControlWithItems + return TRUE; } wxListBox::~wxListBox() { - Free() ; - if ( m_macList ) - { -#if !TARGET_CARBON - DisposeHandle( (**m_macList).listDefProc ) ; - (**m_macList).listDefProc = NULL ; -#endif - m_macList = NULL ; - } + m_peer->SetReference( NULL ) ; + FreeData() ; + // avoid access during destruction + if ( m_macList ) + { + m_macList = NULL ; + } } -void wxListBox::Free() +void wxListBox::FreeData() { #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) @@ -250,6 +273,7 @@ void wxListBox::Free() size_t uiCount = m_aItems.Count(); while ( uiCount-- != 0 ) { delete m_aItems[uiCount]; + m_aItems[uiCount] = NULL; } m_aItems.Clear(); @@ -265,9 +289,16 @@ void wxListBox::Free() } } +void wxListBox::DoSetSize(int x, int y, + int width, int height, + int sizeFlags ) +{ + wxControl::DoSetSize( x , y , width , height , sizeFlags ) ; +} + void wxListBox::DoSetFirstItem(int N) { - MacScrollTo( N ) ; + MacScrollTo( N ) ; } void wxListBox::Delete(int N) @@ -284,62 +315,57 @@ void wxListBox::Delete(int N) delete GetClientObject(N); } #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN - m_stringArray.Remove( N ) ; - m_dataArray.RemoveAt( N ) ; - m_noItems --; - - MacDelete( N ) ; + m_stringArray.RemoveAt( N ) ; + m_dataArray.RemoveAt( N ) ; + m_noItems --; + + MacDelete( N ) ; } int wxListBox::DoAppend(const wxString& item) { - int index = m_noItems ; - if( wxApp::s_macDefaultEncodingIsPC ) - { - m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ; - m_dataArray.Add( NULL ); - } - else { - m_stringArray.Add( item ) ; - m_dataArray.Add( NULL ); - } - m_noItems ++; - DoSetItemClientData( index , NULL ) ; - MacAppend( item ) ; + InvalidateBestSize(); + + int index = m_noItems ; + m_stringArray.Add( item ) ; + m_dataArray.Add( NULL ); + m_noItems ++; + DoSetItemClientData( index , NULL ) ; + MacAppend( item ) ; - return index ; + return index ; } void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) -{ - MacSetRedraw( false ) ; - Clear() ; - int n = choices.GetCount(); - - for( int i = 0 ; i < n ; ++i ) - { - if ( clientData ) - { +{ + Clear() ; + int n = choices.GetCount(); + + for( int i = 0 ; i < n ; ++i ) + { + if ( clientData ) + { #if wxUSE_OWNER_DRAWN wxASSERT_MSG(clientData[i] == NULL, - wxT("Can't use client data with owner-drawn listboxes")); + wxT("Can't use client data with owner-drawn listboxes")); #else // !wxUSE_OWNER_DRAWN - Append( choices[i] , clientData[i] ) ; - #endif - } - else - Append( choices[i] ) ; - } - + Append( choices[i] , clientData[i] ) ; +#endif + } + else + Append( choices[i] ) ; + } + #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { // first delete old items size_t ui = m_aItems.Count(); while ( ui-- != 0 ) { delete m_aItems[ui]; + m_aItems[ui] = NULL; } m_aItems.Empty(); - + // then create new ones for ( ui = 0; ui < (size_t)m_noItems; ui++ ) { wxOwnerDrawn *pNewItem = CreateItem(ui); @@ -348,127 +374,97 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) } } #endif // wxUSE_OWNER_DRAWN - MacSetRedraw( true ) ; } -bool wxListBox::HasMultipleSelection() const +int wxListBox::FindString(const wxString& s) const { - return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); -} - -int wxListBox::FindString(const wxString& st) const -{ - wxString s ; - if( wxApp::s_macDefaultEncodingIsPC ) - { - s = wxMacMakeMacStringFromPC( st ) ; - } - else - s = st ; - - if ( s.Right(1) == "*" ) - { - wxString search = s.Left( s.Length() - 1 ) ; - int len = search.Length() ; - Str255 s1 , s2 ; - -#if TARGET_CARBON - c2pstrcpy( (StringPtr) s2 , search.c_str() ) ; -#else - strcpy( (char *) s2 , search.c_str() ) ; - c2pstr( (char *) s2 ) ; -#endif - - for ( int i = 0 ; i < m_noItems ; ++ i ) - { -#if TARGET_CARBON - c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ; -#else - strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ; - c2pstr( (char *) s1 ) ; -#endif - if ( EqualString( s1 , s2 , false , false ) ) - return i ; - } - if ( s.Left(1) == "*" && s.Length() > 1 ) - { - s.MakeLower() ; - for ( int i = 0 ; i < m_noItems ; ++i ) - { - if ( GetString(i).Lower().Matches(s) ) - return i ; - } - } - - } - else - { - Str255 s1 , s2 ; + + 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 ) ; -#if TARGET_CARBON - c2pstrcpy( (StringPtr) s2 , s.c_str() ) ; -#else - strcpy( (char *) s2 , s.c_str() ) ; - c2pstr( (char *) s2 ) ; -#endif + if ( EqualString( s1 , s2 , false , false ) ) + return i ; + } + if ( s.Left(1) == wxT("*") && s.Length() > 1 ) + { + wxString st = s ; + st.MakeLower() ; + for ( int i = 0 ; i < m_noItems ; ++i ) + { + if ( GetString(i).Lower().Matches(st) ) + return i ; + } + } + + } + else + { + Str255 s1 , s2 ; + + wxMacStringToPascal( s , s2 ) ; + + for ( int i = 0 ; i < m_noItems ; ++ i ) + { + wxMacStringToPascal( m_stringArray[i] , s1 ) ; - for ( int i = 0 ; i < m_noItems ; ++ i ) - { -#if TARGET_CARBON - c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ; -#else - strcpy( (char *) s1 , m_stringArray[i].c_str() ) ; - c2pstr( (char *) s1 ) ; -#endif - if ( EqualString( s1 , s2 , false , false ) ) - return i ; - } - } - return -1; + if ( EqualString( s1 , s2 , false , false ) ) + return i ; + } + } + return -1; } void wxListBox::Clear() { - Free(); - m_noItems = 0; - m_stringArray.Empty() ; - m_dataArray.Empty() ; - MacClear() ; + FreeData(); + m_noItems = 0; + m_stringArray.Empty() ; + m_dataArray.Empty() ; + MacClear() ; } void wxListBox::SetSelection(int N, bool select) { wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetSelection" ); - MacSetSelection( N , select ) ; + wxT("invalid index in wxListBox::SetSelection") ); + MacSetSelection( N , select ) ; + GetSelections( m_selectionPreImage ) ; } bool wxListBox::IsSelected(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, - "invalid index in wxListBox::Selected" ); - - return MacIsSelected( N ) ; + wxT("invalid index in wxListBox::Selected") ); + + return MacIsSelected( N ) ; } void *wxListBox::DoGetItemClientData(int N) const { wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, - wxT("invalid index in wxListBox::GetClientData")); - + wxT("invalid index in wxListBox::GetClientData")); + return (void *)m_dataArray[N]; } wxClientData *wxListBox::DoGetItemClientObject(int N) const { - return (wxClientData *) DoGetItemClientData( N ) ; + return (wxClientData *) DoGetItemClientData( N ) ; } void wxListBox::DoSetItemClientData(int N, void *Client_data) { wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::SetClientData" ); - + wxT("invalid index in wxListBox::SetClientData") ); + #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { @@ -477,15 +473,15 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data) wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes")); } #endif // wxUSE_OWNER_DRAWN - wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ; - - if ( m_dataArray.GetCount() > N ) - { - m_dataArray[N] = (char*) Client_data ; + 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 ; } else { - m_dataArray.Add( (char*) Client_data ) ; + m_dataArray.Add( (char*) Client_data ) ; } } @@ -497,76 +493,101 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData) // Return number of selections and an array of selected integers int wxListBox::GetSelections(wxArrayInt& aSelections) const { - return MacGetSelections( aSelections ) ; - -/* TODO - if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED)) - { - int no_sel = ?? - for ( int n = 0; n < no_sel; n++ ) - aSelections.Add(??); - - return no_sel; - } - else // single-selection listbox - { - aSelections.Add(??); - - return 1; - } -*/ + return MacGetSelections( aSelections ) ; } // Get single selection, for single choice list items int wxListBox::GetSelection() const { - return MacGetSelection() ; + return MacGetSelection() ; } // Find string for position wxString wxListBox::GetString(int N) const { - if( wxApp::s_macDefaultEncodingIsPC ) - { - return wxMacMakePCStringFromMac( m_stringArray[N] ) ; - } - else - return m_stringArray[N] ; + return m_stringArray[N] ; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { wxCHECK_RET( pos >= 0 && pos <= m_noItems, - wxT("invalid index in wxListBox::InsertItems") ); + 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 ) ; - m_dataArray.Insert( NULL , pos + i ) ; - MacInsert( pos + i , items[i] ) ; - } - + + for ( int i = 0 ; i < nItems ; i++ ) + { + m_stringArray.Insert( items[i] , pos + i ) ; + m_dataArray.Insert( NULL , pos + i ) ; + MacInsert( pos + i , items[i] ) ; + } + m_noItems += nItems; } void wxListBox::SetString(int N, const wxString& s) { - wxString str ; - if( wxApp::s_macDefaultEncodingIsPC ) - { - str = wxMacMakeMacStringFromPC( s ) ; - } - else - str = s ; - m_stringArray[N] = str ; - MacSet( N , s ) ; + m_stringArray[N] = s ; + MacSet( N , s ) ; } wxSize wxListBox::DoGetBestSize() const { - return wxSize(100, 100); + int lbWidth = 100; // some defaults + int lbHeight = 110; + int wLine; + + { + wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; + + if ( m_font.Ok() ) + { + ::TextFont( m_font.MacGetFontNum() ) ; + ::TextSize( m_font.MacGetFontSize() ) ; + ::TextFace( m_font.MacGetFontStyle() ) ; + } + else + { + ::TextFont( kFontIDMonaco ) ; + ::TextSize( 9 ); + ::TextFace( 0 ) ; + } + + // Find the widest line + for(int i = 0; i < GetCount(); i++) { + wxString str(GetString(i)); + #if wxUSE_UNICODE + Point bounds={0,0} ; + SInt16 baseline ; + ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) , + kThemeCurrentPortFont, + kThemeStateActive, + false, + &bounds, + &baseline ); + wLine = bounds.h ; + #else + wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ; + #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); + } + + return wxSize(lbWidth, lbHeight); } int wxListBox::GetCount() const @@ -574,20 +595,10 @@ int wxListBox::GetCount() const return m_noItems; } -void wxListBox::SetupColours() -{ - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetForegroundColour()); -} - void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { - // Set up port - WindowRef rootwindow = GetMacRootWindow() ; - wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; - wxMacDrawingHelper focus( wxrootwindow ); - - UMADrawControl(m_macControl); + wxControl::Refresh( eraseBack , rect ) ; + // MacRedrawControl() ; } #if wxUSE_OWNER_DRAWN @@ -615,183 +626,275 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n) // list box control implementation // ============================================================================ -void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) -{ - wxListBox* list; - // typecast our refCon - list = (wxListBox*)refCon; - - MoveTo(cellRect->left + 4 , cellRect->top + 10 ); - const wxString text = list->m_stringArray[lCell.v] ; - ::TextFont( kFontIDMonaco ) ; - ::TextSize( 9 ); - ::TextFace( 0 ) ; - DrawText(text, 0 , text.Length()); - -} - void wxListBox::MacDelete( int N ) { - LDelRow( 1 , N , m_macList) ; - Refresh(); + UInt32 id = m_idArray[N] ; + verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ; + m_idArray.RemoveAt( N ) ; } -void wxListBox::MacInsert( int n , const char * text) +void wxListBox::MacInsert( int n , const wxString& text) { - Cell cell = { 0 , 0 } ; - cell.v = n ; - LAddRow( 1 , cell.v , m_macList ) ; -// LSetCell(text, strlen(text), cell, m_macList); - Refresh(); + verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ; + m_idArray.Insert( m_nextId , n ) ; + ++m_nextId ; } -void wxListBox::MacAppend( const char * text) +void wxListBox::MacAppend( const wxString& text) { - Cell cell = { 0 , 0 } ; - cell.v = (**m_macList).dataBounds.bottom ; - LAddRow( 1 , cell.v , m_macList ) ; - // LSetCell(text, strlen(text), cell, m_macList); - Refresh(); + verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ; + m_idArray.Add( m_nextId ) ; + ++m_nextId ; } -void wxListBox::MacClear() +void wxListBox::MacClear() { - LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ; - Refresh(); + verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ; + m_idArray.Empty() ; } void wxListBox::MacSetSelection( int n , bool select ) { - Cell cell = { 0 , 0 } ; - if ( LGetSelect( true , &cell , m_macList ) ) - { - LSetSelect( false , cell , m_macList ) ; - } - - cell.v = n ; - LSetSelect( select , cell , m_macList ) ; - LAutoScroll( m_macList ) ; - Refresh(); + UInt32 id = m_idArray[n] ; + if ( !(GetWindowStyle() & (wxLB_MULTIPLE|wxLB_EXTENDED) ) ) + { + int n = MacGetSelection() ; + if ( n >= 0 ) + { + UInt32 idOld = m_idArray[n] ; + m_peer->SetSelectedItems( 1 , & idOld , kDataBrowserItemsRemove ) ; + } + } + if ( m_peer->IsItemSelected( id ) != select ) + { + verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ; + } + MacScrollTo( n ) ; } bool wxListBox::MacIsSelected( int n ) const { - Cell cell = { 0 , 0 } ; - cell.v = n ; - return LGetSelect( false , &cell , m_macList ) ; -} - -void wxListBox::MacDestroy() -{ -// DisposeExtLDEFInfo( m_macList ) ; + return m_peer->IsItemSelected( m_idArray[n] ) ; } int wxListBox::MacGetSelection() const { - Cell cell = { 0 , 0 } ; - if ( LGetSelect( true , &cell , m_macList ) ) - return cell.v ; - else - return -1 ; + for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i ) + { + if ( m_peer->IsItemSelected( m_idArray[i] ) ) + { + return i ; + } + } + return -1 ; } int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const { - int no_sel = 0 ; - + int no_sel = 0 ; + aSelections.Empty(); - - Cell cell = { 0 , 0 } ; - cell.v = 0 ; - - while ( LGetSelect( true , &cell , m_macList ) ) - { - aSelections.Add( cell.v ) ; - no_sel++ ; - cell.v++ ; - } - return no_sel ; + for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i ) + { + if ( m_peer->IsItemSelected( m_idArray[i] ) ) + { + aSelections.Add( i ) ; + no_sel++ ; + } + } + return no_sel ; } -void wxListBox::MacSet( int n , const char * text ) +void wxListBox::MacSet( int n , const wxString& text ) { - // our implementation does not store anything in the list - // so we just have to redraw - Cell cell = { 0 , 0 } ; - cell.v = n ; -// LSetCell(text, strlen(text), cell, m_macList); - Refresh(); + // as we don't store the strings we only have to issue a redraw + UInt32 id = m_idArray[n] ; + verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; } void wxListBox::MacScrollTo( int n ) { - // TODO implement scrolling + UInt32 id = m_idArray[n] ; + verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ; } -void wxListBox::OnSize( const wxSizeEvent &event) +#if !TARGET_API_MAC_OSX +void wxListBox::OnSize( wxSizeEvent &event) { - Point pt; - -#if TARGET_CARBON - GetListCellSize(m_macList, &pt); -#else - pt = (**m_macList).cellSize ; -#endif - pt.h = m_width - 15 ; - LCellSize( pt , m_macList ) ; -} - -void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) -{ - Boolean wasDoubleClick = false ; - long result ; - - ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; - if ( !wasDoubleClick ) - { - MacDoClick() ; - } - else - { - MacDoDoubleClick() ; - } } +#endif -void wxListBox::MacSetRedraw( bool doDraw ) +void wxListBox::MacSetRedraw( bool doDraw ) { - LSetDrawingMode( doDraw , m_macList ) ; - + // nothing to do in compositing mode } void wxListBox::MacDoClick() -{ - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); +{/* + 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 ); - - wxArrayInt aSelections; - int n, count = GetSelections(aSelections); - 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; - } - + + 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) ; + GetEventHandler()->ProcessEvent(event) ; +*/ } + +#if !TARGET_API_MAC_OSX + +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(), + wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + return ; + } + } + event.Skip() ; + } + /* generate wxID_CANCEL if command-. or has been pressed (typically in dialogs) */ + else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) ) + { + // FIXME: look in ancestors, not just parent. + wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ; + if (win) + { + wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); + new_event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( new_event ); + } + } + else if ( event.GetKeyCode() == WXK_TAB ) + { + wxNavigationKeyEvent new_event; + new_event.SetEventObject( this ); + new_event.SetDirection( !event.ShiftDown() ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + new_event.SetWindowChange( event.ControlDown() ); + new_event.SetCurrentFocus( this ); + if ( !GetEventHandler()->ProcessEvent( new_event ) ) + event.Skip() ; + } + else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP ) + { + // 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 ) + { + 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); + } + else + { + if ( event.GetTimestamp() > m_lastTypeIn + 60 ) + { + m_typeIn = wxEmptyString ; + } + m_lastTypeIn = event.GetTimestamp() ; + m_typeIn += (char) event.GetKeyCode() ; + int line = FindString(wxT("*")+m_typeIn+wxT("*")) ; + if ( line >= 0 ) + { + if ( GetSelection() != line ) + { + 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 ; + + GetEventHandler()->ProcessEvent(event); + } + } + } +} + +#endif +