cleanup - reformat

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 2d7dff4fbcea8bdc3ad2b4f73c6e89a2ab90bd6f..8d55c0f0ba0137871485e5f8d05e62a0074b4283 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/mac/carbon/listbox.cpp

 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,9 +9,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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/app.h"
 #include "wx/listbox.h"


@@ -23,317 +23,312 @@
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

-#if !USE_SHARED_LIBRARY
+#include "wx/mac/uma.h"
+
+const short kTextColumnId = 1024 ;
+
+// new DataBrowser-based version:
+// because of the limited insert functionality of DataBrowser,
+// we just introduce IDs corresponding to the line number
+
+

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

-    EVT_SIZE( wxListBox::OnSize )
+#ifndef __WXMAC_OSX__
+//    EVT_SIZE( wxListBox::OnSize )

     EVT_CHAR( wxListBox::OnChar )
     EVT_CHAR( wxListBox::OnChar )

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 

-#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
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL ;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL ;
+DataBrowserDrawItemUPP gDataBrowserDrawItemUPP = NULL ;

 
 

-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 ;
+#if TARGET_API_MAC_OSX
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+    DataBrowserItemNotification message, DataBrowserItemDataRef itemData)

 #else
 #else

-const short kwxMacListItemHeight = 14 ;
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID,
+    DataBrowserItemNotification message)

 #endif
 #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:
+    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 );
-            
-            wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
-            
-            if ( font )
+            bool trigger = false ;
+            wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+            switch ( message )

             {
             {

-                ::TextFont( font->m_macFontNum ) ;
-                ::TextSize( short(font->m_macFontSize) ) ;
-                ::TextFace( font->m_macFontStyle ) ;
+                case kDataBrowserItemDeselected :
+                    if ( list->HasMultipleSelection() )
+                        trigger = !list->MacIsSelectionSuppressed() ;
+                    break ;
+
+                case kDataBrowserItemSelected :
+                    trigger = !list->MacIsSelectionSuppressed() ;
+                    break ;
+
+                case kDataBrowserItemDoubleClicked :
+                    event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED ) ;
+                    trigger = true ;
+                    break ;
+
+                default :
+                    break ;

             }
             }

-            else
+
+            if ( trigger )

             {
             {

-                ::TextFont( kFontIDMonaco ) ;
-                ::TextSize( 9  );
-                ::TextFace( 0 ) ;
+                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) ;

             }
             }

-            
-#if TARGET_CARBON
-            bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
-            
-               if ( useDrawThemeText )
-               {
-                Rect frame = { drawRect->top, drawRect->left + 4,
-                    drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
-                CFStringRef sString = CFStringCreateWithBytes( NULL , (UInt8*) text.c_str(), text.Length(), CFStringGetSystemEncoding(), false ) ;
-                CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , sString ) ;
-                CFRelease( sString ) ;
-                ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
-                ::DrawThemeTextBox( mString,
-                    kThemeCurrentPortFont,
-                    kThemeStateActive,
-                    false,
-                    &frame,
-                    teJustLeft,
-                    nil );
-                CFRelease( mString ) ;
-            }
-            else
-#endif
+        }
+    }
+}
+
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+    DataBrowserItemID itemID, DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData, Boolean changeValue)
+{
+    OSStatus err = errDataBrowserPropertyNotSupported;
+
+    if ( ! changeValue )
+    {
+        switch (property)
+        {
+            case kTextColumnId:

             {
             {

-                MoveTo(drawRect->left + 4 , drawRect->top + 10 );
-                DrawText(text, 0 , text.Length());
+                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 ;
+                    }
+                }

             }
             }

-            
-            //  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;
+
+            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 ;

     }
     }

-    SetPort(savePort);
+
+    return err;

 }
 
 }
 

-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-// resources ldef ids
-const short kwxMacListWithVerticalScrollbar = 128 ;
-const short kwxMacListWithVerticalAndHorizontalScrollbar = 129 ;
+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 );

 
 

-// ============================================================================
-// list box control implementation
-// ============================================================================
+    //  In this sample we handle the "selected" state; all others fall through to our "active" state
+    if ( itemState == kDataBrowserItemIsSelected )
+    {
+        ThemeBrush colorBrushID;
+
+        Gestalt( gestaltSystemVersion, &systemVersion );
+
+        // TODO: switch over to wxSystemSettingsNative::GetColour() when kThemeBrushSecondaryHighlightColor is incorporated
+        // Panther DB starts using kThemeBrushSecondaryHighlightColor for inactive browser hilighting
+        if ( (systemVersion >= 0x00001030) && !IsControlActive( browser ) )
+            colorBrushID = kThemeBrushSecondaryHighlightColor;
+        else
+            colorBrushID = kThemeBrushPrimaryHighlightColor;
+
+        // First paint the hilite rect, then the text on top
+        SetThemePen( colorBrushID, 32, true );
+        PaintRect( itemRect );
+        SetThemeDrawingState( themeState , false ) ;
+    }
+
+    DrawThemeTextBox( cfString, kThemeApplicationFont, kThemeStateActive, true, itemRect, teFlushDefault, NULL );
+    SetThemeDrawingState( themeState , true ) ;
+
+    if ( cfString != NULL )
+        CFRelease( cfString );
+}

 
 // Listbox item
 wxListBox::wxListBox()
 {
 
 // Listbox item
 wxListBox::wxListBox()
 {

-  m_noItems = 0;
-  m_selected = 0;
-  m_macList = NULL ;
+    m_noItems = 0;
+    m_selected = 0;
+    m_macList = NULL ;
+    m_suppressSelection = false ;

 }
 
 }
 

-static ListDefUPP macListDefUPP = NULL ;
+bool wxListBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}

 
 

-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,
+    int n,
+    const wxString choices[],
+    long style,
+    const wxValidator& validator,
+    const wxString& name)

 {
 {

+    m_macIsUserPane = false ;
+
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  _T("only one of listbox selection modes can be specified") );
+
+    if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+        return false;
+

     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
 
     m_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 )
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_peer = new wxMacControl( this ) ;
+    verify_noerr(
+        ::CreateDataBrowserControl(
+            MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+            kDataBrowserListView, m_peer->GetControlRefAddr() ) );
+
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
+    if ( style & wxLB_MULTIPLE )
+        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection  ;
+    else if ( style & wxLB_EXTENDED )
+        ; // default behaviour
+    else
+        options |= kDataBrowserSelectOnlyOne ;
+
+    verify_noerr( m_peer->SetSelectionFlags( options ) );
+
+    if ( gDataBrowserItemDataUPP == NULL )
+        gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(ListBoxGetSetItemData) ;
+    if ( gDataBrowserItemNotificationUPP == NULL )

     {
     {

-        macListDefUPP = NewListDefUPP( wxMacListDefinition );
-    }
-    listDef.u.userProc = macListDefUPP ;
-    
-    Str255 fontName ;
-    SInt16 fontSize ;
-    Style fontStyle ;
-    SInt16 fontNum ;
-#if TARGET_CARBON
-    GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+        gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+            (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;

 #else
 #else

-    GetFontName( kFontIDMonaco , fontName ) ;
-    fontSize = 9 ;
-    fontStyle = normal ;
-#endif 
-    CopyPascalStringToC( fontName , (char*) fontName ) ;
-    SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ) ) ;
-#if TARGET_CARBON
-    Size asize;
+            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+    }

 
 

+    if ( gDataBrowserDrawItemUPP == NULL )
+        gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;

 
 

-    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true,
-                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
+    DataBrowserCallbacks callbacks ;
+    InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;

 
 

-    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
-                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
+    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+    callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+    m_peer->SetCallbacks( &callbacks);

 
 

-    SetControlReference( (ControlHandle) m_macControl, (long) this);
-    SetControlVisibility( (ControlHandle) m_macControl, false, false);
+    DataBrowserCustomCallbacks customCallbacks ;
+    InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;

 
 

-#else
+    customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;

 
 

-    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 ;
-    }
+    SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
+
+    DataBrowserListViewColumnDesc columnDesc ;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+    columnDesc.headerBtnDesc.btnFontStyle.flags = kControlUseFontMask | kControlUseJustMask;
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.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( "" );

 
 

-    Point pt = (**(ListHandle)m_macList).cellSize ;
-    pt.v = kwxMacListItemHeight ;
-    LCellSize( pt , (ListHandle)m_macList ) ;
-    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType ; // kDataBrowserCustomType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn;
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;

 #endif
 #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);
+
+    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ) ;
+    verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
+    verify_noerr( m_peer->SetHasScrollBars( false, true ) ) ;
+    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite ) ) ;
+    verify_noerr( m_peer->SetListViewHeaderBtnHeight( 0 ) ) ;
+
+#if 0
+    // shouldn't be necessary anymore under 10.2
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+    m_peer->SetNeedsFocusRect( true ) ;
+#endif
+
+    MacPostControlCreate( pos, size ) ;

 
     for ( int i = 0 ; i < n ; i++ )
     {
         Append( choices[i] ) ;
     }
 
 
     for ( int i = 0 ; i < n ; i++ )
     {
         Append( choices[i] ) ;
     }
 

-    MacPostControlCreate() ;
+    // Needed because it is a wxControlWithItems
+    SetBestSize(size);

 
 

-    LSetDrawingMode( true , (ListHandle)m_macList ) ;
-
-    return TRUE;
+    return true;

 }
 
 wxListBox::~wxListBox()
 {
 }
 
 wxListBox::~wxListBox()
 {

+    m_peer->SetReference( 0 ) ;

     FreeData() ;
     FreeData() ;

+
+    // avoid access during destruction

     if ( m_macList )
     if ( m_macList )

-    {
-#if !TARGET_CARBON
-        DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
-        (**(ListHandle)m_macList).listDefProc = NULL ;
-#endif

         m_macList = NULL ;
         m_macList = NULL ;

-    }

 }
 
 void wxListBox::FreeData()
 {
 }
 
 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++ )
         {
     if ( HasClientObjectData() )
     {
         for ( size_t n = 0; n < (size_t)m_noItems; n++ )
         {

-            delete GetClientObject(n);
+            delete GetClientObject( n );

         }
     }
 }
         }
     }
 }


@@ -343,61 +338,36 @@ void  wxListBox::DoSetSize(int x, int y,
             int sizeFlags )
 {
     wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
             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)
+
+void wxListBox::DoSetFirstItem(int n)

 {
 {

-    MacScrollTo( N ) ;
+    MacScrollTo( n ) ;

 }
 
 }
 

-void wxListBox::Delete(int N)
+void wxListBox::Delete(int n)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( n >= 0 && n < m_noItems,

                  wxT("invalid index in wxListBox::Delete") );
 
                  wxT("invalid index in wxListBox::Delete") );
 

-#if wxUSE_OWNER_DRAWN
-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
-#else // !wxUSE_OWNER_DRAWN

     if ( HasClientObjectData() )
     if ( HasClientObjectData() )

-    {
-        delete GetClientObject(N);
-    }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-    m_stringArray.RemoveAt( N ) ;
-    m_dataArray.RemoveAt( N ) ;
-    m_noItems --;
+        delete GetClientObject( n );

 
 

-    MacDelete( N ) ;
+    m_stringArray.RemoveAt( n ) ;
+    m_dataArray.RemoveAt( n ) ;
+    m_noItems--;
+
+    MacDelete( n ) ;

 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {

+    InvalidateBestSize();
+

     int index = m_noItems ;
     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_noItems ++;
+    m_stringArray.Add( item ) ;
+    m_dataArray.Add( NULL );
+    m_noItems++;

     DoSetItemClientData( index , NULL ) ;
     MacAppend( item ) ;
 
     DoSetItemClientData( index , NULL ) ;
     MacAppend( item ) ;
 


@@ -406,121 +376,63 @@ int wxListBox::DoAppend(const wxString& item)
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 {
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 {

-    MacSetRedraw( false ) ;

     Clear() ;
     int n = choices.GetCount();
     Clear() ;
     int n = choices.GetCount();

-    
-    for( int i = 0 ; i < n ; ++i )
+
+    for ( int i = 0 ; i < n ; ++i )

     {
         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] ) ;
             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
-        size_t ui = m_aItems.Count();
-        while ( ui-- != 0 ) {
-            delete m_aItems[ui];
-            m_aItems[ui] = NULL;
-        }
-        m_aItems.Empty();
-        
-        // then create new ones
-        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
-            wxOwnerDrawn *pNewItem = CreateItem(ui);
-            pNewItem->SetName(choices[ui]);
-            m_aItems.Add(pNewItem);
-        }
-    }
-#endif // wxUSE_OWNER_DRAWN
-    MacSetRedraw( true ) ;

 }
 
 }
 

-bool wxListBox::HasMultipleSelection() const
+int wxListBox::FindString(const wxString& s, bool bCase) 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 ;
     {
         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 )
         {
         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
-            if ( EqualString( s1 , s2 , false , false ) )
+            wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+
+            if ( EqualString( s1 , s2 , bCase , false ) )

                 return i ;
         }
                 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 )
             {
             for ( int i = 0 ; i < m_noItems ; ++i )
             {

-                if ( GetString(i).Lower().Matches(s) )
+                if ( GetString( i ).Lower().Matches(st) )

                     return i ;
             }
         }
                     return i ;
             }
         }

-        

     }
     else
     {
         Str255 s1 , s2 ;
     }
     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 )
         {
         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
-            if ( EqualString( s1 , s2 , false , false ) )
+            wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+
+            if ( EqualString( s1 , s2 , bCase , false ) )

                 return i ;
         }
     }
                 return i ;
         }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 void wxListBox::Clear()
 }
 
 void wxListBox::Clear()


@@ -532,58 +444,49 @@ void wxListBox::Clear()
     MacClear() ;
 }
 
     MacClear() ;
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int n, bool select)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-        "invalid index in wxListBox::SetSelection" );
-    MacSetSelection( N , select ) ;
-    GetSelections( m_selectionPreImage ) ;
+    wxCHECK_RET( n == wxNOT_FOUND || (n >= 0 && n < m_noItems) ,
+        wxT("invalid index in wxListBox::SetSelection") );
+
+    if ( n == wxNOT_FOUND )
+        MacDeselectAll() ;
+    else
+        MacSetSelection( n , select ) ;

 }
 
 }
 

-bool wxListBox::IsSelected(int N) const
+bool wxListBox::IsSelected(int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-        "invalid index in wxListBox::Selected" );
-    
-    return MacIsSelected( N ) ;
+    wxCHECK_MSG( n >= 0 && n < m_noItems, false,
+        wxT("invalid index in wxListBox::Selected") );
+
+    return MacIsSelected( n ) ;

 }
 
 }
 

-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
+    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];
+
+    return (void *)m_dataArray[n];

 }
 
 }
 

-wxClientData *wxListBox::DoGetItemClientObject(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(int n) const

 {
 {

-    return (wxClientData *) DoGetItemClientData( N ) ;
+    return (wxClientData *) DoGetItemClientData( n ) ;

 }
 
 }
 

-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(int n, void *clientData)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-        "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 , "invalid client_data array" ) ;
-    
-    if ( m_dataArray.GetCount() > (size_t) N )
-    {
-        m_dataArray[N] = (char*) Client_data ;
-    }
+    wxCHECK_RET( n >= 0 && n < m_noItems,
+        wxT("invalid index in wxListBox::SetClientData") );
+
+    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) n , wxT("invalid client_data array") ) ;
+
+    if ( m_dataArray.GetCount() > (size_t) n )
+        m_dataArray[n] = (char*)clientData ;

     else
     else

-    {
-        m_dataArray.Add( (char*) Client_data ) ;
-    }
+        m_dataArray.Add( (char*)clientData ) ;

 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)


@@ -604,44 +507,36 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(int n) const

 {
 {

-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        return      wxMacMakePCStringFromMac( m_stringArray[N] ) ;
-    }
-    else
-        return m_stringArray[N]  ;
+    wxCHECK_MSG( n >= 0 && n < m_noItems, wxEmptyString,
+                 wxT("invalid index in wxListBox::GetString") );
+
+    return m_stringArray[n]  ;

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );

-    
+
+    InvalidateBestSize();
+

     int nItems = items.GetCount();
     int nItems = items.GetCount();

-    
+

     for ( int i = 0 ; i < nItems ; i++ )
     {
         m_stringArray.Insert( items[i] , pos + i ) ;
         m_dataArray.Insert( NULL , pos + i ) ;
     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] ) ;
     }
         MacInsert( pos + i , items[i] ) ;
     }

-    
-    m_noItems += nItems;

 }
 
 }
 

-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(int n, const wxString& s)

 {
 {

-    wxString str ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        str = wxMacMakeMacStringFromPC( s )  ;
-    }
-    else
-        str = s ;
-    m_stringArray[N] = str ;
-    MacSet( N , s ) ;
+    m_stringArray[n] = s ;
+    MacSet( n , s ) ;

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -649,17 +544,16 @@ wxSize wxListBox::DoGetBestSize() const
     int lbWidth = 100;  // some defaults
     int lbHeight = 110;
     int wLine;
     int lbWidth = 100;  // some defaults
     int lbHeight = 110;
     int wLine;

-    
+

     {
     {

-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
-        
-        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-        
-        if ( font )
+        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
         {
         }
         else
         {


@@ -667,27 +561,46 @@ wxSize wxListBox::DoGetBestSize() const
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }

-        
+

         // Find the widest line
         // Find the widest line

-        for(int i = 0; i < GetCount(); i++) {
-            wxString str(GetString(i));
+        for (int i = 0; i < GetCount(); i++)
+        {
+            wxString str( GetString( i ) );
+
+#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

             wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
             wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;

-            lbWidth = wxMax(lbWidth, wLine);
+#endif
+
+            lbWidth = wxMax( lbWidth, wLine );

         }
         }

-        
+

         // Add room for the scrollbar
         lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
         // 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 ;
         // And just a bit more
         int cy = 12 ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;

-        
-        // don't make the listbox too tall (limit height to around 10 items) but don't
-        // make it too small neither
-        lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
+
+        // don't make the listbox too tall (limit height to around 10 items)
+        // but don't make it too small neither
+        lbHeight = wxMax( (cy + 4) * wxMin( wxMax( GetCount(), 3 ), 10 ), 70 );

     }
     }

-    return wxSize(lbWidth, lbHeight);
+
+    return wxSize( lbWidth, lbHeight );

 }
 
 int wxListBox::GetCount() const
 }
 
 int wxListBox::GetCount() const


@@ -695,278 +608,222 @@ int wxListBox::GetCount() const
     return m_noItems;
 }
 
     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 ) ;
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     wxControl::Refresh( eraseBack , rect ) ;

-    //    MacRedrawControl() ;

 }
 
 }
 

-#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 );

 
 

-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
-{
-    return new wxListBoxItem();
+    return attr;

 }
 
 }
 

-#endif  //USE_OWNER_DRAWN
-

 // ============================================================================
 // list box control implementation
 // ============================================================================
 
 // ============================================================================
 // list box control implementation
 // ============================================================================
 

-/*
-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
+void wxListBox::MacDelete( int n )

 {
 {

-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());
-  
+    wxArrayInt selectionBefore ;
+    MacGetSelections( selectionBefore ) ;
+
+    UInt32 id = m_noItems + 1 ;
+
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    for ( size_t i = 0 ; i < selectionBefore.GetCount() ; ++i )
+    {
+        int current = selectionBefore[i] ;
+        if ( current == n )
+        {
+            // selection was deleted
+            MacSetSelection( current , false ) ;
+        }
+        else if ( current > n )
+        {
+            // something behind the deleted item was selected -> move up
+            MacSetSelection( current - 1 , true ) ;
+            MacSetSelection( current , false ) ;
+        }

     }
     }

-*/
-void wxListBox::MacDelete( int N )
-{
-    LDelRow( 1 , N , (ListHandle)m_macList) ;
-    Refresh();
-}

 
 

-void wxListBox::MacInsert( int n , const char * text)
-{
-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
-    //    LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
+    // refresh all
+    verify_noerr(
+        m_peer->UpdateItems(
+            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-void wxListBox::MacAppend( const char * text)
+void wxListBox::MacInsert( int n , 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();
-}
+    wxArrayInt selectionBefore ;
+    MacGetSelections( selectionBefore ) ;

 
 

-void wxListBox::MacClear()
-{
-    LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
-    Refresh();
-}
+    // this has already been increased
+    UInt32 id = m_noItems ;
+    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;

 
 

-void wxListBox::MacSetSelection( int n , bool select )
-{
-    Cell cell = { 0 , 0 } ;
-    if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+    for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i )

     {
     {

-        if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        int current = selectionBefore[i] ;
+        if ( current >= n )

         {
         {

-            LSetSelect( false , cell , (ListHandle)m_macList ) ;
+            MacSetSelection( current + 1 , true ) ;
+            MacSetSelection( current , false ) ;

         }
     }
         }
     }

-    
-    cell.v = n ;
-    LSetSelect( select , cell , (ListHandle)m_macList ) ;
-    LAutoScroll( (ListHandle)m_macList ) ;
-    Refresh();
+
+    // refresh all
+    verify_noerr(
+        m_peer->UpdateItems(
+            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-bool wxListBox::MacIsSelected( int n ) const
+void wxListBox::MacAppend( const wxString& text )

 {
 {

-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
+    UInt32 id = m_noItems ; // this has already been increased
+    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    // no need to deal with selections nor refreshed, as we have appended

 }
 
 }
 

-void wxListBox::MacDestroy()
+void wxListBox::MacClear()

 {
 {

-    //    DisposeExtLDEFInfo( m_macList ) ;
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-int wxListBox::MacGetSelection() const
+void wxListBox::MacDeselectAll()

 {
 {

-    Cell cell = { 0 , 0 } ;
-    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
-        return cell.v ;
-    else
-        return -1 ;
+    bool former = MacSuppressSelection( true ) ;
+    verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
+    MacSuppressSelection( former ) ;

 }
 
 }
 

-int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
+void wxListBox::MacSetSelection( int n , bool select )

 {
 {

-    int no_sel = 0 ;
-    
-    aSelections.Empty();
-    
-    Cell cell = { 0 , 0 } ;
-    cell.v = 0 ;
-    
-    while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+    bool former = MacSuppressSelection( true ) ;
+    UInt32 id = n + 1 ;
+
+    if ( m_peer->IsItemSelected( id ) != select )

     {
     {

-        aSelections.Add( cell.v ) ;
-        no_sel++ ;
-        cell.v++ ;
+        if ( select )
+            verify_noerr( m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ;
+        else
+            verify_noerr( m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ;

     }
     }

-    return no_sel ;
-}

 
 

-void wxListBox::MacSet( int n , const char * 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();
+    MacScrollTo( n ) ;
+    MacSuppressSelection( former ) ;

 }
 
 }
 

-void wxListBox::MacScrollTo( int n )
+bool wxListBox::MacSuppressSelection( bool suppress )

 {
 {

-    // TODO implement scrolling
+    bool former = m_suppressSelection ;
+    m_suppressSelection = suppress ;
+    return former ;

 }
 
 }
 

-void wxListBox::OnSize( const wxSizeEvent &event)
+bool wxListBox::MacIsSelected( int n ) const

 {
 {

-    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 ) ;
+    return m_peer->IsItemSelected( n + 1 ) ;

 }
 
 }
 

-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+int wxListBox::MacGetSelection() const

 {
 {

-    Boolean wasDoubleClick = false ;
-    long    result ;
-    
-    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-    if ( !wasDoubleClick )
+    for ( int i = 0 ; i < GetCount() ; ++i )

     {
     {

-        MacDoClick() ;
+        if ( m_peer->IsItemSelected( i + 1 ) )
+            return i ;

     }
     }

-    else
-    {
-        MacDoDoubleClick() ;
-    }
-}

 
 

-void wxListBox::MacSetRedraw( bool doDraw )
-{
-    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
-    
+    return -1 ;

 }
 
 }
 

-void wxListBox::MacDoClick()
+int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const

 {
 {

-    wxArrayInt aSelections;
-    int n ;
-    size_t count = GetSelections(aSelections);
-    
-    if ( count == m_selectionPreImage.GetCount() )
+    int no_sel = 0 ;
+
+    aSelections.Empty();
+
+    UInt32 first , last ;
+    m_peer->GetSelectionAnchor( &first , &last ) ;
+    if ( first != kDataBrowserNoItem )

     {
     {

-        bool hasChanged = false ;
-        for ( size_t i = 0 ; i < count ; ++i )
+        for ( size_t i = first ; i <= last ; ++i )

         {
         {

-            if ( aSelections[i] != m_selectionPreImage[i] )
+            if ( m_peer->IsItemSelected( i ) )

             {
             {

-                hasChanged = true ;
-                break ;
+                aSelections.Add( i - 1 ) ;
+                no_sel++ ;

             }
         }
             }
         }

-        if ( !hasChanged )
-        {
-            return ;
-        }

     }
     }

-    
-    m_selectionPreImage = aSelections;
-    
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-    event.SetEventObject( this );
-    
-    if ( count > 0 )
-    {
-        n = aSelections[0];
-        if ( HasClientObjectData() )
-            event.SetClientObject( GetClientObject(n) );
-        else if ( HasClientUntypedData() )
-            event.SetClientData( GetClientData(n) );
-        event.SetString( GetString(n) );
-    }
-    else
-    {
-        n = -1;
-    }
-    
-    event.m_commandInt = n;
-    
-    GetEventHandler()->ProcessEvent(event);
+
+    return no_sel ;
+}
+
+void wxListBox::MacSet( int n , const wxString& text )
+{
+    // as we don't store the strings we only have to issue a redraw
+    UInt32 id = n + 1 ;
+    verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-void wxListBox::MacDoDoubleClick()
+void wxListBox::MacScrollTo( int n )

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event) ;
+    UInt32 id = n + 1 ;
+    verify_noerr( m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;

 }
 
 }
 

+#if !TARGET_API_MAC_OSX
+

 void wxListBox::OnChar(wxKeyEvent& 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() ;
     if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
     {
         wxWindow* parent = GetParent() ;

-        while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
+
+        while ( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )

             parent = parent->GetParent() ;
             parent = parent->GetParent() ;

-        
+

         if ( parent && parent->GetDefaultItem() )
         {
         if ( parent && parent->GetDefaultItem() )
         {

-            wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                wxButton);
+            wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton);

             if ( def && def->IsEnabled() )
             {
             if ( def && def->IsEnabled() )
             {

-                wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                event.SetEventObject(def);
-                def->Command(event);
+                wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                event.SetEventObject( def );
+                def->Command( event );
+

                 return ;
             }
         }
                 return ;
             }
         }

+

         event.Skip() ;
     }
         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() ) )
     {
     /* 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 ) ;
         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;

-        wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-        new_event.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( new_event );
+        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 )
     {
     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {


@@ -983,58 +840,60 @@ void wxListBox::OnChar(wxKeyEvent& event)
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;

-        
-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+
+        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId );

         event.SetEventObject( this );
         event.SetEventObject( this );

-        
+

         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )
         {
             n = aSelections[0];
             if ( HasClientObjectData() )
         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )
         {
             n = aSelections[0];
             if ( HasClientObjectData() )

-                event.SetClientObject( GetClientObject(n) );
+                event.SetClientObject( GetClientObject( n ) );

             else if ( HasClientUntypedData() )
             else if ( HasClientUntypedData() )

-                event.SetClientData( GetClientData(n) );
-            event.SetString( GetString(n) );
+                event.SetClientData( GetClientData( n ) );
+            event.SetString( GetString( n ) );

         }
         else
         {
             n = -1;
         }
         }
         else
         {
             n = -1;
         }

-        
-        event.m_commandInt = n;
-        
+
+        event.SetInt( n );
+

         GetEventHandler()->ProcessEvent(event);
     }
     else
     {
         if ( event.GetTimestamp() > m_lastTypeIn + 60 )
         GetEventHandler()->ProcessEvent(event);
     }
     else
     {
         if ( event.GetTimestamp() > m_lastTypeIn + 60 )

-        {
-            m_typeIn = "" ;
-        }
+            m_typeIn = wxEmptyString ;
+

         m_lastTypeIn = event.GetTimestamp() ;
         m_typeIn += (char) event.GetKeyCode() ;
         m_lastTypeIn = event.GetTimestamp() ;
         m_typeIn += (char) event.GetKeyCode() ;

-        int line = FindString("*"+m_typeIn+"*") ;
+        int line = FindString( wxT("*") + m_typeIn + wxT("*") ) ;

         if ( line >= 0 )
         {
             if ( GetSelection() != line )
             {
         if ( line >= 0 )
         {
             if ( GetSelection() != line )
             {

-                SetSelection(line) ;
-                wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+                SetSelection( line ) ;
+
+                wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId );

                 event.SetEventObject( this );
                 event.SetEventObject( this );

-                
+

                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )

-                    event.SetClientData( GetClientData(line) );
-                event.SetString( GetString(line) );
-                
-                event.m_commandInt = line ;
-                
+                    event.SetClientData( GetClientData( line ) );
+                event.SetString( GetString( line ) );
+                event.SetInt( line );
+

                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 
                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 

+#endif // !TARGET_API_MAC_OSX
+
+#endif