///////////////////////////////////////////////////////////////////////////////
-// Name: listbox.cpp
+// Name: src/mac/carbon/listbox.cpp
// Purpose: wxListBox
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
#include "wx/app.h"
#include "wx/listbox.h"
#include "wx/utils.h"
-#if !USE_SHARED_LIBRARY
+#include "wx/mac/uma.h"
+
+const short kTextColumnId = 1024 ;
+
+// new DataBrowser-based version:
+// because of the limited insert functionality of DataBrowser,
+// we just introduce IDs corresponding to the line number
+
+
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
BEGIN_EVENT_TABLE(wxListBox, wxControl)
-#if !__WXMAC_OSX__
- EVT_SIZE( wxListBox::OnSize )
+#ifndef __WXMAC_OSX__
+// EVT_SIZE( wxListBox::OnSize )
EVT_CHAR( wxListBox::OnChar )
#endif
END_EVENT_TABLE()
-#endif
-
-#include "wx/mac/uma.h"
-const short kTextColumnId = 1024 ;
-
-// new databrowserbased version
-
-// Listbox item
-wxListBox::wxListBox()
-{
- m_noItems = 0;
- m_selected = 0;
- m_macList = NULL ;
-}
-bool wxListBox::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- const wxArrayString& choices,
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- wxCArrayString chs(choices);
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;
- return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
- style, validator, name);
-}
#if TARGET_API_MAC_OSX
-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
#else
-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
DataBrowserItemNotification message)
#endif
{
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 )
+ int i = itemID - 1 ;
+ if (i >= 0 && i < (int)list->GetCount() )
+ {
+ bool trigger = false ;
+ wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+ switch ( message )
+ {
+ case kDataBrowserItemDeselected :
+ if ( list->HasMultipleSelection() )
+ trigger = !list->MacIsSelectionSuppressed() ;
+ break ;
+
+ case kDataBrowserItemSelected :
+ trigger = !list->MacIsSelectionSuppressed() ;
+ 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) ;
+ }
+ }
+ }
+}
+
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+ DataBrowserItemID itemID, DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData, Boolean changeValue)
+{
+ OSStatus err = errDataBrowserPropertyNotSupported;
+
+ if ( ! changeValue )
+ {
+ switch (property)
+ {
+ case kTextColumnId:
{
- bool trigger = false ;
- wxCommandEvent event(
- wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
- switch( message )
+ long ref = GetControlReference( browser ) ;
+ if ( ref )
{
- 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 ;
+ wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
+ int i = itemID - 1 ;
+ if (i >= 0 && i < (int)list->GetCount() )
+ {
+ wxMacCFStringHolder cf( list->GetString( i ) , list->GetFont().GetEncoding() ) ;
+ verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+ err = noErr ;
+ }
}
- 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 ;
}
+ break;
+
+ default:
+ break;
+ }
}
+
+ return err;
}
+static pascal void ListBoxDrawProc( ControlRef browser , DataBrowserItemID item , DataBrowserPropertyID property ,
+ DataBrowserItemState itemState , const Rect *itemRect , SInt16 depth , Boolean isColorDevice )
+{
+ CFStringRef cfString;
+ ThemeDrawingState themeState ;
+ long systemVersion;
-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
- DataBrowserItemID itemID, DataBrowserPropertyID property,
- DataBrowserItemDataRef itemData, Boolean changeValue)
+ GetThemeDrawingState( &themeState ) ;
+ cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
+
+ // In this sample we handle the "selected" state; all others fall through to our "active" state
+ if ( itemState == kDataBrowserItemIsSelected )
+ {
+ ThemeBrush colorBrushID;
+
+ Gestalt( gestaltSystemVersion, &systemVersion );
+
+ // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor is incorporated
+ // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
+ if ( (systemVersion >= 0x00001030) && !IsControlActive( browser ) )
+ colorBrushID = kThemeBrushSecondaryHighlightColor;
+ else
+ colorBrushID = kThemeBrushPrimaryHighlightColor;
+
+ // First paint the hilite rect, then the text on top
+ SetThemePen( colorBrushID, 32, true );
+ PaintRect( itemRect );
+ SetThemeDrawingState( themeState , false ) ;
+ }
+
+ DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+ SetThemeDrawingState( themeState , true ) ;
+
+ if ( cfString != NULL )
+ CFRelease( cfString );
+}
+
+// Listbox item
+wxListBox::wxListBox()
+{
+ m_noItems = 0;
+ m_selected = 0;
+ m_macList = NULL ;
+ m_suppressSelection = false ;
+}
+
+bool wxListBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
- 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,
- int n, const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- m_macIsUserPane = FALSE ;
+ wxCArrayString chs(choices);
+
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
+
+bool wxListBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ int n,
+ const wxString choices[],
+ long style,
+ 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 = wxMacGetBoundsForControl( this , pos , size ) ;
- m_peer = new wxMacControl() ;
- verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
+ m_peer = new wxMacControl( this ) ;
+ verify_noerr(
+ ::CreateDataBrowserControl(
+ MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+ kDataBrowserListView, m_peer->GetControlRefAddr() ) );
DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
if ( style & wxLB_MULTIPLE )
- {
- options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
- }
+ options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection ;
else if ( style & wxLB_EXTENDED )
- {
- // default behaviour
- }
+ ; // default behaviour
else
+ options |= kDataBrowserSelectOnlyOne ;
+
+ verify_noerr( m_peer->SetSelectionFlags( options ) );
+
+ if ( gDataBrowserItemDataUPP == NULL )
+ gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
+ if ( gDataBrowserItemNotificationUPP == NULL )
{
- options += kDataBrowserSelectOnlyOne ;
+ gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+ (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+ NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
}
- verify_noerr(m_peer->SetSelectionFlags( options ) );
+
+ if ( gDataBrowserDrawItemUPP == NULL )
+ gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
+
+ DataBrowserCallbacks callbacks ;
+ InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;
+
+ callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+ callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+ m_peer->SetCallbacks( &callbacks);
+
+ DataBrowserCustomCallbacks customCallbacks ;
+ InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;
+
+ customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
+
+ SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
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 =
+ columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+ columnDesc.headerBtnDesc.btnFontStyle.flags = kControlUseFontMask | kControlUseJustMask;
+ columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+ 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 ; // kDataBrowserCustomType;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- kDataBrowserListViewTypeSelectColumn |
+ columnDesc.propertyDesc.propertyFlags |= 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;
-
- InitDataBrowserCallbacks(&callbacks);
-
- callbacks.u.v1.itemDataCallback =
- NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
-
- callbacks.u.v1.itemNotificationCallback =
-#if TARGET_API_MAC_OSX
- (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
-#else
- NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+
+ 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 ) ) ;
+
+#if 0
+ // shouldn't be necessary anymore under 10.2
+ m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+ m_peer->SetNeedsFocusRect( true ) ;
#endif
- m_peer->SetCallbacks( &callbacks);
- MacPostControlCreate(pos,size) ;
+ MacPostControlCreate( pos, size ) ;
for ( int i = 0 ; i < n ; i++ )
{
Append( choices[i] ) ;
}
- SetBestSize(size); // Needed because it is a wxControlWithItems
-
- return TRUE;
+ // Needed because it is a wxControlWithItems
+ SetBestSize(size);
+
+ return true;
}
wxListBox::~wxListBox()
{
- m_peer->SetReference( NULL ) ;
+ m_peer->SetReference( 0 ) ;
FreeData() ;
+
// avoid access during destruction
if ( m_macList )
- {
m_macList = NULL ;
- }
}
void wxListBox::FreeData()
{
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
- {
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- m_aItems[uiCount] = NULL;
- }
-
- m_aItems.Clear();
- }
- else
-#endif // wxUSE_OWNER_DRAWN
if ( HasClientObjectData() )
{
- for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ for ( unsigned int n = 0; n < m_noItems; n++ )
{
- delete GetClientObject(n);
+ delete GetClientObject( n );
}
}
}
wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
}
-void wxListBox::DoSetFirstItem(int N)
+void wxListBox::DoSetFirstItem(int n)
{
- MacScrollTo( N ) ;
+ MacScrollTo( n ) ;
}
-void wxListBox::Delete(int N)
+void wxListBox::Delete(unsigned int n)
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxCHECK_RET( IsValid(n),
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.RemoveAt( N ) ;
- m_dataArray.RemoveAt( N ) ;
- m_noItems --;
+ delete GetClientObject( n );
+
+ m_stringArray.RemoveAt( n ) ;
+ m_dataArray.RemoveAt( n ) ;
+ m_noItems--;
- MacDelete( N ) ;
+ MacDelete( n ) ;
}
int wxListBox::DoAppend(const wxString& item)
{
InvalidateBestSize();
- int index = m_noItems ;
+ unsigned int index = m_noItems ;
m_stringArray.Add( item ) ;
m_dataArray.Add( NULL );
- m_noItems ++;
+ m_noItems++;
DoSetItemClientData( index , NULL ) ;
MacAppend( item ) ;
void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{
Clear() ;
- int n = choices.GetCount();
-
- for( int i = 0 ; i < n ; ++i )
+ unsigned int n = choices.GetCount();
+
+ for ( size_t 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"));
-#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[ui] = NULL;
- }
- 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
}
-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
-
if ( s.Right(1) == wxT("*") )
{
- wxString search = s.Left( s.Length() - 1 ) ;
- int len = search.Length() ;
+ 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 )
+
+ for ( unsigned int i = 0 ; i < m_noItems ; ++ i )
{
- wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+ wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
- if ( EqualString( s1 , s2 , false , false ) )
- return i ;
+ if ( EqualString( s1 , s2 , bCase , false ) )
+ return (int)i;
}
- if ( s.Left(1) == wxT("*") && s.Length() > 1 )
+
+ if ( s.Left(1) == wxT("*") && s.length() > 1 )
{
wxString st = s ;
st.MakeLower() ;
- for ( int i = 0 ; i < m_noItems ; ++i )
+
+ for ( unsigned int i = 0 ; i < m_noItems ; ++i )
{
- if ( GetString(i).Lower().Matches(st) )
- return i ;
+ if (GetString(i).Lower().Matches(st) )
+ return (int)i ;
}
}
-
}
else
{
Str255 s1 , s2 ;
-
+
wxMacStringToPascal( s , s2 ) ;
-
- for ( int i = 0 ; i < m_noItems ; ++ i )
+
+ for ( unsigned int i = 0 ; i < m_noItems ; ++ i )
{
- wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+ wxMacStringToPascal( m_stringArray[i] , s1 ) ;
- if ( EqualString( s1 , s2 , false , false ) )
- return i ;
+ if ( EqualString( s1 , s2 , bCase , false ) )
+ return (int)i ;
}
}
- return -1;
+
+ return wxNOT_FOUND;
}
void wxListBox::Clear()
MacClear() ;
}
-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int n, bool select)
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxCHECK_RET( n == wxNOT_FOUND || IsValid(n) ,
wxT("invalid index in wxListBox::SetSelection") );
- MacSetSelection( N , select ) ;
- GetSelections( m_selectionPreImage ) ;
+
+ if ( n == wxNOT_FOUND )
+ MacDeselectAll() ;
+ else
+ MacSetSelection( n , select ) ;
}
-bool wxListBox::IsSelected(int N) const
+bool wxListBox::IsSelected(int n) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
+ wxCHECK_MSG( IsValid(n), false,
wxT("invalid index in wxListBox::Selected") );
-
- return MacIsSelected( N ) ;
+
+ return MacIsSelected( n ) ;
}
-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
- wxT("invalid index in wxListBox::GetClientData"));
-
- return (void *)m_dataArray[N];
+ wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+
+ wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") ) ;
+
+ return (void *)m_dataArray[n];
}
-wxClientData *wxListBox::DoGetItemClientObject(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const
{
- return (wxClientData *) DoGetItemClientData( N ) ;
+ return (wxClientData *) DoGetItemClientData( n ) ;
}
-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- wxT("invalid index in wxListBox::SetClientData") );
-
-#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() >= (size_t) N , wxT("invalid client_data array") ) ;
-
- if ( m_dataArray.GetCount() > (size_t) N )
- {
- m_dataArray[N] = (char*) Client_data ;
- }
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+
+ wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") ) ;
+
+ if ( m_dataArray.GetCount() > (unsigned int) n )
+ m_dataArray[n] = (char*)clientData ;
else
- {
- m_dataArray.Add( (char*) Client_data ) ;
- }
+ m_dataArray.Add( (char*)clientData ) ;
}
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
DoSetItemClientData(n, clientData);
}
}
// Find string for position
-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const
{
- return m_stringArray[N] ;
+ wxCHECK_MSG( IsValid(n), wxEmptyString,
+ wxT("invalid index in wxListBox::GetString") );
+
+ return m_stringArray[n] ;
}
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
{
- wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+ wxCHECK_RET( IsValidInsert(pos),
wxT("invalid index in wxListBox::InsertItems") );
-
+
InvalidateBestSize();
- int nItems = items.GetCount();
-
- for ( int i = 0 ; i < nItems ; i++ )
+ unsigned int nItems = items.GetCount();
+
+ for ( unsigned int i = 0 ; i < nItems ; i++ )
{
m_stringArray.Insert( items[i] , pos + i ) ;
m_dataArray.Insert( NULL , pos + i ) ;
+ m_noItems++ ;
MacInsert( pos + i , items[i] ) ;
}
-
- m_noItems += nItems;
}
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
{
- m_stringArray[N] = s ;
- MacSet( N , s ) ;
+ m_stringArray[n] = s ;
+ MacSet( n , s ) ;
}
wxSize wxListBox::DoGetBestSize() const
int wLine;
{
- wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
-
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) ) ;
+
+ // TODO: clean this up
if ( m_font.Ok() )
{
::TextFont( m_font.MacGetFontNum() ) ;
::TextSize( 9 );
::TextFace( 0 ) ;
}
-
+
// Find the widest line
- for(int i = 0; i < GetCount(); i++) {
+ for (unsigned int i = 0; i < GetCount(); i++)
+ {
wxString str(GetString(i));
- #if wxUSE_UNICODE
- Point bounds={0,0} ;
+
+#if wxUSE_UNICODE
+ Point bounds = {0, 0} ;
SInt16 baseline ;
- ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
+
+ // NB: what if m_font.Ok() == false ???
+ ::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);
+#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);
+
+ // don't make the listbox too tall (limit height to around 10 items)
+ // but don't make it too small neither
+ lbHeight = wxMax( (cy + 4) * wxMin( wxMax( GetCount(), 3 ), 10 ), 70 );
}
- return wxSize(lbWidth, lbHeight);
+ return wxSize( lbWidth, lbHeight );
}
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
{
return m_noItems;
}
void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
wxControl::Refresh( eraseBack , rect ) ;
- // MacRedrawControl() ;
-}
-
-#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
-
-
// Some custom controls depend on this
/* static */ wxVisualAttributes
wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
wxVisualAttributes attr;
- attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
- attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
- attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+ attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+ attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+
return attr;
}
// list box control implementation
// ============================================================================
-void wxListBox::MacDelete( int N )
+void wxListBox::MacDelete( int n )
{
- UInt32 id = m_idArray[N] ;
+ wxArrayInt selectionBefore ;
+ MacGetSelections( selectionBefore ) ;
+
+ UInt32 id = m_noItems + 1 ;
+
verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
- m_idArray.RemoveAt( N ) ;
+ for ( unsigned int i = 0 ; i < selectionBefore.GetCount() ; ++i )
+ {
+ int current = selectionBefore[i] ;
+ if ( current == n )
+ {
+ // selection was deleted
+ MacSetSelection( current , false ) ;
+ }
+ else if ( current > n )
+ {
+ // something behind the deleted item was selected -> move up
+ MacSetSelection( current - 1 , true ) ;
+ MacSetSelection( current , false ) ;
+ }
+ }
+
+ // refresh all
+ verify_noerr(
+ m_peer->UpdateItems(
+ kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+ kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;
}
-void wxListBox::MacInsert( int n , const wxString& text)
+void wxListBox::MacInsert( int n , const wxString& text )
{
- verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
- m_idArray.Insert( m_nextId , n ) ;
- ++m_nextId ;
+ wxArrayInt selectionBefore ;
+ MacGetSelections( selectionBefore ) ;
+
+ // this has already been increased
+ UInt32 id = m_noItems ;
+ verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+
+ for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i )
+ {
+ int current = selectionBefore[i] ;
+ if ( current >= n )
+ {
+ MacSetSelection( current + 1 , true ) ;
+ MacSetSelection( current , false ) ;
+ }
+ }
+
+ // refresh all
+ verify_noerr(
+ m_peer->UpdateItems(
+ kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+ kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;
}
-void wxListBox::MacAppend( const wxString& text)
+void wxListBox::MacAppend( const wxString& text )
{
- verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
- m_idArray.Add( m_nextId ) ;
- ++m_nextId ;
+ UInt32 id = m_noItems ; // this has already been increased
+ verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+ // no need to deal with selections nor refreshed, as we have appended
}
void wxListBox::MacClear()
{
verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
- m_idArray.Empty() ;
+}
+
+void wxListBox::MacDeselectAll()
+{
+ bool former = MacSuppressSelection( true ) ;
+ verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
+ MacSuppressSelection( former ) ;
}
void wxListBox::MacSetSelection( int n , bool select )
{
- 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 ) ;
- }
- }
+ bool former = MacSuppressSelection( true ) ;
+ UInt32 id = n + 1 ;
+
if ( m_peer->IsItemSelected( id ) != select )
{
- verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ;
+ if ( select )
+ verify_noerr( m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ;
+ else
+ verify_noerr( m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ;
}
+
MacScrollTo( n ) ;
+ MacSuppressSelection( former ) ;
+}
+
+bool wxListBox::MacSuppressSelection( bool suppress )
+{
+ bool former = m_suppressSelection ;
+ m_suppressSelection = suppress ;
+ return former ;
}
bool wxListBox::MacIsSelected( int n ) const
{
- return m_peer->IsItemSelected( m_idArray[n] ) ;
+ return m_peer->IsItemSelected( n + 1 ) ;
}
int wxListBox::MacGetSelection() const
{
- for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+ for ( unsigned int i = 0 ; i < GetCount() ; ++i )
{
- if ( m_peer->IsItemSelected( m_idArray[i] ) )
- {
+ if ( m_peer->IsItemSelected( i + 1 ) )
return i ;
- }
}
- return -1 ;
+
+ return -1 ;
}
int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
{
int no_sel = 0 ;
-
+
aSelections.Empty();
- for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+
+ UInt32 first , last ;
+ m_peer->GetSelectionAnchor( &first , &last ) ;
+ if ( first != kDataBrowserNoItem )
{
- if ( m_peer->IsItemSelected( m_idArray[i] ) )
+ for ( size_t i = first ; i <= last ; ++i )
{
- aSelections.Add( i ) ;
- no_sel++ ;
+ if ( m_peer->IsItemSelected( i ) )
+ {
+ aSelections.Add( i - 1 ) ;
+ no_sel++ ;
+ }
}
}
+
return no_sel ;
}
void wxListBox::MacSet( int n , const wxString& text )
{
// as we don't store the strings we only have to issue a redraw
- UInt32 id = m_idArray[n] ;
+ UInt32 id = n + 1 ;
verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
}
void wxListBox::MacScrollTo( int n )
{
- UInt32 id = m_idArray[n] ;
- verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
-}
+ UInt32 id = n + 1 ;
+ verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
+}
+
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+{
+ OSErr err;
+
+ // There are few reasons why this is complicated:
+ // 1) There is no native hittest function for mac
+ // 2) GetDataBrowserItemPartBounds only works on visible items
+ // 3) We can't do it through GetDataBrowserTableView[Item]RowHeight
+ // because what it returns is basically inaccurate in the context
+ // of the coordinates we want here, but we use this as a guess
+ // for where the first visible item lies
+
+ wxPoint point = inpoint;
+ // interestingly enough 10.2 (and below?) have GetDataBrowserItemPartBounds
+ // giving root window coordinates but 10.3 and above give client coordinates
+ // so we only compare using root window coordinates on 10.3 and up
+ if ( UMAGetSystemVersion() < 0x1030 )
+ MacClientToRootWindow(&point.x, &point.y);
+
+ // get column property id (req. for call to itempartbounds)
+ DataBrowserTableViewColumnID colId = 0;
+ err = GetDataBrowserTableViewColumnProperty(m_peer->GetControlRef(), 0, &colId);
+ wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewColumnProperty"));
+
+ // OK, first we need to find the first visible item we have -
+ // this will be the "low" for our binary search. There is no real
+ // easy way around this, as we will need to do a SLOW linear search
+ // until we find a visible item, but we can do a cheap calculation
+ // via the row height to speed things up a bit
+ UInt32 scrollx, scrolly;
+ err = GetDataBrowserScrollPosition(m_peer->GetControlRef(), &scrollx, &scrolly);
+ wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserScrollPosition"));
+
+ UInt16 height;
+ err = GetDataBrowserTableViewRowHeight(m_peer->GetControlRef(), &height);
+ wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
+
+ // these indices are 0-based, as usual, so we need to add 1 to them when
+ // passing them to data browser functions which use 1-based indices
+ int low = scrolly / height,
+ high = GetCount() - 1;
+
+
+ // search for the first visible item (note that the scroll guess above
+ // is the low bounds of where the item might lie so we only use that as a
+ // starting point - we should reach it within 1 or 2 iterations of the loop)
+ while ( low <= high )
+ {
+ Rect bounds;
+ err = GetDataBrowserItemPartBounds(m_peer->GetControlRef(), low + 1, colId,
+ kDataBrowserPropertyEnclosingPart,
+ &bounds); //note +1 to trans to mac id
+ if ( err == noErr )
+ break;
+
+ // errDataBrowserItemNotFound is expected as it simply means that the
+ // item is not currently visible -- but other errors are not
+ wxCHECK_MSG( err == errDataBrowserItemNotFound, wxNOT_FOUND,
+ wxT("Unexpected error from GetDataBrowserItemPartBounds") );
+
+ low++;
+ }
-#if !TARGET_API_MAC_OSX
-void wxListBox::OnSize( wxSizeEvent &event)
-{
-}
-#endif
+ // NOW do a binary search for where the item lies, searching low again if
+ // we hit an item that isn't visible
+ while ( low <= high )
+ {
+ int mid = (low + high) / 2;
-void wxListBox::MacSetRedraw( bool doDraw )
-{
- // nothing to do in compositing mode
-}
+ Rect bounds;
+ err = GetDataBrowserItemPartBounds(m_peer->GetControlRef(), mid + 1, colId,
+ kDataBrowserPropertyEnclosingPart,
+ &bounds); //note +1 to trans to mac id
+ wxCHECK_MSG( err == noErr || err == errDataBrowserItemNotFound,
+ wxNOT_FOUND,
+ wxT("Unexpected error from GetDataBrowserItemPartBounds") );
-void wxListBox::MacDoClick()
-{/*
- 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 ( err == errDataBrowserItemNotFound )
{
- if ( aSelections[i] != m_selectionPreImage[i] )
- {
- hasChanged = true ;
- break ;
- }
+ // item not visible, attempt to find a visible one
+ high = mid - 1; // search lower
}
- if ( !hasChanged )
+ else // visible item, do actual hitttest
{
- return ;
+ // if point is within the bounds, return this item (since we assume
+ // all x coords of items are equal we only test the x coord in
+ // equality)
+ if( (point.x >= bounds.left && point.x <= bounds.right) &&
+ (point.y >= bounds.top && point.y <= bounds.bottom) )
+ {
+ return mid; // found!
+ }
+
+ if ( point.y < bounds.top )
+ high = mid - 1; // index(bounds) greater then key(point)
+ else
+ low = mid + 1; // index(bounds) less then key(point)
}
}
-
- m_selectionPreImage = aSelections;
-
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
- event.SetEventObject( this );
-
- 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) ;
-*/
+ return wxNOT_FOUND;
}
#if !TARGET_API_MAC_OSX
void wxListBox::OnChar(wxKeyEvent& event)
{
- // todo trigger proper events here
+ // 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 )
+
+ while ( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
parent = parent->GetParent() ;
-
+
if ( parent && parent->GetDefaultItem() )
{
- wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
- wxButton);
+ wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton);
if ( def && def->IsEnabled() )
{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
- event.SetEventObject(def);
- def->Command(event);
+ wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+ event.SetEventObject( def );
+ def->Command( event );
+
return ;
}
}
+
event.Skip() ;
}
+
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
{
- // FIXME: look in ancestors, not just parent.
+ // 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 );
- }
+ wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+ new_event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( new_event );
+ }
}
else if ( event.GetKeyCode() == WXK_TAB )
{
{
// perform the default key handling first
wxControl::OnKeyDown( event ) ;
-
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+
+ 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) );
+ event.SetClientObject( GetClientObject( n ) );
else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData(n) );
- event.SetString( GetString(n) );
+ event.SetClientData( GetClientData( n ) );
+ event.SetString(GetString(n));
}
else
{
n = -1;
}
-
- event.m_commandInt = n;
-
+
+ event.SetInt( 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("*")) ;
+ int line = FindString( wxT("*") + m_typeIn + wxT("*") ) ;
if ( line >= 0 )
{
if ( GetSelection() != line )
{
- SetSelection(line) ;
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+ 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 ;
-
+ event.SetClientData( GetClientData( line ) );
+ event.SetString(GetString(line));
+ event.SetInt(line);
+
GetEventHandler()->ProcessEvent(event);
}
}
}
}
-#endif
+#endif // !TARGET_API_MAC_OSX
+#endif
projects / wxWidgets.git / blobdiff