X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7205570233ce8420b71fa5df368054c8953ff0e4..02a1dfbae942c883d8651e34dcfbc5153aabc56e:/src/mac/listbox.cpp diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 502394e18a..58cf2550c7 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -16,26 +16,130 @@ #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 ) 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, + Cell cell, short dataOffset, short dataLength, + ListHandle listHandle ) ; +} + +static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect, + Cell cell, short dataOffset, short dataLength, + ListHandle listHandle ) +{ + 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( (CGrafPtr) grafPtr ); + SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode ); + PaintRect( drawRect ); + SetPortPenMode( (CGrafPtr)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( (CGrafPtr)grafPtr ); + SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode ); + PaintRect( drawRect ); + SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode ); + break; + default : + break ; + } + SetPort(savePort); +} + extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; const short kwxMacListWithVerticalScrollbar = 128 ; +const short kwxMacListItemHeight = 14 ; // ============================================================================ // list box control implementation @@ -49,6 +153,8 @@ wxListBox::wxListBox() m_macList = NULL ; } +static ListDefUPP macListDefUPP = NULL ; + bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -65,99 +171,90 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; -#if TARGET_CARBON ListDefSpec listDef; - OptionBits options; + listDef.defType = kListDefUserProcType; + if ( macListDefUPP == NULL ) + { + macListDefUPP = NewListDefUPP( wxMacListDefinition ); + } + listDef.u.userProc = macListDefUPP ; + +#if TARGET_CARBON Size asize; - listDef.defType = kListDefStandardTextType; - CreateListBoxControl( parent->GetMacRootWindow(), &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); - - options = 0; - if ( style & wxLB_MULTIPLE ) - { - options += lNoExtend ; - } - else if ( style & wxLB_EXTENDED ) - { - options += lExtendDrag ; - } - else - { - options = lOnlyOne ; - } - SetListSelectionFlags(m_macList, options); + SetControlReference( (ControlHandle) m_macControl, (long) this); + SetControlVisibility( (ControlHandle) 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 ) ; + long result ; + wxStAppResource resload ; + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , + kwxMacListWithVerticalScrollbar , 0 , 0, + kControlListBoxProc , (long) this ) ; + ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag , + sizeof( ListHandle ) , (char*) &m_macList , &result ) ; HLock( (Handle) m_macList ) ; - NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ; - - (**m_macList).selFlags = 0 ; + ldefHandle ldef ; + ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ; + if ( (**(ListHandle)m_macList).listDefProc != NULL ) + { + (**ldef).instruction = 0x4EF9; /* JMP instruction */ + (**ldef).function = (void(*)()) listDef.u.userProc; + (**(ListHandle)m_macList).listDefProc = (Handle) ldef ; + } + + 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 ) { - (**m_macList).selFlags += lNoExtend ; + options += lNoExtend ; } else if ( style & wxLB_EXTENDED ) { - (**m_macList).selFlags += lExtendDrag ; + options += lExtendDrag ; } else { - (**m_macList).selFlags = lOnlyOne ; + options = lOnlyOne ; } - - Point pt = (**m_macList).cellSize ; - pt.v = 14 ; - LCellSize( pt , m_macList ) ; - - LAddColumn( 1 , 0 , m_macList ) ; - - ControlFontStyleRec controlstyle ; - controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ; - //controlstyle.font = kControlFontSmallSystemFont ; - controlstyle.font = kFontIDMonaco ; - controlstyle.size = 9 ; - //::UMASetControlFontStyle( m_macControl , &controlstyle ) ; -#endif + SetListSelectionFlags((ListHandle)m_macList, options); MacPostControlCreate() ; for ( int i = 0 ; i < n ; i++ ) { - Append( choices[i] ) ; + Append( choices[i] ) ; } - LSetDrawingMode( true , m_macList ) ; + LSetDrawingMode( true , (ListHandle)m_macList ) ; return TRUE; } wxListBox::~wxListBox() { - Free() ; - if ( m_macList ) - { + Free() ; + if ( m_macList ) + { #if !TARGET_CARBON - DisposeExtLDEFInfo( m_macList ) ; + DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ; + (**(ListHandle)m_macList).listDefProc = NULL ; #endif - m_macList = NULL ; - } + m_macList = NULL ; + } } void wxListBox::Free() @@ -183,9 +280,30 @@ void wxListBox::Free() } } +void wxListBox::DoSetSize(int x, int y, + int width, int height, + int sizeFlags ) +{ + wxControl::DoSetSize( x , y , width , height , sizeFlags ) ; +#if TARGET_CARBON + Rect bounds ; + GetControlBounds( (ControlHandle) m_macControl , &bounds ) ; + ControlRef control = GetListVerticalScrollBar( (ListHandle)m_macList ) ; + if ( control ) + { + Rect scrollbounds ; + GetControlBounds( control , &scrollbounds ) ; + if( scrollbounds.right != bounds.right + 1 ) + { + UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 , + scrollbounds.top ) ; + } + } +#endif +} void wxListBox::DoSetFirstItem(int N) { - MacScrollTo( N ) ; + MacScrollTo( N ) ; } void wxListBox::Delete(int N) @@ -202,30 +320,30 @@ 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.Remove( 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 ) ; + 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 ) ; - return index ; + return index ; } void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) @@ -236,17 +354,17 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) for( int i = 0 ; i < n ; ++i ) { - if ( clientData ) - { + if ( clientData ) + { #if wxUSE_OWNER_DRAWN wxASSERT_MSG(clientData[i] == NULL, wxT("Can't use client data with owner-drawn listboxes")); #else // !wxUSE_OWNER_DRAWN - Append( choices[i] , clientData[i] ) ; + Append( choices[i] , clientData[i] ) ; #endif - } - else - Append( choices[i] ) ; + } + else + Append( choices[i] ) ; } #if wxUSE_OWNER_DRAWN @@ -276,71 +394,71 @@ bool wxListBox::HasMultipleSelection() const 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 ; + 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() ) ; + c2pstrcpy( (StringPtr) s2 , search.c_str() ) ; #else - strcpy( (char *) s2 , search.c_str() ) ; - c2pstr( (char *) s2 ) ; + strcpy( (char *) s2 , search.c_str() ) ; + c2pstr( (char *) s2 ) ; #endif - for ( int i = 0 ; i < m_noItems ; ++ i ) - { + for ( int i = 0 ; i < m_noItems ; ++ i ) + { #if TARGET_CARBON - c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ; + c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ; #else - strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ; - c2pstr( (char *) s1 ) ; + 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 ( 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 TARGET_CARBON - c2pstrcpy( (StringPtr) s2 , s.c_str() ) ; + c2pstrcpy( (StringPtr) s2 , s.c_str() ) ; #else - strcpy( (char *) s2 , s.c_str() ) ; - c2pstr( (char *) s2 ) ; + strcpy( (char *) s2 , s.c_str() ) ; + c2pstr( (char *) s2 ) ; #endif - for ( int i = 0 ; i < m_noItems ; ++ i ) - { + for ( int i = 0 ; i < m_noItems ; ++ i ) + { #if TARGET_CARBON - c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ; + c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ; #else - strcpy( (char *) s1 , m_stringArray[i].c_str() ) ; - c2pstr( (char *) s1 ) ; + strcpy( (char *) s1 , m_stringArray[i].c_str() ) ; + c2pstr( (char *) s1 ) ; #endif - if ( EqualString( s1 , s2 , false , false ) ) - return i ; - } + if ( EqualString( s1 , s2 , false , false ) ) + return i ; + } } return -1; } @@ -358,7 +476,8 @@ void wxListBox::SetSelection(int N, bool select) { wxCHECK_RET( N >= 0 && N < m_noItems, "invalid index in wxListBox::SetSelection" ); - MacSetSelection( N , select ) ; + MacSetSelection( N , select ) ; + GetSelections( m_selectionPreImage ) ; } bool wxListBox::IsSelected(int N) const @@ -366,7 +485,7 @@ bool wxListBox::IsSelected(int N) const wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, "invalid index in wxListBox::Selected" ); - return MacIsSelected( N ) ; + return MacIsSelected( N ) ; } void *wxListBox::DoGetItemClientData(int N) const @@ -379,7 +498,7 @@ void *wxListBox::DoGetItemClientData(int N) const wxClientData *wxListBox::DoGetItemClientObject(int N) const { - return (wxClientData *) DoGetItemClientData( N ) ; + return (wxClientData *) DoGetItemClientData( N ) ; } void wxListBox::DoSetItemClientData(int N, void *Client_data) @@ -395,15 +514,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() >= N , "invalid client_data array" ) ; + + if ( m_dataArray.GetCount() > N ) + { + m_dataArray[N] = (char*) Client_data ; } else { - m_dataArray.Add( (char*) Client_data ) ; + m_dataArray.Add( (char*) Client_data ) ; } } @@ -415,41 +534,24 @@ 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] ; + if( wxApp::s_macDefaultEncodingIsPC ) + { + return wxMacMakePCStringFromMac( m_stringArray[N] ) ; + } + else + return m_stringArray[N] ; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) @@ -459,27 +561,27 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) 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 ) ; + wxString str ; + if( wxApp::s_macDefaultEncodingIsPC ) + { + str = wxMacMakeMacStringFromPC( s ) ; + } + else + str = s ; + m_stringArray[N] = str ; + MacSet( N , s ) ; } wxSize wxListBox::DoGetBestSize() const @@ -494,18 +596,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 = GetMacRootWindow() ; - wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; - wxMacDrawingHelper focus( wxrootwindow ); - - UMADrawControl(m_macControl); + wxControl::Refresh( eraseBack , rect ) ; +// MacRedrawControl() ; } #if wxUSE_OWNER_DRAWN @@ -535,22 +633,22 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n) 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()); - + 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) ; + LDelRow( 1 , N , (ListHandle)m_macList) ; Refresh(); } @@ -558,45 +656,48 @@ void wxListBox::MacInsert( int n , const char * text) { Cell cell = { 0 , 0 } ; cell.v = n ; - LAddRow( 1 , cell.v , m_macList ) ; - LSetCell(text, strlen(text), cell, m_macList); + LAddRow( 1 , cell.v , (ListHandle)m_macList ) ; +// LSetCell(text, strlen(text), cell, m_macList); Refresh(); } void wxListBox::MacAppend( const char * text) { Cell cell = { 0 , 0 } ; - cell.v = (**m_macList).dataBounds.bottom ; - LAddRow( 1 , cell.v , m_macList ) ; - LSetCell(text, strlen(text), cell, 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(); } 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(); + Cell cell = { 0 , 0 } ; + if ( ! (m_windowStyle & wxLB_MULTIPLE) ) + { + if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) + { + LSetSelect( false , cell , (ListHandle)m_macList ) ; + } + } + + cell.v = n ; + LSetSelect( select , cell , (ListHandle)m_macList ) ; + LAutoScroll( (ListHandle)m_macList ) ; + Refresh(); } bool wxListBox::MacIsSelected( int n ) const { - Cell cell = { 0 , 0 } ; - cell.v = n ; - return LGetSelect( false , &cell , m_macList ) ; + Cell cell = { 0 , 0 } ; + cell.v = n ; + return LGetSelect( false , &cell , (ListHandle)m_macList ) ; } void wxListBox::MacDestroy() @@ -606,44 +707,44 @@ void wxListBox::MacDestroy() int wxListBox::MacGetSelection() const { - Cell cell = { 0 , 0 } ; - if ( LGetSelect( true , &cell , m_macList ) ) - return cell.v ; - else - return -1 ; + Cell cell = { 0 , 0 } ; + if ( LGetSelect( true , &cell , (ListHandle)m_macList ) ) + return cell.v ; + else + 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 ; + Cell cell = { 0 , 0 } ; + cell.v = 0 ; + + while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) ) + { + aSelections.Add( cell.v ) ; + no_sel++ ; + cell.v++ ; + } + return no_sel ; } void wxListBox::MacSet( int n , const char * 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(); + // 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(); } void wxListBox::MacScrollTo( int n ) { - // TODO implement scrolling + // TODO implement scrolling } void wxListBox::OnSize( const wxSizeEvent &event) @@ -651,57 +752,77 @@ 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 ; + Boolean wasDoubleClick = false ; + long result ; - ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; - if ( !wasDoubleClick ) - { - MacDoClick() ; - } - else - { - MacDoDoubleClick() ; - } + ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ; + if ( !wasDoubleClick ) + { + MacDoClick() ; + } + else + { + MacDoDoubleClick() ; + } } void wxListBox::MacSetRedraw( bool doDraw ) { - LSetDrawingMode( doDraw , m_macList ) ; - + LSetDrawingMode( doDraw , (ListHandle)m_macList ) ; + } void wxListBox::MacDoClick() { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); + wxArrayInt aSelections; + int n, count = GetSelections(aSelections); + + if ( count == m_selectionPreImage.GetCount() ) + { + bool hasChanged = false ; + for ( int 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 - { + 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); @@ -711,5 +832,5 @@ void wxListBox::MacDoDoubleClick() { wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; + GetEventHandler()->ProcessEvent(event) ; }