///////////////////////////////////////////////////////////////////////////////
// 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
///////////////////////////////////////////////////////////////////////////////
#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/utils.h"
#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
BEGIN_EVENT_TABLE(wxListBox, wxControl)
- EVT_SIZE( wxListBox::OnSize )
- EVT_CHAR( wxListBox::OnChar )
+#ifndef __WXMAC_OSX__
+ EVT_SIZE( wxListBox::OnSize )
+ EVT_CHAR( wxListBox::OnChar )
+#endif
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
+const short kTextColumnId = 1024 ;
-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
+// new databrowserbased version
+// because of the limited insert
+// functionality of DataBrowser,
+// we just introduce id s corresponding
+// to the line number
-extern "C"
+// Listbox item
+wxListBox::wxListBox()
{
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
- Cell cell, short dataOffset, short dataLength,
- ListHandle listHandle ) ;
+ m_noItems = 0;
+ m_selected = 0;
+ m_macList = NULL ;
}
-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
- Cell cell, short dataOffset, short dataLength,
- ListHandle listHandle )
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
- 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;
+ wxCArrayString chs(choices);
- case lCloseMsg:
- break;
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
- case lDrawMsg:
+#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 ) ;
+ int i = itemID - 1 ;
+ if (i >= 0 && i < list->GetCount() )
{
- const wxString text = list->m_stringArray[cell.v] ;
-
- // Save the current clip region, and set the clip region to the area we are about
- // to draw.
-
- savedClipRegion = NewRgn();
- GetClip( savedClipRegion );
-
- ClipRect( drawRect );
- EraseRect( drawRect );
-
- MoveTo(drawRect->left + 4 , drawRect->top + 10 );
- ::TextFont( kFontIDMonaco ) ;
- ::TextSize( 9 );
- ::TextFace( 0 ) ;
-
- DrawText(text, 0 , text.Length());
- // If the cell is hilited, do the hilite now. Paint the cell contents with the
- // appropriate QuickDraw transform mode.
-
- if( isSelected ) {
- savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
- SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
- PaintRect( drawRect );
- SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
- }
-
- // Restore the saved clip region.
-
- SetClip( savedClipRegion );
- DisposeRgn( savedClipRegion );
+ 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 ;
}
- 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 ;
+ 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) ;
+ }
+ }
}
- SetPort(savePort);
}
-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-const short kwxMacListWithVerticalScrollbar = 128 ;
-const short kwxMacListItemHeight = 14 ;
-// ============================================================================
-// list box control implementation
-// ============================================================================
-
-// Listbox item
-wxListBox::wxListBox()
-{
- m_noItems = 0;
- m_selected = 0;
- m_macList = NULL ;
+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 ) ;
+ 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 ListDefUPP macListDefUPP = NULL ;
-
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxValidator& validator,
const wxString& name)
{
- m_noItems = 0 ; // this will be increased by our append command
- m_selected = 0;
-
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
-
- ListDefSpec listDef;
- listDef.defType = kListDefUserProcType;
- if ( macListDefUPP == NULL )
- {
- macListDefUPP = NewListDefUPP( wxMacListDefinition );
- }
- listDef.u.userProc = macListDefUPP ;
+ m_macIsUserPane = FALSE ;
-#if TARGET_CARBON
- Size asize;
-
-
- CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
- kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
+ 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;
- GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
- sizeof(ListHandle), (Ptr) &m_macList, &asize);
+ m_noItems = 0 ; // this will be increased by our append command
+ m_selected = 0;
- SetControlReference( (ControlHandle) m_macControl, (long) this);
- SetControlVisibility( (ControlHandle) m_macControl, false, false);
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-#else
+ m_peer = new wxMacControl() ;
+ verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
- long result ;
- wxStAppResource resload ;
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
- 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 ;
- }
-
- Point pt = (**(ListHandle)m_macList).cellSize ;
- pt.v = kwxMacListItemHeight ;
- LCellSize( pt , (ListHandle)m_macList ) ;
- LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
-#endif
- OptionBits options = 0;
+ DataBrowserSelectionFlags options = kDataBrowserDragSelect ;
if ( style & wxLB_MULTIPLE )
{
- options += lNoExtend ;
+ options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection ;
}
else if ( style & wxLB_EXTENDED )
{
- options += lExtendDrag ;
+ // default behaviour
}
else
{
- options = lOnlyOne ;
+ options += kDataBrowserSelectOnlyOne ;
}
- SetListSelectionFlags((ListHandle)m_macList, options);
+ verify_noerr(m_peer->SetSelectionFlags( 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 = kTextColumnId;
+ 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(m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+ verify_noerr(m_peer->AutoSizeListViewColumns() ) ;
+ verify_noerr(m_peer->SetHasScrollBars(false , true ) ) ;
+ verify_noerr(m_peer->SetTableViewHiliteStyle(kDataBrowserTableViewFillHilite ) ) ;
+ verify_noerr(m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;
+ DataBrowserCallbacks callbacks ;
+
+ callbacks.version = kDataBrowserLatestCallbacks;
- MacPostControlCreate() ;
+ InitDataBrowserCallbacks(&callbacks);
+ callbacks.u.v1.itemDataCallback =
+ NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
+
+ callbacks.u.v1.itemNotificationCallback =
+#if TARGET_API_MAC_OSX
+ (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+ NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+ m_peer->SetCallbacks( &callbacks);
+
+#if TARGET_API_MAC_OSX
+ // there is a redraw bug in 10.2.X
+ if ( UMAGetSystemVersion() < 0x1030 )
+ m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+#endif
+
+ MacPostControlCreate(pos,size) ;
+
for ( int i = 0 ; i < n ; i++ )
{
Append( choices[i] ) ;
}
-
- LSetDrawingMode( true , (ListHandle)m_macList ) ;
+ SetBestSize(size); // Needed because it is a wxControlWithItems
+
return TRUE;
}
wxListBox::~wxListBox()
{
+ m_peer->SetReference( NULL ) ;
FreeData() ;
+ // avoid access during destruction
if ( m_macList )
{
-#if !TARGET_CARBON
- DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
- (**(ListHandle)m_macList).listDefProc = NULL ;
-#endif
m_macList = NULL ;
}
}
int sizeFlags )
{
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 ) ;
m_stringArray.RemoveAt( N ) ;
m_dataArray.RemoveAt( N ) ;
m_noItems --;
-
+
MacDelete( N ) ;
}
int wxListBox::DoAppend(const wxString& item)
{
+ InvalidateBestSize();
+
int index = m_noItems ;
- if( wxApp::s_macDefaultEncodingIsPC )
- {
- m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
- m_dataArray.Add( NULL );
- }
- else {
- m_stringArray.Add( item ) ;
- m_dataArray.Add( NULL );
- }
+ m_stringArray.Add( item ) ;
+ m_dataArray.Add( NULL );
m_noItems ++;
DoSetItemClientData( index , NULL ) ;
MacAppend( item ) ;
}
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
+ Append( choices[i] , clientData[i] ) ;
+#endif
+ }
+ else
+ Append( choices[i] ) ;
}
- 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);
}
}
#endif // wxUSE_OWNER_DRAWN
- MacSetRedraw( true ) ;
}
-bool wxListBox::HasMultipleSelection() const
+int wxListBox::FindString(const wxString& s) const
{
- return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
-}
-
-int wxListBox::FindString(const wxString& st) const
-{
- wxString s ;
- if( wxApp::s_macDefaultEncodingIsPC )
- {
- s = wxMacMakeMacStringFromPC( st ) ;
- }
- else
- s = st ;
-
- if ( s.Right(1) == "*" )
+
+ if ( s.Right(1) == wxT("*") )
{
wxString search = s.Left( s.Length() - 1 ) ;
int len = search.Length() ;
Str255 s1 , s2 ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
-#else
- strcpy( (char *) s2 , search.c_str() ) ;
- c2pstr( (char *) s2 ) ;
-#endif
-
+ wxMacStringToPascal( search , s2 ) ;
+
for ( int i = 0 ; i < m_noItems ; ++ i )
{
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-#else
- strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
- c2pstr( (char *) s1 ) ;
-#endif
+ wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+
if ( EqualString( s1 , s2 , false , false ) )
return i ;
}
- if ( s.Left(1) == "*" && s.Length() > 1 )
+ if ( s.Left(1) == wxT("*") && s.Length() > 1 )
{
- s = st ;
- s.MakeLower() ;
+ wxString st = s ;
+ st.MakeLower() ;
for ( int i = 0 ; i < m_noItems ; ++i )
{
- if ( GetString(i).Lower().Matches(s) )
+ if ( GetString(i).Lower().Matches(st) )
return i ;
}
- }
-
+ }
+
}
else
{
Str255 s1 , s2 ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
-#else
- strcpy( (char *) s2 , s.c_str() ) ;
- c2pstr( (char *) s2 ) ;
-#endif
-
+
+ wxMacStringToPascal( s , s2 ) ;
+
for ( int i = 0 ; i < m_noItems ; ++ i )
{
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
-#else
- strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
- c2pstr( (char *) s1 ) ;
-#endif
+ wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+
if ( EqualString( s1 , s2 , false , false ) )
return i ;
}
- }
- return -1;
+ }
+ return -1;
}
void wxListBox::Clear()
{
- FreeData();
- 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)
{
+ if ( N == wxNOT_FOUND )
+ {
+ // unselect everything
+ int sel = MacGetSelection() ;
+ if ( sel != wxNOT_FOUND )
+ {
+ UInt32 id = sel + 1 ;
+ verify_noerr(
+ m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove )
+ );
+ }
+
+ return;
+ }
+
wxCHECK_RET( N >= 0 && N < m_noItems,
- "invalid index in wxListBox::SetSelection" );
- MacSetSelection( N , select ) ;
- GetSelections( m_selectionPreImage ) ;
+ 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,
- wxT("invalid index in wxListBox::GetClientData"));
-
+ wxT("invalid index in wxListBox::GetClientData"));
+
return (void *)m_dataArray[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" ) ;
+ wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
- if ( m_dataArray.GetCount() > N )
+ if ( m_dataArray.GetCount() > (size_t) N )
{
m_dataArray[N] = (char*) Client_data ;
}
// 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") );
+
+ 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)
{
- wxString str ;
- if( wxApp::s_macDefaultEncodingIsPC )
- {
- str = wxMacMakeMacStringFromPC( s ) ;
- }
- else
- str = s ;
- m_stringArray[N] = str ;
+ 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()
-{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetForegroundColour());
-}
-
void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
wxControl::Refresh( eraseBack , rect ) ;
-// MacRedrawControl() ;
+ // MacRedrawControl() ;
}
#if wxUSE_OWNER_DRAWN
#endif //USE_OWNER_DRAWN
-// ============================================================================
-// list box control implementation
-// ============================================================================
-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- 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());
-
+ 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 )
{
- LDelRow( 1 , N , (ListHandle)m_macList) ;
- Refresh();
+ UInt32 id = m_noItems+1 ;
+ verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+ verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
}
-void wxListBox::MacInsert( int n , const char * text)
+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();
+ UInt32 id = m_noItems ; // this has already been increased
+ verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+ verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , (UInt32*) kDataBrowserNoItem , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
}
-void wxListBox::MacAppend( const char * text)
+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();
+ UInt32 id = m_noItems ; // this has already been increased
+ verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
}
-void wxListBox::MacClear()
+void wxListBox::MacClear()
{
- LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
- Refresh();
+ verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
}
void wxListBox::MacSetSelection( int n , bool select )
{
- Cell cell = { 0 , 0 } ;
- if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+ UInt32 id = n + 1 ;
+ if ( !(GetWindowStyle() & (wxLB_MULTIPLE|wxLB_EXTENDED) ) )
{
- if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+ int n = MacGetSelection() ;
+ if ( n >= 0 )
{
- LSetSelect( false , cell , (ListHandle)m_macList ) ;
+ UInt32 idOld = n + 1 ;
+ m_peer->SetSelectedItems( 1 , & idOld , kDataBrowserItemsRemove ) ;
}
}
-
- cell.v = n ;
- LSetSelect( select , cell , (ListHandle)m_macList ) ;
- LAutoScroll( (ListHandle)m_macList ) ;
- Refresh();
+ if ( m_peer->IsItemSelected( id ) != select )
+ {
+ verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ;
+ }
+ MacScrollTo( n ) ;
}
bool wxListBox::MacIsSelected( int n ) const
{
- Cell cell = { 0 , 0 } ;
- cell.v = n ;
- return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
-}
-
-void wxListBox::MacDestroy()
-{
-// DisposeExtLDEFInfo( m_macList ) ;
+ return m_peer->IsItemSelected( n + 1 ) ;
}
int wxListBox::MacGetSelection() const
{
- Cell cell = { 0 , 0 } ;
- if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
- return cell.v ;
- else
+ for ( int i = 0 ; i < GetCount() ; ++i )
+ {
+ if ( m_peer->IsItemSelected( i + 1 ) )
+ {
+ return i ;
+ }
+ }
return -1 ;
}
int no_sel = 0 ;
aSelections.Empty();
-
- Cell cell = { 0 , 0 } ;
- cell.v = 0 ;
-
- while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+ for ( int i = 0 ; i < GetCount() ; ++i )
{
- aSelections.Add( cell.v ) ;
- no_sel++ ;
- cell.v++ ;
+ if ( m_peer->IsItemSelected( i + 1 ) )
+ {
+ 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 ;
-// LSetCell(text, strlen(text), cell, m_macList);
- Refresh();
+ // as we don't store the strings we only have to issue a redraw
+ UInt32 id = n + 1 ;
+ verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
}
void wxListBox::MacScrollTo( int n )
{
- // TODO implement scrolling
+ UInt32 id = n + 1 ;
+ verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
}
-void wxListBox::OnSize( const wxSizeEvent &event)
+#if !TARGET_API_MAC_OSX
+void wxListBox::OnSize( 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 ) ;
-}
-
-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() ;
- }
- else
- {
- MacDoDoubleClick() ;
- }
}
+#endif
-void wxListBox::MacSetRedraw( bool doDraw )
+void wxListBox::MacSetRedraw( bool doDraw )
{
- LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
-
+ // nothing to do in compositing mode
}
void wxListBox::MacDoClick()
-{
+{/*
wxArrayInt aSelections;
- int n, count = GetSelections(aSelections);
+ int n ;
+ size_t count = GetSelections(aSelections);
if ( count == m_selectionPreImage.GetCount() )
{
bool hasChanged = false ;
- for ( int i = 0 ; i < count ; ++i )
+ for ( size_t i = 0 ; i < count ; ++i )
{
if ( aSelections[i] != m_selectionPreImage[i] )
{
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
-
+
if ( count > 0 )
{
n = aSelections[0];
}
else
{
- n = -1;
+ 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) ;
+*/
}
-static long sLastTypeIn = 0 ;
+#if !TARGET_API_MAC_OSX
void wxListBox::OnChar(wxKeyEvent& event)
{
- EventRecord *ev = (EventRecord*) (wxTheApp->MacGetCurrentEvent() ) ;
- short keycode ;
- short keychar ;
- keychar = short(ev->message & charCodeMask);
- keycode = short(ev->message & keyCodeMask) >> 8 ;
- if ( event.KeyCode() == WXK_SPACE )
- {
+ // 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) );
+ n = aSelections[0];
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString( GetString(n) );
}
else
{
- n = -1;
+ n = -1;
}
-
+
event.m_commandInt = n;
-
+
GetEventHandler()->ProcessEvent(event);
- }
- else if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
- {
- // default handling
- event.Skip() ;
-// ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
- }
- else
- {
- if ( ev->when > m_lastTypeIn + 60 )
- {
- m_typeIn = "" ;
- }
- m_lastTypeIn = ev->when ;
- m_typeIn += (char) event.KeyCode() ;
- int line = FindString("*"+m_typeIn+"*") ;
- if ( line >= 0 )
- {
- SetSelection(line) ;
- }
- }
+ }
+ 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);
+ }
+ }
+ }
}
+#endif
+
projects / wxWidgets.git / blobdiff