X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41c9a21f8cc72250ee4b0d5230c5f529c0ab0aab..327788acc5e4915df4e9e97db7fb08a4c4a00cdd:/src/mac/listbox.cpp diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 7cfcbc5bce..f4ddc539b3 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -16,30 +16,44 @@ #include "wx/app.h" #include "wx/listbox.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) BEGIN_EVENT_TABLE(wxListBox, wxControl) - EVT_SIZE( wxListBox::OnSize ) + EVT_SIZE( wxListBox::OnSize ) + EVT_CHAR( wxListBox::OnChar ) END_EVENT_TABLE() #endif #include "wx/mac/uma.h" +#if PRAGMA_STRUCT_ALIGN + #pragma options align=mac68k +#elif PRAGMA_STRUCT_PACKPUSH + #pragma pack(push, 2) +#elif PRAGMA_STRUCT_PACK + #pragma pack(2) +#endif typedef struct { unsigned short instruction; void (*function)(); } ldefRec, *ldefPtr, **ldefHandle; +#if PRAGMA_STRUCT_ALIGN + #pragma options align=reset +#elif PRAGMA_STRUCT_PACKPUSH + #pragma pack(pop) +#elif PRAGMA_STRUCT_PACK + #pragma pack() +#endif + extern "C" { static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, @@ -51,7 +65,6 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect Cell cell, short dataOffset, short dataLength, ListHandle listHandle ) { - FontInfo fontInfo; GrafPtr savePort; GrafPtr grafPtr; RgnHandle savedClipRegion; @@ -95,10 +108,10 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect // appropriate QuickDraw transform mode. if( isSelected ) { - savedPenMode = GetPortPenMode( grafPtr ); - SetPortPenMode( grafPtr, hilitetransfermode ); + savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr ); + SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode ); PaintRect( drawRect ); - SetPortPenMode( grafPtr, savedPenMode ); + SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode ); } // Restore the saved clip region. @@ -113,10 +126,10 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect // appropriate QuickDraw transform mode. GetPort( &grafPtr ); - savedPenMode = GetPortPenMode( grafPtr ); - SetPortPenMode( grafPtr, hilitetransfermode ); + savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr ); + SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode ); PaintRect( drawRect ); - SetPortPenMode( grafPtr, savedPenMode ); + SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode ); break; default : break ; @@ -126,6 +139,7 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; const short kwxMacListWithVerticalScrollbar = 128 ; +const short kwxMacListItemHeight = 14 ; // ============================================================================ // list box control implementation @@ -164,43 +178,44 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, macListDefUPP = NewListDefUPP( wxMacListDefinition ); } listDef.u.userProc = macListDefUPP ; + #if TARGET_CARBON Size asize; - CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true, - 14, 14, false, &listDef, &m_macControl ); + CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true, + kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl ); - GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag, + GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag, sizeof(ListHandle), (Ptr) &m_macList, &asize); - SetControlReference(m_macControl, (long) this); - SetControlVisibility(m_macControl, false, false); + SetControlReference( (ControlHandle) m_macControl, (long) this); + SetControlVisibility( (ControlHandle) m_macControl, false, false); #else - long result ; - m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , + long result ; + wxStAppResource resload ; + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, kControlListBoxProc , (long) this ) ; - ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , + ::GetControlData( (ControlHandle) 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 ) + if ( (**(ListHandle)m_macList).listDefProc != NULL ) { (**ldef).instruction = 0x4EF9; /* JMP instruction */ (**ldef).function = (void(*)()) listDef.u.userProc; - (**m_macList).listDefProc = (Handle) ldef ; + (**(ListHandle)m_macList).listDefProc = (Handle) ldef ; } - Point pt = (**m_macList).cellSize ; - pt.v = 14 ; - LCellSize( pt , m_macList ) ; - - LAddColumn( 1 , 0 , m_macList ) ; + Point pt = (**(ListHandle)m_macList).cellSize ; + pt.v = kwxMacListItemHeight ; + LCellSize( pt , (ListHandle)m_macList ) ; + LAddColumn( 1 , 0 , (ListHandle)m_macList ) ; #endif OptionBits options = 0; if ( style & wxLB_MULTIPLE ) @@ -215,7 +230,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, { options = lOnlyOne ; } - SetListSelectionFlags(m_macList, options); + SetListSelectionFlags((ListHandle)m_macList, options); MacPostControlCreate() ; @@ -224,25 +239,25 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Append( choices[i] ) ; } - LSetDrawingMode( true , m_macList ) ; + LSetDrawingMode( true , (ListHandle)m_macList ) ; return TRUE; } wxListBox::~wxListBox() { - Free() ; + FreeData() ; if ( m_macList ) { #if !TARGET_CARBON - DisposeHandle( (**m_macList).listDefProc ) ; - (**m_macList).listDefProc = NULL ; + DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ; + (**(ListHandle)m_macList).listDefProc = NULL ; #endif m_macList = NULL ; } } -void wxListBox::Free() +void wxListBox::FreeData() { #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) @@ -250,6 +265,7 @@ void wxListBox::Free() size_t uiCount = m_aItems.Count(); while ( uiCount-- != 0 ) { delete m_aItems[uiCount]; + m_aItems[uiCount] = NULL; } m_aItems.Clear(); @@ -272,8 +288,8 @@ void wxListBox::DoSetSize(int x, int y, wxControl::DoSetSize( x , y , width , height , sizeFlags ) ; #if TARGET_CARBON Rect bounds ; - GetControlBounds( m_macControl , &bounds ) ; - ControlRef control = GetListVerticalScrollBar( m_macList ) ; + GetControlBounds( (ControlHandle) m_macControl , &bounds ) ; + ControlRef control = GetListVerticalScrollBar( (ListHandle)m_macList ) ; if ( control ) { Rect scrollbounds ; @@ -305,7 +321,7 @@ void wxListBox::Delete(int N) delete GetClientObject(N); } #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN - m_stringArray.Remove( N ) ; + m_stringArray.RemoveAt( N ) ; m_dataArray.RemoveAt( N ) ; m_noItems --; @@ -358,6 +374,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) size_t ui = m_aItems.Count(); while ( ui-- != 0 ) { delete m_aItems[ui]; + m_aItems[ui] = NULL; } m_aItems.Empty(); @@ -413,6 +430,7 @@ int wxListBox::FindString(const wxString& st) const } if ( s.Left(1) == "*" && s.Length() > 1 ) { + s = st ; s.MakeLower() ; for ( int i = 0 ; i < m_noItems ; ++i ) { @@ -450,7 +468,7 @@ int wxListBox::FindString(const wxString& st) const void wxListBox::Clear() { - Free(); + FreeData(); m_noItems = 0; m_stringArray.Empty() ; m_dataArray.Empty() ; @@ -581,18 +599,14 @@ int wxListBox::GetCount() const void wxListBox::SetupColours() { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); SetForegroundColour(GetParent()->GetForegroundColour()); } void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { - // Set up port - WindowRef rootwindow = MacGetRootWindow() ; - wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; - wxMacDrawingHelper focus( wxrootwindow ); - - UMADrawControl(m_macControl); + wxControl::Refresh( eraseBack , rect ) ; +// MacRedrawControl() ; } #if wxUSE_OWNER_DRAWN @@ -637,7 +651,7 @@ void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refC void wxListBox::MacDelete( int N ) { - LDelRow( 1 , N , m_macList) ; + LDelRow( 1 , N , (ListHandle)m_macList) ; Refresh(); } @@ -645,7 +659,7 @@ void wxListBox::MacInsert( int n , const char * text) { Cell cell = { 0 , 0 } ; cell.v = n ; - LAddRow( 1 , cell.v , m_macList ) ; + LAddRow( 1 , cell.v , (ListHandle)m_macList ) ; // LSetCell(text, strlen(text), cell, m_macList); Refresh(); } @@ -653,15 +667,15 @@ void wxListBox::MacInsert( int n , const char * text) void wxListBox::MacAppend( const char * text) { Cell cell = { 0 , 0 } ; - cell.v = (**m_macList).dataBounds.bottom ; - LAddRow( 1 , cell.v , m_macList ) ; + cell.v = (**(ListHandle)m_macList).dataBounds.bottom ; + LAddRow( 1 , cell.v , (ListHandle)m_macList ) ; // LSetCell(text, strlen(text), cell, m_macList); Refresh(); } void wxListBox::MacClear() { - LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ; + LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ; Refresh(); } @@ -670,15 +684,15 @@ void wxListBox::MacSetSelection( int n , bool select ) Cell cell = { 0 , 0 } ; if ( ! (m_windowStyle & wxLB_MULTIPLE) ) { - if ( LGetSelect( true , &cell , m_macList ) ) - { - LSetSelect( false , cell , m_macList ) ; - } + if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) + { + LSetSelect( false , cell , (ListHandle)m_macList ) ; + } } cell.v = n ; - LSetSelect( select , cell , m_macList ) ; - LAutoScroll( m_macList ) ; + LSetSelect( select , cell , (ListHandle)m_macList ) ; + LAutoScroll( (ListHandle)m_macList ) ; Refresh(); } @@ -686,7 +700,7 @@ bool wxListBox::MacIsSelected( int n ) const { Cell cell = { 0 , 0 } ; cell.v = n ; - return LGetSelect( false , &cell , m_macList ) ; + return LGetSelect( false , &cell , (ListHandle)m_macList ) ; } void wxListBox::MacDestroy() @@ -697,7 +711,7 @@ void wxListBox::MacDestroy() int wxListBox::MacGetSelection() const { Cell cell = { 0 , 0 } ; - if ( LGetSelect( true , &cell , m_macList ) ) + if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) return cell.v ; else return -1 ; @@ -712,7 +726,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const Cell cell = { 0 , 0 } ; cell.v = 0 ; - while ( LGetSelect( true , &cell , m_macList ) ) + while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) ) { aSelections.Add( cell.v ) ; no_sel++ ; @@ -741,20 +755,20 @@ void wxListBox::OnSize( const wxSizeEvent &event) Point pt; #if TARGET_CARBON - GetListCellSize(m_macList, &pt); + GetListCellSize((ListHandle)m_macList, &pt); #else - pt = (**m_macList).cellSize ; + pt = (**(ListHandle)m_macList).cellSize ; #endif pt.h = m_width - 15 ; - LCellSize( pt , m_macList ) ; + LCellSize( pt , (ListHandle)m_macList ) ; } -void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { Boolean wasDoubleClick = false ; long result ; - ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; + ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; if ( !wasDoubleClick ) { MacDoClick() ; @@ -767,7 +781,7 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar void wxListBox::MacSetRedraw( bool doDraw ) { - LSetDrawingMode( doDraw , m_macList ) ; + LSetDrawingMode( doDraw , (ListHandle)m_macList ) ; } @@ -821,5 +835,62 @@ void wxListBox::MacDoDoubleClick() { wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; + GetEventHandler()->ProcessEvent(event) ; +} + +static long sLastTypeIn = 0 ; + +void wxListBox::OnChar(wxKeyEvent& event) +{ + EventRecord *ev = (EventRecord*) (wxTheApp->MacGetCurrentEvent() ) ; + short keycode ; + short keychar ; + keychar = short(ev->message & charCodeMask); + keycode = short(ev->message & keyCodeMask) >> 8 ; + if ( event.KeyCode() == WXK_SPACE ) + { + 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.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP ) + { + // default handling + event.Skip() ; +// ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ; + } + else + { + if ( ev->when > m_lastTypeIn + 60 ) + { + m_typeIn = "" ; + } + m_lastTypeIn = ev->when ; + m_typeIn += (char) event.KeyCode() ; + int line = FindString("*"+m_typeIn+"*") ; + if ( line >= 0 ) + { + SetSelection(line) ; + } + } } +