///////////////////////////////////////////////////////////////////////////////
// Name: listbox.cpp
// Purpose: wxListBox
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
+// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#pragma implementation "listbox.h"
#endif
+#include "wx/app.h"
#include "wx/listbox.h"
+#include "wx/button.h"
#include "wx/settings.h"
+#include "wx/toplevel.h"
#include "wx/dynarray.h"
#include "wx/log.h"
#include "wx/utils.h"
-#include "extldef.h"
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
BEGIN_EVENT_TABLE(wxListBox, wxControl)
- EVT_SIZE( wxListBox::OnSize )
+#if !TARGET_API_MAC_OSX
+ EVT_SIZE( wxListBox::OnSize )
+ EVT_CHAR( wxListBox::OnChar )
+#endif
END_EVENT_TABLE()
+#endif
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-const short kwxMacListWithVerticalScrollbar = 128 ;
-
-// ============================================================================
-// list box control implementation
-// ============================================================================
+// 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,
- int n, const wxString choices[],
+ const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString& name)
{
- m_noItems = 0 ; // this will be increased by our append command
- m_selected = 0;
+ wxCArrayString chs(choices);
- 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 ) ;
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0,
- kControlListBoxProc , (long) this ) ;
+#if TARGET_API_MAC_OSX
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+ DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
+#else
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+ DataBrowserItemNotification message)
+#endif
+{
+ 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 )
+ {
+ 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 ;
+ }
+ }
+}
+
+
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+ DataBrowserItemID itemID, DataBrowserPropertyID property,
+ DataBrowserItemDataRef itemData, Boolean changeValue)
+{
+ OSStatus err = errDataBrowserPropertyNotSupported;
- long result ;
- UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList , &result ) ;
-
- NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
- (**m_macList).selFlags = 0 ;
- if ( style & wxLB_MULTIPLE )
- {
- (**m_macList).selFlags += lNoExtend ;
- }
- else if ( style & wxLB_EXTENDED )
- {
- (**m_macList).selFlags += lExtendDrag ;
+ if ( ! changeValue )
+ {
+ switch (property)
+ {
+
+ case 1024:
+ {
+ 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;
+ }
}
- else
- {
- (**m_macList).selFlags = lOnlyOne ;
- }
- Point pt = (**m_macList).cellSize ;
- pt.v = 14 ;
- LCellSize( pt , m_macList ) ;
+
+ 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 ;
- LAddColumn( 1 , 0 , m_macList ) ;
+ 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;
- MacPostControlCreate() ;
+ m_noItems = 0 ; // this will be increased by our append command
+ m_selected = 0;
+ m_nextId = 1 ;
+
- ControlFontStyleRec controlstyle ;
- controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
- //controlstyle.font = kControlFontSmallSystemFont ;
- controlstyle.font = kFontIDMonaco ;
- controlstyle.size = 9 ;
- ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ ControlRef browser ;
- for ( int i = 0 ; i < n ; i++ )
- {
- Append( choices[i] ) ;
- }
+ verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , (ControlRef *)&m_macControl ) );
+ browser = (ControlRef) m_macControl ;
+
+ DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
+ if ( style & wxLB_MULTIPLE )
+ {
+ options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
+ }
+ else if ( style & wxLB_EXTENDED )
+ {
+ // default behaviour
+ }
+ else
+ {
+ options += kDataBrowserSelectOnlyOne ;
+ }
+ verify_noerr(SetDataBrowserSelectionFlags (browser, options ) );
+
+ 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 = 1024;
+ columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+ columnDesc.propertyDesc.propertyFlags =
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ 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) ;
+#endif
+ SetDataBrowserCallbacks(browser, &callbacks);
+
+ MacPostControlCreate(pos,size) ;
- LSetDrawingMode( true , m_macList ) ;
+ for ( int i = 0 ; i < n ; i++ )
+ {
+ Append( choices[i] ) ;
+ }
- return TRUE;
+ return TRUE;
}
wxListBox::~wxListBox()
{
- Free() ;
- DisposeExtLDEFInfo( m_macList ) ;
+ SetControlReference( (ControlRef) m_macControl , NULL ) ;
+ FreeData() ;
+ // avoid access during destruction
+ if ( m_macList )
+ {
+ m_macList = NULL ;
+ }
}
-void wxListBox::Free()
+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();
}
}
+void wxListBox::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags )
+{
+ wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+}
+
void wxListBox::DoSetFirstItem(int N)
{
- MacScrollTo( N ) ;
+ MacScrollTo( N ) ;
}
void wxListBox::Delete(int N)
#if wxUSE_OWNER_DRAWN
delete m_aItems[N];
- m_aItems.Remove(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_dataArray.Remove( N ) ;
- m_noItems --;
-
- MacDelete( N ) ;
+ m_stringArray.RemoveAt( 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 ) ) ;
- }
- else
- m_stringArray.Add( item ) ;
- m_noItems ++;
- MacAppend( item ) ;
+ int index = m_noItems ;
+ 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)
-{
- MacSetRedraw( false ) ;
- Clear() ;
- int n = choices.GetCount();
-
- for( int i = 0 ; i < n ; ++i )
- {
- if ( clientData )
- {
+{
+ Clear() ;
+ int n = choices.GetCount();
+
+ for( int 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"));
+ wxT("Can't use client data with owner-drawn listboxes"));
#else // !wxUSE_OWNER_DRAWN
- Append( choices[i] , clientData[i] ) ;
- #endif
- }
- else
- Append( choices[i] ) ;
- }
-
+ 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);
}
}
#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
+int wxListBox::FindString(const wxString& s) 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() ;
- for ( int i = 0 ; i < m_noItems ; ++ i )
+
+ if ( s.Right(1) == wxT("*") )
{
- if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) )
- return i ;
+ 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 ) ;
+
+ if ( EqualString( s1 , s2 , false , false ) )
+ return i ;
+ }
+ if ( s.Left(1) == wxT("*") && s.Length() > 1 )
+ {
+ wxString st = s ;
+ st.MakeLower() ;
+ for ( int i = 0 ; i < m_noItems ; ++i )
+ {
+ if ( GetString(i).Lower().Matches(st) )
+ return i ;
+ }
+ }
+
}
- }
- else
- {
- for ( int i = 0 ; i < m_noItems ; ++ i )
+ else
{
- if ( equalstring( m_stringArray[i] , s , false , false ) )
- return i ;
+ Str255 s1 , s2 ;
+
+ wxMacStringToPascal( s , s2 ) ;
+
+ for ( int i = 0 ; i < m_noItems ; ++ i )
+ {
+ wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+
+ if ( EqualString( s1 , s2 , false , false ) )
+ return i ;
+ }
}
- }
- return -1;
+ return -1;
}
void wxListBox::Clear()
{
- Free();
- m_noItems = 0;
- m_stringArray.Empty() ;
- m_dataArray.Empty() ;
- MacClear() ;
+ FreeData();
+ m_noItems = 0;
+ m_stringArray.Empty() ;
+ m_dataArray.Empty() ;
+ MacClear() ;
}
void wxListBox::SetSelection(int N, bool select)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
- "invalid index in wxListBox::SetSelection" );
- MacSetSelection( N , select ) ;
+ wxT("invalid index in wxListBox::SetSelection") );
+ MacSetSelection( N , select ) ;
+ GetSelections( m_selectionPreImage ) ;
}
bool wxListBox::IsSelected(int N) const
{
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
- "invalid index in wxListBox::Selected" );
-
- return MacIsSelected( N ) ;
+ wxT("invalid index in wxListBox::Selected") );
+
+ return MacIsSelected( N ) ;
}
void *wxListBox::DoGetItemClientData(int N) const
{
wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
- "invalid index in wxListBox::GetClientData" );
-
+ wxT("invalid index in wxListBox::GetClientData"));
+
return (void *)m_dataArray[N];
}
wxClientData *wxListBox::DoGetItemClientObject(int N) const
{
- return (wxClientData *) DoGetItemClientData( N ) ;
+ return (wxClientData *) DoGetItemClientData( N ) ;
}
void wxListBox::DoSetItemClientData(int N, void *Client_data)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
- "invalid index in wxListBox::SetClientData" );
-
+ wxT("invalid index in wxListBox::SetClientData") );
+
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
{
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() >= (size_t) N , wxT("invalid client_data array") ) ;
+
+ if ( m_dataArray.GetCount() > (size_t) N )
+ {
+ m_dataArray[N] = (char*) Client_data ;
+ }
else
{
- m_dataArray.Add( (char*) Client_data ) ;
+ m_dataArray.Add( (char*) Client_data ) ;
}
}
// 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] ;
+ 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") );
-
+ wxT("invalid index in wxListBox::InsertItems") );
+
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)
{
- m_stringArray[N] = s ;
- MacSet( N , s ) ;
+ m_stringArray[N] = s ;
+ MacSet( N , s ) ;
}
wxSize wxListBox::DoGetBestSize() const
{
- return wxSize(100, 100);
+ int lbWidth = 100; // some defaults
+ int lbHeight = 110;
+ int wLine;
+
+ {
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+
+ if ( m_font.Ok() )
+ {
+ ::TextFont( m_font.MacGetFontNum() ) ;
+ ::TextSize( m_font.MacGetFontSize() ) ;
+ ::TextFace( m_font.MacGetFontStyle() ) ;
+ }
+ else
+ {
+ ::TextFont( kFontIDMonaco ) ;
+ ::TextSize( 9 );
+ ::TextFace( 0 ) ;
+ }
+
+ // Find the widest line
+ for(int i = 0; i < GetCount(); i++) {
+ wxString str(GetString(i));
+ #if wxUSE_UNICODE
+ Point bounds={0,0} ;
+ SInt16 baseline ;
+ ::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);
+ }
+
+ // 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);
+ }
+
+ return wxSize(lbWidth, lbHeight);
}
int wxListBox::GetCount() const
return m_noItems;
}
-void wxListBox::SetupColours()
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetForegroundColour());
+ wxControl::Refresh( eraseBack , rect ) ;
+ // MacRedrawControl() ;
}
#if wxUSE_OWNER_DRAWN
// list box control implementation
// ============================================================================
-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());
-
-}
-
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 ) ;
+ UInt32 id = m_idArray[N] ;
+ verify_noerr(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+ m_idArray.RemoveAt( N ) ;
}
-void wxListBox::MacInsert( int n , const char * text)
+void wxListBox::MacInsert( int n , const wxString& text)
{
- Cell cell ;
-
- cell.h = 0 ;
- cell.v = n ;
-
- LAddRow( 1 , cell.v , m_macList ) ;
+ verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+ m_idArray.Insert( m_nextId , n ) ;
+ ++m_nextId ;
}
-void wxListBox::MacAppend( const char * text)
+void wxListBox::MacAppend( const wxString& text)
{
- Cell cell = { 0 , 0 } ;
- cell.v = (**m_macList).dataBounds.bottom ;
- LAddRow( 1 , cell.v , m_macList ) ;
+ verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+ m_idArray.Add( m_nextId ) ;
+ ++m_nextId ;
}
-void wxListBox::MacClear()
+void wxListBox::MacClear()
{
- LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+ verify_noerr(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+ m_idArray.Empty() ;
}
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 ) ;
+ 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 )
+ {
+ verify_noerr(::SetDataBrowserSelectedItems((ControlRef) m_macControl , 1 , & id , kDataBrowserItemsToggle ) ) ;
+ }
+ MacScrollTo( n ) ;
}
bool wxListBox::MacIsSelected( int n ) const
{
- Cell cell = { 0 , 0 } ;
- cell.v = n ;
- return LGetSelect( false , &cell , m_macList ) ;
-}
-
-void wxListBox::MacDestroy()
-{
-// DisposeExtLDEFInfo( m_macList ) ;
+ return ::IsDataBrowserItemSelected( (ControlRef) m_macControl , m_idArray[n] ) ;
}
int wxListBox::MacGetSelection() const
{
- Cell cell = { 0 , 0 } ;
- if ( LGetSelect( true , &cell , m_macList ) )
- return cell.v ;
- else
- return -1 ;
+ for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+ {
+ if ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , m_idArray[i] ) )
+ {
+ return i ;
+ }
+ }
+ 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 ;
+ for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+ {
+ if ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , m_idArray[i] ) )
+ {
+ aSelections.Add( i ) ;
+ no_sel++ ;
+ }
+ }
+ return no_sel ;
}
-void wxListBox::MacSet( int n , const char * text )
+void wxListBox::MacSet( int n , const wxString& text )
{
- // our implementation does not store anything in the list
- // so we just have to redraw
- Cell cell = { 0 , 0 } ;
- cell.v = n ;
- LDraw( cell , m_macList ) ;
+ // 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 ) ) ;
}
void wxListBox::MacScrollTo( int n )
{
- // TODO implement scrolling
-}
-
-void wxListBox::OnSize( const wxSizeEvent &event)
-{
- Point pt = (**m_macList).cellSize ;
- pt.h = m_width - 15 /* scrollbar */ - m_macHorizontalBorder * 2 ;
- LCellSize( pt , m_macList ) ;
+ // TODO implement scrolling
}
-void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxListBox::OnSize( wxSizeEvent &event)
{
- Boolean wasDoubleClick = false ;
- long result ;
-
- UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ;
- if ( !wasDoubleClick )
- {
- MacDoClick() ;
- }
- else
- {
- MacDoDoubleClick() ;
- }
}
-void wxListBox::MacSetRedraw( bool doDraw )
+void wxListBox::MacSetRedraw( bool doDraw )
{
- LSetDrawingMode( doDraw , m_macList ) ;
-
+ // nothing to do in compositing mode
}
void wxListBox::MacDoClick()
-{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+{/*
+ 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 );
-
- 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
- {
- n = -1;
- }
-
+
+ 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) ;
+ GetEventHandler()->ProcessEvent(event) ;
+*/
}
+
+void wxListBox::OnChar(wxKeyEvent& event)
+{
+ // 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(),
+ wxButton);
+ if ( def && def->IsEnabled() )
+ {
+ 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.
+ 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 );
+ }
+ }
+ else if ( event.GetKeyCode() == WXK_TAB )
+ {
+ wxNavigationKeyEvent new_event;
+ new_event.SetEventObject( this );
+ new_event.SetDirection( !event.ShiftDown() );
+ /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+ new_event.SetWindowChange( event.ControlDown() );
+ new_event.SetCurrentFocus( this );
+ if ( !GetEventHandler()->ProcessEvent( new_event ) )
+ event.Skip() ;
+ }
+ else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP )
+ {
+ // 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 = 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);
+ }
+ 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("*")) ;
+ if ( line >= 0 )
+ {
+ if ( GetSelection() != line )
+ {
+ 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 ;
+
+ GetEventHandler()->ProcessEvent(event);
+ }
+ }
+ }
+}
+
projects / wxWidgets.git / blobdiff