X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/422644a3173c7309f1b67f138ed6cdfeaa24ddf1..f6ba47d9973bbb113257401b6eeb82b23da7acc4:/src/mac/carbon/listbox.cpp diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index 4358e40e2e..9a10e64d29 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -32,12 +32,27 @@ END_EVENT_TABLE() #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, @@ -49,7 +64,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; @@ -93,10 +107,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. @@ -111,10 +125,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 ; @@ -124,6 +138,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 @@ -162,43 +177,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 ) @@ -213,7 +229,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, { options = lOnlyOne ; } - SetListSelectionFlags(m_macList, options); + SetListSelectionFlags((ListHandle)m_macList, options); MacPostControlCreate() ; @@ -222,7 +238,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Append( choices[i] ) ; } - LSetDrawingMode( true , m_macList ) ; + LSetDrawingMode( true , (ListHandle)m_macList ) ; return TRUE; } @@ -233,8 +249,8 @@ wxListBox::~wxListBox() 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 ; } @@ -270,8 +286,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 ; @@ -579,18 +595,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 @@ -635,7 +647,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(); } @@ -643,7 +655,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(); } @@ -651,15 +663,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(); } @@ -668,15 +680,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(); } @@ -684,7 +696,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() @@ -695,7 +707,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 ; @@ -710,7 +722,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++ ; @@ -739,20 +751,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() ; @@ -765,7 +777,7 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar void wxListBox::MacSetRedraw( bool doDraw ) { - LSetDrawingMode( doDraw , m_macList ) ; + LSetDrawingMode( doDraw , (ListHandle)m_macList ) ; }