#pragma implementation "listbox.h"
#endif
+#include "wx/app.h"
#include "wx/listbox.h"
#include "wx/settings.h"
#include "wx/dynarray.h"
#include "wx/log.h"
#include "wx/utils.h"
-#include "extldef.h"
+#ifndef __DARWIN__
+// #include "extldef.h"
+#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
END_EVENT_TABLE()
#endif
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
+
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} ldefRec, *ldefPtr, **ldefHandle;
+
+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( 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 ;
{
m_noItems = 0;
m_selected = 0;
+ m_macList = NULL ;
}
+static ListDefUPP macListDefUPP = NULL ;
+
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxValidator& validator,
const wxString& name)
{
- m_noItems = 0 ; // this will be increased by our append command
- m_selected = 0;
-
- Rect bounds ;
- Str255 title ;
- m_macHorizontalBorder = 5 ; // additional pixels around the real control
- m_macVerticalBorder = 5 ;
-
- MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
+ m_noItems = 0 ; // this will be increased by our append command
+ m_selected = 0;
+
+ 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;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0,
- kControlListBoxProc , (long) this ) ;
-
- long result ;
- UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList , &result ) ;
- NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
- (**m_macList).selFlags = lOnlyOne ;
- if ( style & wxLB_MULTIPLE )
- {
- (**m_macList).selFlags += lNoExtend ;
- }
- else if ( style & wxLB_EXTENDED )
- {
- (**m_macList).selFlags += lExtendDrag ;
- }
- Point pt = (**m_macList).cellSize ;
- pt.v = 14 ;
- LCellSize( pt , m_macList ) ;
+ CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+ 14, 14, false, &listDef, &m_macControl );
- LAddColumn( 1 , 0 , m_macList ) ;
+ GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+ sizeof(ListHandle), (Ptr) &m_macList, &asize);
- MacPostControlCreate() ;
+ SetControlReference(m_macControl, (long) this);
+ SetControlVisibility(m_macControl, false, false);
- ControlFontStyleRec controlstyle ;
- controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
- //controlstyle.font = kControlFontSmallSystemFont ;
- controlstyle.font = kFontIDMonaco ;
- controlstyle.size = 9 ;
- ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+#else
+ long result ;
- for ( int i = 0 ; i < n ; i++ )
- {
- Append( choices[i] ) ;
- }
+ 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 ) ;
- LSetDrawingMode( true , m_macList ) ;
+ 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;
+ if ( style & wxLB_MULTIPLE )
+ {
+ options += lNoExtend ;
+ }
+ else if ( style & wxLB_EXTENDED )
+ {
+ options += lExtendDrag ;
+ }
+ else
+ {
+ options = lOnlyOne ;
+ }
+ SetListSelectionFlags(m_macList, options);
+
+ MacPostControlCreate() ;
+
+ for ( int i = 0 ; i < n ; i++ )
+ {
+ Append( choices[i] ) ;
+ }
+
+ LSetDrawingMode( true , m_macList ) ;
- return TRUE;
+ return TRUE;
}
wxListBox::~wxListBox()
{
-// DisposeExtLDEFInfo( m_macList ) ;
+ Free() ;
+ if ( m_macList )
+ {
+#if !TARGET_CARBON
+ DisposeHandle( (**m_macList).listDefProc ) ;
+ (**m_macList).listDefProc = NULL ;
+#endif
+ m_macList = NULL ;
+ }
}
-void wxListBox::SetFirstItem(int N)
+void wxListBox::Free()
{
- MacScrollTo( N ) ;
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ size_t uiCount = m_aItems.Count();
+ while ( uiCount-- != 0 ) {
+ delete m_aItems[uiCount];
+ }
+
+ m_aItems.Clear();
+ }
+ else
+#endif // wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ {
+ delete GetClientObject(n);
+ }
+ }
}
-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags )
{
- MacScrollTo( FindString( s ) ) ;
+ wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+#if TARGET_CARBON
+ Rect bounds ;
+ GetControlBounds( m_macControl , &bounds ) ;
+ ControlRef control = GetListVerticalScrollBar( 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 ) ;
}
void wxListBox::Delete(int N)
{
- m_dataArray.Remove( N ) ;
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::Delete") );
+
+#if wxUSE_OWNER_DRAWN
+ delete m_aItems[N];
+ m_aItems.RemoveAt(N);
+#else // !wxUSE_OWNER_DRAWN
+ if ( HasClientObjectData() )
+ {
+ delete GetClientObject(N);
+ }
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
m_stringArray.Remove( N ) ;
- m_noItems --;
+ m_dataArray.RemoveAt( N ) ;
+ m_noItems --;
MacDelete( N ) ;
}
-void wxListBox::Append(const wxString& item)
-{
- Append( item , NULL ) ;
-}
-
-void wxListBox::Append(const wxString& item, char *Client_data)
+int wxListBox::DoAppend(const wxString& item)
{
+ int index = m_noItems ;
if( wxApp::s_macDefaultEncodingIsPC )
{
m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
+ m_dataArray.Add( NULL );
}
- else
+ else {
m_stringArray.Add( item ) ;
- m_dataArray.Add( Client_data ) ;
- m_noItems ++;
-
+ m_dataArray.Add( NULL );
+ }
+ m_noItems ++;
+ DoSetItemClientData( index , NULL ) ;
MacAppend( item ) ;
+
+ return index ;
}
-void wxListBox::Set(int n, const wxString *choices, char** clientData)
-{
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+{
+ MacSetRedraw( false ) ;
Clear() ;
+ int n = choices.GetCount();
+
for( int i = 0 ; i < n ; ++i )
{
if ( clientData )
- Append( choices[i] , clientData[0] ) ;
+ {
+#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] ) ;
+ #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.Empty();
+
+ // then create new ones
+ for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
+ wxOwnerDrawn *pNewItem = CreateItem(ui);
+ pNewItem->SetName(choices[ui]);
+ m_aItems.Add(pNewItem);
+ }
+ }
+#endif // wxUSE_OWNER_DRAWN
+ MacSetRedraw( true ) ;
+}
+
+bool wxListBox::HasMultipleSelection() const
+{
+ return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
}
int wxListBox::FindString(const wxString& st) const
{
wxString search = s.Left( s.Length() - 1 ) ;
int len = search.Length() ;
- for ( int i = 0 ; i < m_noItems ; ++ i )
- {
- if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) )
- return i ;
- }
+ 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
{
- for ( int i = 0 ; i < m_noItems ; ++ i )
- {
- if ( equalstring( m_stringArray[i] , s , false , false ) )
- return i ;
- }
+ Str255 s1 , s2 ;
+
+#if TARGET_CARBON
+ c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
+#else
+ strcpy( (char *) s2 , s.c_str() ) ;
+ c2pstr( (char *) s2 ) ;
+#endif
+
+ 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;
}
void wxListBox::Clear()
{
+ Free();
m_noItems = 0;
m_stringArray.Empty() ;
m_dataArray.Empty() ;
{
wxCHECK_RET( N >= 0 && N < m_noItems,
"invalid index in wxListBox::SetSelection" );
- MacSetSelection( N , select ) ;
+ MacSetSelection( N , select ) ;
+ GetSelections( m_selectionPreImage ) ;
}
-bool wxListBox::Selected(int N) const
+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::Deselect(int N)
+void *wxListBox::DoGetItemClientData(int N) const
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- "invalid index in wxListBox::Deselect" );
+ wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
+ wxT("invalid index in wxListBox::GetClientData"));
- SetSelection( N , false ) ;
+ return (void *)m_dataArray[N];
}
-char *wxListBox::GetClientData(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(int N) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
- "invalid index in wxListBox::GetClientData" );
-
- return m_dataArray[N];
+ return (wxClientData *) DoGetItemClientData( N ) ;
}
-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::DoSetItemClientData(int N, void *Client_data)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
"invalid index in wxListBox::SetClientData" );
- m_dataArray[N] = Client_data ;
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ // client data must be pointer to wxOwnerDrawn, otherwise we would crash
+ // in OnMeasure/OnDraw.
+ 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 ;
+ }
+ else
+ {
+ m_dataArray.Add( (char*) Client_data ) ;
+ }
+}
+
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+ DoSetItemClientData(n, 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;
- }
-*/
}
// Get single selection, for single choice list items
return m_stringArray[N] ;
}
-void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{
+ wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+ wxT("invalid index in wxListBox::InsertItems") );
+
+ int nItems = items.GetCount();
+
for ( int i = 0 ; i < nItems ; i++ )
{
m_stringArray.Insert( items[i] , pos + i ) ;
void wxListBox::SetString(int N, const wxString& s)
{
- m_stringArray[N] = s ;
+ wxString str ;
+ if( wxApp::s_macDefaultEncodingIsPC )
+ {
+ str = wxMacMakeMacStringFromPC( s ) ;
+ }
+ else
+ str = s ;
+ m_stringArray[N] = str ;
MacSet( N , s ) ;
}
-int wxListBox::Number () const
+wxSize wxListBox::DoGetBestSize() const
{
- return m_noItems;
+ return wxSize(100, 100);
}
-// For single selection items only
-wxString wxListBox::GetStringSelection () const
+int wxListBox::GetCount() const
{
- int sel = GetSelection ();
- if (sel > -1)
- {
- return GetString (sel);
- }
- else
- return wxString("");
+ return m_noItems;
}
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+void wxListBox::SetupColours()
{
- int sel = FindString (s);
- if (sel > -1)
- {
- SetSelection (sel, flag);
- return TRUE;
- }
- else
- return FALSE;
+ SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetForegroundColour(GetParent()->GetForegroundColour());
}
-void wxListBox::Command (wxCommandEvent & event)
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
- if (event.m_extraLong)
- SetSelection (event.m_commandInt);
- else
- {
- Deselect (event.m_commandInt);
- return;
- }
- ProcessCommand (event);
+ // Set up port
+ WindowRef rootwindow = GetMacRootWindow() ;
+ wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+ wxMacDrawingHelper focus( wxrootwindow );
+
+ UMADrawControl(m_macControl);
+}
+
+#if wxUSE_OWNER_DRAWN
+
+class wxListBoxItem : public wxOwnerDrawn
+{
+public:
+ wxListBoxItem(const wxString& str = "");
+};
+
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+{
+ // no bitmaps/checkmarks
+ SetMarginWidth(0);
+}
+
+wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+{
+ return new wxListBoxItem();
}
+#endif //USE_OWNER_DRAWN
+
// ============================================================================
// list box control implementation
// ============================================================================
void wxListBox::MacDelete( int N )
{
- ListHandle list ;
- long result ;
- Cell cell = { 0 , 0 } ;
- UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list , &result ) ;
- LDelRow( 1 , N , list ) ;
+ LDelRow( 1 , N , m_macList) ;
+ Refresh();
}
void wxListBox::MacInsert( int n , const char * text)
{
- Cell cell ;
-
- cell.h = 0 ;
- cell.v = n ;
-
- LAddRow( 1 , cell.v , m_macList ) ;
+ Cell cell = { 0 , 0 } ;
+ cell.v = n ;
+ LAddRow( 1 , cell.v , 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 ) ;
+ Cell cell = { 0 , 0 } ;
+ cell.v = (**m_macList).dataBounds.bottom ;
+ LAddRow( 1 , cell.v , m_macList ) ;
+ // LSetCell(text, strlen(text), cell, m_macList);
+ Refresh();
}
void wxListBox::MacClear()
{
- LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+ LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+ Refresh();
}
void wxListBox::MacSetSelection( int n , bool select )
{
Cell cell = { 0 , 0 } ;
- if ( LGetSelect( TRUE , &cell , m_macList ) )
+ if ( ! (m_windowStyle & wxLB_MULTIPLE) )
{
- LSetSelect( false , cell , m_macList ) ;
+ if ( LGetSelect( true , &cell , m_macList ) )
+ {
+ LSetSelect( false , cell , m_macList ) ;
+ }
}
cell.v = n ;
LSetSelect( select , cell , m_macList ) ;
LAutoScroll( m_macList ) ;
+ Refresh();
}
bool wxListBox::MacIsSelected( int n ) const
void wxListBox::MacDestroy()
{
-// DisposeExtLDEFInfo( m_macList ) ;
+// DisposeExtLDEFInfo( m_macList ) ;
}
int wxListBox::MacGetSelection() const
// so we just have to redraw
Cell cell = { 0 , 0 } ;
cell.v = n ;
- LDraw( cell , m_macList ) ;
+// LSetCell(text, strlen(text), cell, m_macList);
+ Refresh();
}
void wxListBox::MacScrollTo( int n )
void wxListBox::OnSize( const wxSizeEvent &event)
{
- Point pt = (**m_macList).cellSize ;
- pt.h = m_width - 15 /* scrollbar */ - m_macHorizontalBorder * 2 ;
- LCellSize( pt , m_macList ) ;
+ 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 ;
- UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ;
+ ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ;
if ( !wasDoubleClick )
{
MacDoClick() ;
void wxListBox::MacDoClick()
{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
wxArrayInt aSelections;
- int count = GetSelections(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 ;
+ }
+
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+ event.SetEventObject( this );
+
if ( count > 0 )
{
- event.m_commandInt = aSelections[0] ;
- event.m_clientData = GetClientData(event.m_commandInt);
- wxString str(GetString(event.m_commandInt));
- if (str != "")
- event.m_commandString = copystring((char *)(const char *)str);
+ n = aSelections[0];
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString( GetString(n) );
}
else
{
- return ;
- /*
- event.m_commandInt = -1 ;
- event.m_commandString = copystring("") ;
- */
+ n = -1;
}
- event.SetEventObject( this );
- ProcessCommand(event);
- if (event.m_commandString)
- delete[] event.m_commandString ;
+ event.m_commandInt = n;
+
+ GetEventHandler()->ProcessEvent(event);
}
void wxListBox::MacDoDoubleClick()
projects / wxWidgets.git / blobdiff