// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "listbox.h"
#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
#include "wx/app.h"
#include "wx/listbox.h"
#include "wx/button.h"
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
BEGIN_EVENT_TABLE(wxListBox, wxControl)
-#if !TARGET_API_MAC_OSX
- EVT_SIZE( wxListBox::OnSize )
+#ifndef __WXMAC_OSX__
+// EVT_SIZE( wxListBox::OnSize )
EVT_CHAR( wxListBox::OnChar )
#endif
END_EVENT_TABLE()
const short kTextColumnId = 1024 ;
// new databrowserbased version
+// because of the limited insert
+// functionality of DataBrowser,
+// we just introduce id s corresponding
+// to the line number
-// 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);
-
- return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
- style, validator, name);
-}
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;
#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 < list->GetCount() )
+ {
+ bool trigger = false ;
+ wxCommandEvent event(
+ wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+ switch( message )
{
- bool trigger = false ;
- wxCommandEvent event(
- wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
- switch( message )
- {
- 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 ;
- }
- 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 );
- list->GetEventHandler()->ProcessEvent(event) ;
- }
- break ;
+ 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,
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+ DataBrowserItemID itemID, DataBrowserPropertyID property,
DataBrowserItemDataRef itemData, Boolean changeValue)
{
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 ;
- }
+ int i = itemID - 1 ;
+ if (i >= 0 && i < list->GetCount() )
+ {
+ wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
+ verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+ err = noErr ;
+ }
}
- }
+ }
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;
+ long systemVersion;
+
+ cfString = CFStringCreateWithFormat( NULL, NULL, CFSTR("Row %d"), item );
+
+ ThemeDrawingState themeState ;
+ GetThemeDrawingState( &themeState ) ;
+
+ if ( itemState == kDataBrowserItemIsSelected ) // In this sample we handle the "selected" state, all others fall through to our "active" state
+ {
+ Gestalt( gestaltSystemVersion, &systemVersion );
+ if ( (systemVersion >= 0x00001030) && (IsControlActive( browser ) == false) ) // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
+ SetThemePen( kThemeBrushSecondaryHighlightColor, 32, true );
+ else
+ SetThemePen( kThemeBrushPrimaryHighlightColor, 32, true );
+
+ PaintRect( itemRect ); // First paint the hilite rect, then the text on top
+ SetThemeDrawingState( themeState , false ) ;
+ }
+ DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+ if ( cfString != NULL )
+ CFRelease( cfString );
+ SetThemeDrawingState( themeState , true ) ;
+}
+
+// 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)
+{
+ 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,
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 ) ;
- ControlRef browser ;
- verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , (ControlRef *)&m_macControl ) );
- browser = (ControlRef) m_macControl ;
+ 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 += kDataBrowserSelectOnlyOne ;
}
- verify_noerr(SetDataBrowserSelectionFlags (browser, options ) );
+ verify_noerr(m_peer->SetSelectionFlags( options ) );
+
+ if ( gDataBrowserItemDataUPP == NULL ) gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
+ if ( gDataBrowserItemNotificationUPP == NULL )
+ {
+ gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+ (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+ NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+ }
+ 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 =
+
+ 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.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
columnDesc.propertyDesc.propertyFlags =
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- kDataBrowserListViewTypeSelectColumn |
+ kDataBrowserListViewTypeSelectColumn |
#endif
kDataBrowserTableViewSelectionColumn ;
-
- verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ;
- verify_noerr(::AutoSizeDataBrowserListViewColumns( browser ) ) ;
- verify_noerr(::SetDataBrowserHasScrollBars( browser , false , true ) ) ;
- verify_noerr(::SetDataBrowserTableViewHiliteStyle( browser, kDataBrowserTableViewFillHilite ) ) ;
- verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( browser , 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
- SetDataBrowserCallbacks(browser, &callbacks);
MacPostControlCreate(pos,size) ;
}
SetBestSize(size); // Needed because it is a wxControlWithItems
-
+
return TRUE;
}
wxListBox::~wxListBox()
{
- SetControlReference( (ControlRef) m_macControl , NULL ) ;
+ m_peer->SetReference( 0 ) ;
FreeData() ;
// avoid access during destruction
if ( m_macList )
int wxListBox::DoAppend(const wxString& item)
{
+ InvalidateBestSize();
+
int index = m_noItems ;
m_stringArray.Add( item ) ;
m_dataArray.Add( NULL );
{
Clear() ;
int n = choices.GetCount();
-
+
for( int i = 0 ; i < n ; ++i )
{
if ( clientData )
else
Append( choices[i] ) ;
}
-
+
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
// first delete old items
m_aItems[ui] = NULL;
}
m_aItems.Empty();
-
+
// then create new ones
for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
wxOwnerDrawn *pNewItem = CreateItem(ui);
int wxListBox::FindString(const wxString& s) const
{
-
+
if ( s.Right(1) == wxT("*") )
{
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 )
{
wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
return i ;
}
}
-
+
}
else
{
Str255 s1 , s2 ;
-
+
wxMacStringToPascal( s , s2 ) ;
-
+
for ( int i = 0 ; i < m_noItems ; ++ i )
{
wxMacStringToPascal( m_stringArray[i] , s1 ) ;
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 || (N >= 0 && N < m_noItems) ,
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
{
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
wxT("invalid index in wxListBox::Selected") );
-
+
return MacIsSelected( N ) ;
}
{
wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
wxT("invalid index in wxListBox::GetClientData"));
-
+
return (void *)m_dataArray[N];
}
{
wxCHECK_RET( N >= 0 && N < m_noItems,
wxT("invalid index in wxListBox::SetClientData") );
-
+
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
{
}
#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 ;
// Find string for position
wxString wxListBox::GetString(int N) const
{
- return m_stringArray[N] ;
+ wxCHECK_MSG( N >= 0 && N < m_noItems, wxEmptyString,
+ wxT("invalid index in wxListBox::GetString") );
+
+ return m_stringArray[N] ;
}
void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
{
wxCHECK_RET( pos >= 0 && pos <= m_noItems,
wxT("invalid index in wxListBox::InsertItems") );
-
+
+ InvalidateBestSize();
+
int nItems = items.GetCount();
-
+
for ( 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)
int wLine;
{
- wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
-
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+
if ( m_font.Ok() )
{
::TextFont( m_font.MacGetFontNum() ) ;
::TextSize( 9 );
::TextFace( 0 ) ;
}
-
+
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
#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);
void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
wxControl::Refresh( eraseBack , rect ) ;
- // MacRedrawControl() ;
}
#if wxUSE_OWNER_DRAWN
#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);
+ return attr;
+}
+
// ============================================================================
// list box control implementation
// ============================================================================
-void wxListBox::MacDelete( int N )
+void wxListBox::MacDelete( int n )
{
- UInt32 id = m_idArray[N] ;
- verify_noerr(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
- m_idArray.RemoveAt( N ) ;
+ wxArrayInt selectionBefore ;
+ MacGetSelections( selectionBefore ) ;
+
+ UInt32 id = m_noItems+1 ;
+ verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+ for ( size_t 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)
{
- verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
- m_idArray.Insert( m_nextId , n ) ;
- ++m_nextId ;
+ wxArrayInt selectionBefore ;
+ MacGetSelections( selectionBefore ) ;
+
+ UInt32 id = m_noItems ; // this has already been increased
+ 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)
{
- verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , 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(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
- m_idArray.Empty() ;
+ verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+}
+
+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] ;
- SetDataBrowserSelectedItems((ControlRef) m_macControl , 1 , & idOld , kDataBrowserItemsRemove ) ;
- }
- }
- if ( ::IsDataBrowserItemSelected( (ControlRef) m_macControl , id ) != select )
+ bool former = MacSuppressSelection( true ) ;
+ UInt32 id = n + 1 ;
+
+ if ( m_peer->IsItemSelected( id ) != select )
{
- verify_noerr(::SetDataBrowserSelectedItems((ControlRef) m_macControl , 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 ::IsDataBrowserItemSelected( (ControlRef) m_macControl , m_idArray[n] ) ;
+ return m_peer->IsItemSelected( n + 1 ) ;
}
int wxListBox::MacGetSelection() const
{
- for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+ for ( int i = 0 ; i < GetCount() ; ++i )
{
- if ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , 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 ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , 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] ;
- verify_noerr( ::UpdateDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+ 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( ::RevealDataBrowserItem((ControlRef) m_macControl , id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
-}
-
-#if !TARGET_API_MAC_OSX
-void wxListBox::OnSize( wxSizeEvent &event)
-{
-}
-#endif
-
-void wxListBox::MacSetRedraw( bool doDraw )
-{
- // nothing to do in compositing mode
-}
-
-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 ( 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 );
-
- 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) ;
-*/
+ UInt32 id = n + 1 ;
+ verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
}
#if !TARGET_API_MAC_OSX
// 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 )
parent = parent->GetParent() ;
-
+
if ( parent && parent->GetDefaultItem() )
{
wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
{
// perform the default key handling first
wxControl::OnKeyDown( event ) ;
-
+
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
-
+
wxArrayInt aSelections;
int n, count = GetSelections(aSelections);
if ( count > 0 )
{
n = -1;
}
-
- event.m_commandInt = n;
-
+
+ event.SetInt(n);
+
GetEventHandler()->ProcessEvent(event);
}
else
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.SetInt(line);
+
GetEventHandler()->ProcessEvent(event);
}
}
}
}
+#endif // !TARGET_API_MAC_OSX
+
#endif
projects / wxWidgets.git / blobdiff