///////////////////////////////////////////////////////////////////////////////
-// 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/button.h"
-#include "wx/settings.h"
-#include "wx/toplevel.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/intl.h"
+ #include "wx/utils.h"
+ #include "wx/settings.h"
+ #include "wx/arrstr.h"
+ #include "wx/dcclient.h"
+#endif
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxControl)
- EVT_SIZE( wxListBox::OnSize )
- EVT_CHAR( wxListBox::OnChar )
END_EVENT_TABLE()
-#endif
#include "wx/mac/uma.h"
-#if PRAGMA_STRUCT_ALIGN
- #pragma options align=mac68k
-#elif PRAGMA_STRUCT_PACKPUSH
- #pragma pack(push, 2)
-#elif PRAGMA_STRUCT_PACK
- #pragma pack(2)
-#endif
-
-typedef struct {
- unsigned short instruction;
- void (*function)();
-} ldefRec, *ldefPtr, **ldefHandle;
-
-#if PRAGMA_STRUCT_ALIGN
- #pragma options align=reset
-#elif PRAGMA_STRUCT_PACKPUSH
- #pragma pack(pop)
-#elif PRAGMA_STRUCT_PACK
- #pragma pack()
-#endif
-
-#if TARGET_CARBON
-const short kwxMacListItemHeight = 19 ;
-#else
-const short kwxMacListItemHeight = 14 ;
-#endif
-
-extern "C"
-{
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
- Cell cell, short dataOffset, short dataLength,
- ListHandle listHandle ) ;
-}
-
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
- Cell cell, short dataOffset, short dataLength,
- ListHandle listHandle )
-{
- GrafPtr savePort;
- GrafPtr grafPtr;
- RgnHandle savedClipRegion;
- SInt32 savedPenMode;
- wxListBox* list;
- GetPort(&savePort);
- SetPort((**listHandle).port);
- grafPtr = (**listHandle).port ;
- // typecast our refCon
- list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
-
- // Calculate the cell rect.
-
- switch( message ) {
- case lInitMsg:
- break;
-
- case lCloseMsg:
- break;
-
- case lDrawMsg:
- {
- const wxString linetext = list->m_stringArray[cell.v] ;
-
- // Save the current clip region, and set the clip region to the area we are about
- // to draw.
-
- savedClipRegion = NewRgn();
- GetClip( savedClipRegion );
-
- ClipRect( drawRect );
- EraseRect( drawRect );
-
- wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
-
- if ( font )
- {
- ::TextFont( font->m_macFontNum ) ;
- ::TextSize( short(font->m_macFontSize) ) ;
- ::TextFace( font->m_macFontStyle ) ;
- }
- else
- {
- ::TextFont( kFontIDMonaco ) ;
- ::TextSize( 9 );
- ::TextFace( 0 ) ;
- }
-
-#if TARGET_CARBON
- {
- Rect frame = { drawRect->top, drawRect->left + 4,
- drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
- CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , wxMacCFStringHolder(linetext) ) ;
- ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
- ::DrawThemeTextBox( mString,
- kThemeCurrentPortFont,
- kThemeStateActive,
- false,
- &frame,
- teJustLeft,
- nil );
- CFRelease( mString ) ;
- }
-#else
- {
- wxCharBuffer text = wxMacStringToCString( linetext ) ;
- MoveTo(drawRect->left + 4 , drawRect->top + 10 );
- DrawText(text, 0 , strlen(text) );
- }
-#endif
- // If the cell is hilited, do the hilite now. Paint the cell contents with the
- // appropriate QuickDraw transform mode.
-
- if( isSelected ) {
- savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
- SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
- PaintRect( drawRect );
- SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
- }
-
- // Restore the saved clip region.
-
- SetClip( savedClipRegion );
- DisposeRgn( savedClipRegion );
- }
- break;
- case lHiliteMsg:
-
- // Hilite or unhilite the cell. Paint the cell contents with the
- // appropriate QuickDraw transform mode.
-
- GetPort( &grafPtr );
- savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
- SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
- PaintRect( drawRect );
- SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
- break;
- default :
- break ;
- }
- SetPort(savePort);
-}
-
-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-// resources ldef ids
-const short kwxMacListWithVerticalScrollbar = 128 ;
-const short kwxMacListWithVerticalAndHorizontalScrollbar = 129 ;
-
// ============================================================================
// list box control implementation
// ============================================================================
-// Listbox item
wxListBox::wxListBox()
{
- m_noItems = 0;
- m_selected = 0;
- m_macList = NULL ;
}
-static ListDefUPP macListDefUPP = NULL ;
-
-bool wxListBox::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- int n, const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxListBox::Create(
+ wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ 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;
-
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
-
- ListDefSpec listDef;
- listDef.defType = kListDefUserProcType;
- if ( macListDefUPP == NULL )
- {
- macListDefUPP = NewListDefUPP( wxMacListDefinition );
- }
- listDef.u.userProc = macListDefUPP ;
-
- Str255 fontName ;
- SInt16 fontSize ;
- Style fontStyle ;
-#if TARGET_CARBON
- GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
-#else
- GetFontName( kFontIDMonaco , fontName ) ;
- fontSize = 9 ;
- fontStyle = normal ;
-#endif
- SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ) ) ;
-#if TARGET_CARBON
- Size asize;
-
+ wxCArrayString chs(choices);
- CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true,
- kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
+ return Create(
+ parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name );
+}
- GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
- sizeof(ListHandle), (Ptr) &m_macList, &asize);
+wxMacListControl* wxListBox::GetPeer() const
+{
+ wxMacDataBrowserListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListControl);
+ return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;
+}
- SetControlReference( (ControlHandle) m_macControl, (long) this);
- SetControlVisibility( (ControlHandle) m_macControl, false, false);
+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;
-#else
+ wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+ wxT("only a single listbox selection mode can be specified") );
- long result ;
- wxStAppResource resload ;
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
- (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar ,
- 0 , 0, kControlListBoxProc , (long) this ) ;
- ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
- sizeof( ListHandle ) , (char*) &m_macList , &result ) ;
-
- HLock( (Handle) m_macList ) ;
- ldefHandle ldef ;
- ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
- if ( (**(ListHandle)m_macList).listDefProc != NULL )
- {
- (**ldef).instruction = 0x4EF9; /* JMP instruction */
- (**ldef).function = (void(*)()) listDef.u.userProc;
- (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
- }
+ if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
+ return false;
- Point pt = (**(ListHandle)m_macList).cellSize ;
- pt.v = kwxMacListItemHeight ;
- LCellSize( pt , (ListHandle)m_macList ) ;
- LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
-#endif
- OptionBits options = 0;
- if ( style & wxLB_MULTIPLE )
- {
- options += lNoExtend ;
- }
- else if ( style & wxLB_EXTENDED )
- {
- options += lExtendDrag ;
- }
- else
- {
- options = (OptionBits) lOnlyOne ;
- }
- SetListSelectionFlags((ListHandle)m_macList, options);
+ wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( this, pos, size, style );
+ // TODO CHECK control->SetClientDataType( m_clientDataItemsType );
+ m_peer = control;
- for ( int i = 0 ; i < n ; i++ )
- {
- Append( choices[i] ) ;
- }
+ MacPostControlCreate( pos, size );
- MacPostControlCreate() ;
+ Append(n, choices);
- LSetDrawingMode( true , (ListHandle)m_macList ) ;
+ // Needed because it is a wxControlWithItems
+ SetInitialSize( size );
- return TRUE;
+ return true;
}
wxListBox::~wxListBox()
{
- FreeData() ;
- if ( m_macList )
- {
-#if !TARGET_CARBON
- DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
- (**(ListHandle)m_macList).listDefProc = NULL ;
-#endif
- m_macList = NULL ;
- }
+ FreeData();
+ m_peer->SetReference( 0 );
}
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++ )
- {
- delete GetClientObject(n);
- }
- }
+ GetPeer()->MacClear();
}
-void wxListBox::DoSetSize(int x, int y,
- int width, int height,
- int sizeFlags )
+void wxListBox::DoSetFirstItem(int n)
{
- wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
-#if TARGET_CARBON
- Rect bounds ;
- GetControlBounds( (ControlHandle) m_macControl , &bounds ) ;
- ControlRef control = GetListVerticalScrollBar( (ListHandle)m_macList ) ;
- if ( control )
- {
- Rect scrollbounds ;
- GetControlBounds( control , &scrollbounds ) ;
- if( scrollbounds.right != bounds.right + 1 )
- {
- UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 ,
- scrollbounds.top ) ;
- }
- }
-#endif
-}
-void wxListBox::DoSetFirstItem(int N)
-{
- MacScrollTo( N ) ;
+ GetPeer()->MacScrollTo( n );
}
-void wxListBox::Delete(int N)
+void wxListBox::EnsureVisible(int n)
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- wxT("invalid index in wxListBox::Delete") );
-
-#if wxUSE_OWNER_DRAWN
- delete m_aItems[N];
- m_aItems.RemoveAt(N);
-#else // !wxUSE_OWNER_DRAWN
- if ( HasClientObjectData() )
- {
- delete GetClientObject(N);
- }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
- m_stringArray.RemoveAt( N ) ;
- m_dataArray.RemoveAt( N ) ;
- m_noItems --;
-
- MacDelete( N ) ;
+ GetPeer()->MacScrollTo( n );
}
-int wxListBox::DoAppend(const wxString& item)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
- int index = m_noItems ;
- m_stringArray.Add( item ) ;
- m_dataArray.Add( NULL );
- m_noItems ++;
- DoSetItemClientData( index , NULL ) ;
- MacAppend( item ) ;
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") );
- return index ;
+ GetPeer()->MacDelete( n );
}
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
- MacSetRedraw( false ) ;
- Clear() ;
- int n = choices.GetCount();
-
- for( int i = 0 ; i < n ; ++i )
+ InvalidateBestSize();
+
+ GetPeer()->MacInsert( pos, items );
+ const unsigned int count = items.GetCount();
+ if ( clientData )
{
- if ( clientData )
- {
-#if wxUSE_OWNER_DRAWN
- wxASSERT_MSG(clientData[i] == NULL,
- wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN
- Append( choices[i] , clientData[i] ) ;
-#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);
- }
+ for (unsigned int i = 0; i < count; ++i)
+ AssignNewItemClientData( pos + i, clientData, i, type );
}
-#endif // wxUSE_OWNER_DRAWN
- MacSetRedraw( true ) ;
-}
-bool wxListBox::HasMultipleSelection() const
-{
- return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
+ return pos + count - 1;
}
-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
-
- if ( s.Right(1) == wxT("*") )
+ for ( size_t i = 0; i < GetCount(); ++ 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 ;
- }
- }
-
+ if (s.IsSameAs( GetString( i ), bCase) )
+ return (int)i;
}
- else
- {
- 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 wxNOT_FOUND;
}
-void wxListBox::Clear()
+void wxListBox::DoClear()
{
FreeData();
- m_noItems = 0;
- m_stringArray.Empty() ;
- m_dataArray.Empty() ;
- 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 ) ;
-}
-bool wxListBox::IsSelected(int N) const
-{
- wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
- wxT("invalid index in wxListBox::Selected") );
-
- return MacIsSelected( N ) ;
+ if ( n == wxNOT_FOUND )
+ GetPeer()->MacDeselectAll();
+ else
+ GetPeer()->MacSetSelection( n, select, HasMultipleSelection() );
}
-void *wxListBox::DoGetItemClientData(int N) const
+bool wxListBox::IsSelected(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), false, wxT("invalid index in wxListBox::Selected") );
-wxClientData *wxListBox::DoGetItemClientObject(int N) const
-{
- return (wxClientData *) DoGetItemClientData( N ) ;
+ return GetPeer()->MacIsSelected( n );
}
-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void *wxListBox::DoGetItemClientData(unsigned int n) const
{
- 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 ;
- }
- else
- {
- m_dataArray.Add( (char*) Client_data ) ;
- }
+ wxCHECK_MSG( IsValid(n), NULL, wxT("invalid index in wxListBox::GetClientData"));
+ return GetPeer()->MacGetClientData( n );
}
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
{
- DoSetItemClientData(n, clientData);
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") );
+ GetPeer()->MacSetClientData( n , clientData);
}
// Return number of selections and an array of selected integers
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
- return MacGetSelections( aSelections ) ;
+ return GetPeer()->MacGetSelections( aSelections );
}
// Get single selection, for single choice list items
int wxListBox::GetSelection() const
{
- return MacGetSelection() ;
+ return GetPeer()->MacGetSelection();
}
// Find string for position
-wxString wxListBox::GetString(int N) const
-{
- return m_stringArray[N] ;
-}
-
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+wxString wxListBox::GetString(unsigned int n) const
{
- wxCHECK_RET( pos >= 0 && pos <= m_noItems,
- wxT("invalid index in wxListBox::InsertItems") );
-
- int nItems = items.GetCount();
-
- for ( int i = 0 ; i < nItems ; i++ )
- {
- m_stringArray.Insert( items[i] , pos + i ) ;
- m_dataArray.Insert( NULL , pos + i ) ;
- MacInsert( pos + i , items[i] ) ;
- }
-
- m_noItems += nItems;
+ wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxListBox::GetString") );
+ return GetPeer()->MacGetString(n);
}
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
{
- m_stringArray[N] = s ;
- MacSet( N , s ) ;
+ GetPeer()->MacSetString( n, s );
}
wxSize wxListBox::DoGetBestSize() const
int lbWidth = 100; // some defaults
int lbHeight = 110;
int wLine;
-
+
{
- wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
-
- wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-
- if ( font )
+#if wxMAC_USE_CORE_GRAPHICS
+ wxClientDC dc(const_cast<wxListBox*>(this));
+ dc.SetFont(GetFont());
+#else
+ wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
+
+ // TODO: clean this up
+ if ( m_font.Ok() )
{
- ::TextFont( font->m_macFontNum ) ;
- ::TextSize( short(font->m_macFontSize) ) ;
- ::TextFace( font->m_macFontStyle ) ;
+ ::TextFont( m_font.MacGetFontNum() );
+ ::TextSize( m_font.MacGetFontSize() );
+ ::TextFace( m_font.MacGetFontStyle() );
}
else
{
- ::TextFont( kFontIDMonaco ) ;
- ::TextSize( 9 );
- ::TextFace( 0 ) ;
+ ::TextFont( kFontIDMonaco );
+ ::TextSize( 9 );
+ ::TextFace( 0 );
}
-
+#endif
// 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 ) ,
+ for (unsigned int i = 0; i < GetCount(); i++)
+ {
+ wxString str( GetString( i ) );
+#if wxMAC_USE_CORE_GRAPHICS
+ wxCoord width, height ;
+ dc.GetTextExtent( str , &width, &height);
+ wLine = width ;
+#else
+#if wxUSE_UNICODE
+ Point bounds = {0, 0};
+ SInt16 baseline;
+
+ // NB: what if m_font.Ok() == false ???
+ ::GetThemeTextDimensions(
+ wxMacCFStringHolder( str, m_font.GetEncoding() ),
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
- wLine = bounds.h ;
- #else
- wxCharBuffer text = wxMacStringToCString( str ) ;
- wLine = ::TextWidth( text , 0 , strlen(text) ) ;
- #endif
- lbWidth = wxMax(lbWidth, wLine);
+ wLine = bounds.h;
+#else
+ wLine = ::TextWidth( str.c_str(), 0, str.length() );
+#endif
+#endif
+ lbWidth = wxMax( lbWidth, wLine );
}
-
+
// Add room for the scrollbar
- lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-
+ 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);
+ int cy = 12;
+#if wxMAC_USE_CORE_GRAPHICS
+ wxCoord width, height ;
+ dc.GetTextExtent( wxT("XX") , &width, &height);
+ int cx = width ;
+#else
+ int cx = ::TextWidth( "XX", 0, 1 );
+#endif
+ lbWidth += cx;
+
+ // 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);
-}
-int wxListBox::GetCount() const
-{
- return m_noItems;
+ return wxSize( lbWidth, lbHeight );
}
-void wxListBox::SetupColours()
+unsigned int wxListBox::GetCount() const
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetForegroundColour());
+ return GetPeer()->MacGetCount();
}
void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
- wxControl::Refresh( eraseBack , rect ) ;
- // MacRedrawControl() ;
+ wxControl::Refresh( eraseBack, rect );
}
-#if wxUSE_OWNER_DRAWN
-
-class wxListBoxItem : public wxOwnerDrawn
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
-public:
- wxListBoxItem(const wxString& str = "");
-};
+ wxVisualAttributes attr;
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
-{
- // no bitmaps/checkmarks
- SetMarginWidth(0);
+ attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+ attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
+ attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
+
+ return attr;
}
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
{
- return new wxListBoxItem();
-}
+ OSStatus err;
-#endif //USE_OWNER_DRAWN
+ // 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
-// ============================================================================
-// list box control implementation
-// ============================================================================
+ wxPoint point = inpoint;
-/*
-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
-{
-wxListBox* list;
-// typecast our refCon
-list = (wxListBox*)refCon;
+ // 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);
- MoveTo(cellRect->left + 4 , cellRect->top + 10 );
- const wxString text = list->m_stringArray[lCell.v] ;
- ::TextFont( kFontIDMonaco ) ;
- ::TextSize( 9 );
- ::TextFace( 0 ) ;
- DrawText(text, 0 , text.Length());
-
- }
-*/
-void wxListBox::MacDelete( int N )
-{
- LDelRow( 1 , N , (ListHandle)m_macList) ;
- Refresh();
-}
+ // 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"));
-void wxListBox::MacInsert( int n , const wxString& text)
-{
- Cell cell = { 0 , 0 } ;
- cell.v = n ;
- LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
- // LSetCell(text, strlen(text), cell, m_macList);
- Refresh();
-}
+ // 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"));
-void wxListBox::MacAppend( const wxString& text)
-{
- Cell cell = { 0 , 0 } ;
- cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
- LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
- // LSetCell(text, strlen(text), cell, m_macList);
- Refresh();
-}
+ UInt16 height;
+ err = GetDataBrowserTableViewRowHeight(m_peer->GetControlRef(), &height);
+ wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
-void wxListBox::MacClear()
-{
- LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
- Refresh();
-}
+ // 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;
-void wxListBox::MacSetSelection( int n , bool select )
-{
- Cell cell = { 0 , 0 } ;
- if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+ // 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 translate 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++;
+ }
+
+ // 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 )
{
- if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+ int mid = (low + high) / 2;
+
+ 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") );
+
+ if ( err == errDataBrowserItemNotFound )
{
- LSetSelect( false , cell , (ListHandle)m_macList ) ;
+ // item not visible, attempt to find a visible one
+ // search lower
+ high = mid - 1;
+ }
+ else // visible item, do actual hitttest
+ {
+ // 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) )
+ {
+ // found!
+ return mid;
+ }
+
+ if ( point.y < bounds.top )
+ // index(bounds) greater then key(point)
+ high = mid - 1;
+ else
+ // index(bounds) less then key(point)
+ low = mid + 1;
}
}
-
- cell.v = n ;
- LSetSelect( select , cell , (ListHandle)m_macList ) ;
- LAutoScroll( (ListHandle)m_macList ) ;
- Refresh();
-}
-bool wxListBox::MacIsSelected( int n ) const
-{
- Cell cell = { 0 , 0 } ;
- cell.v = n ;
- return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
+ return wxNOT_FOUND;
}
-void wxListBox::MacDestroy()
+// ============================================================================
+// data browser based implementation
+// ============================================================================
+
+wxMacListBoxItem::wxMacListBoxItem()
+ :wxMacDataItem()
{
- // DisposeExtLDEFInfo( m_macList ) ;
}
-int wxListBox::MacGetSelection() const
+wxMacListBoxItem::~wxMacListBoxItem()
{
- Cell cell = { 0 , 0 } ;
- if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
- return cell.v ;
- else
- return -1 ;
}
-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
+void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
+ DataBrowserItemNotification message,
+ DataBrowserItemDataRef WXUNUSED(itemData) ) const
{
- int no_sel = 0 ;
-
- aSelections.Empty();
-
- Cell cell = { 0 , 0 } ;
- cell.v = 0 ;
-
- while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+ wxMacDataBrowserListControl *lb = wxDynamicCast(owner,wxMacDataBrowserListControl);
+
+ // we want to depend on as little as possible to make sure tear-down of controls is safe
+
+ if ( message == kDataBrowserItemRemoved)
{
- aSelections.Add( cell.v ) ;
- no_sel++ ;
- cell.v++ ;
+ if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
+ {
+ delete (wxClientData*) (m_data);
+ }
+
+ delete this;
+ return;
}
- return no_sel ;
-}
-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 ;
- // LSetCell(text, strlen(text), cell, m_macList);
- Refresh();
-}
+ wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+ wxCHECK_RET( list != NULL , wxT("Listbox expected"));
-void wxListBox::MacScrollTo( int n )
-{
- // TODO implement scrolling
-}
+ bool trigger = false;
+ wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+ switch (message)
+ {
+ case kDataBrowserItemDeselected:
+ if ( list->HasMultipleSelection() )
+ trigger = !lb->IsSelectionSuppressed();
+ break;
-void wxListBox::OnSize( const wxSizeEvent &event)
-{
- Point pt;
-
-#if TARGET_CARBON
- GetListCellSize((ListHandle)m_macList, &pt);
-#else
- pt = (**(ListHandle)m_macList).cellSize ;
-#endif
- pt.h = m_width - 15 ;
- LCellSize( pt , (ListHandle)m_macList ) ;
-}
+ case kDataBrowserItemSelected:
+ trigger = !lb->IsSelectionSuppressed();
+ break;
-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
-{
- Boolean wasDoubleClick = false ;
- long result ;
-
- ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick , &result ) ;
- if ( !wasDoubleClick )
- {
- MacDoClick() ;
+ case kDataBrowserItemDoubleClicked:
+ event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED );
+ trigger = true;
+ break;
+
+ default:
+ break;
}
- else
+
+ if ( trigger )
{
- MacDoDoubleClick() ;
+ event.SetEventObject( list );
+ if ( list->HasClientObjectData() )
+ event.SetClientObject( (wxClientData*) m_data );
+ else if ( list->HasClientUntypedData() )
+ event.SetClientData( m_data );
+ event.SetString( m_label );
+ event.SetInt( owner->GetLineFromItem( this ) );
+ event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
+
+ // direct notification is not always having the listbox GetSelection()
+ // having in synch with event, so use wxPostEvent instead
+ // list->GetEventHandler()->ProcessEvent(event);
+
+ wxPostEvent( list->GetEventHandler(), event );
}
}
-void wxListBox::MacSetRedraw( bool doDraw )
-{
- LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
-
-}
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserListControl , wxMacDataItemBrowserControl )
-void wxListBox::MacDoClick()
+wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
+ : wxMacDataItemBrowserControl( peer, pos, size, style )
{
- wxArrayInt aSelections;
- int n ;
- size_t count = GetSelections(aSelections);
-
- if ( count == m_selectionPreImage.GetCount() )
+ OSStatus err = noErr;
+ m_clientDataItemsType = wxClientData_None;
+ if ( style & wxLB_SORT )
+ m_sortOrder = SortOrder_Text_Ascending;
+
+ DataBrowserSelectionFlags options = kDataBrowserDragSelect;
+ if ( style & wxLB_MULTIPLE )
{
- bool hasChanged = false ;
- for ( size_t i = 0 ; i < count ; ++i )
- {
- if ( aSelections[i] != m_selectionPreImage[i] )
- {
- hasChanged = true ;
- break ;
- }
- }
- if ( !hasChanged )
- {
- return ;
- }
+ options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
}
-
- m_selectionPreImage = aSelections;
-
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
- event.SetEventObject( this );
-
- if ( count > 0 )
+ else if ( style & wxLB_EXTENDED )
{
- n = aSelections[0];
- if ( HasClientObjectData() )
- event.SetClientObject( GetClientObject(n) );
- else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData(n) );
- event.SetString( GetString(n) );
+ options |= kDataBrowserCmdTogglesSelection;
}
else
{
- n = -1;
+ options |= kDataBrowserSelectOnlyOne;
+ }
+ err = SetSelectionFlags( options );
+ verify_noerr( err );
+
+ DataBrowserListViewColumnDesc columnDesc;
+ columnDesc.headerBtnDesc.titleOffset = 0;
+ columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+
+ columnDesc.headerBtnDesc.btnFontStyle.flags =
+ kControlUseFontMask | kControlUseJustMask;
+
+ columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+ columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+ columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+ columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+ columnDesc.headerBtnDesc.titleString = NULL;
+
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 10000;
+
+ columnDesc.propertyDesc.propertyID = kTextColumnId;
+ columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+#endif
+
+ verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+ columnDesc.headerBtnDesc.minimumWidth = 0;
+ columnDesc.headerBtnDesc.maximumWidth = 0;
+ columnDesc.propertyDesc.propertyID = kNumericOrderColumnId;
+ columnDesc.propertyDesc.propertyType = kDataBrowserPropertyRelevanceRankPart;
+ columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+#endif
+
+ verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+ SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+ if ( m_sortOrder == SortOrder_Text_Ascending )
+ {
+ SetDataBrowserSortProperty( m_controlRef , kTextColumnId);
+ SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
}
-
- event.m_commandInt = n;
-
- GetEventHandler()->ProcessEvent(event);
+ else
+ {
+ SetDataBrowserSortProperty( m_controlRef , kNumericOrderColumnId);
+ SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing);
+ }
+
+ verify_noerr( AutoSizeColumns() );
+ verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
+ verify_noerr( SetHeaderButtonHeight( 0 ) );
+ err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
+#if 0
+ // shouldn't be necessary anymore under 10.2
+ m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+ m_peer->SetNeedsFocusRect( true );
+#endif
}
-void wxListBox::MacDoDoubleClick()
+wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event) ;
}
-void wxListBox::OnChar(wxKeyEvent& event)
+wxWindow * wxMacDataBrowserListControl::GetPeer() const
{
- 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 )
+ return wxDynamicCast( wxMacControl::GetPeer() , wxWindow );
+}
+
+wxMacDataItem* wxMacDataBrowserListControl::CreateItem()
+{
+ return new wxMacListBoxItem();
+}
+
+#if 0
+
+// in case we need that one day
+
+// ============================================================================
+// HIView owner-draw-based implementation
+// ============================================================================
+
+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;
+
+ 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 )
{
- // 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) );
- }
+ ThemeBrush colorBrushID;
+
+ // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor
+ // is incorporated Panther DB starts using kThemeBrushSecondaryHighlightColor
+ // for inactive browser highlighting
+ Gestalt( gestaltSystemVersion, &systemVersion );
+ if ( (systemVersion >= 0x00001030) && !IsControlActive( browser ) )
+ colorBrushID = kThemeBrushSecondaryHighlightColor;
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);
- }
- }
+ 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 );
}
+#endif
+
+
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff