cleanup - reformat

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 05cc0e249a6927baa3f82ebd2461c8aa253ea602..715abf0db01bfa23c18bd83361aa8ca5804ff296 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,373 +1,492 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxListBox
 // Purpose:     wxListBox

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // 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"

+#include "wx/button.h"

 #include "wx/settings.h"
 #include "wx/settings.h"

+#include "wx/toplevel.h"

 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"

-#ifdef __UNIX__
-  #include "ldef/extldef.h"
-#else
-  #include "extldef.h"
-#endif

 
 

-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+#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)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

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

 END_EVENT_TABLE()
 END_EVENT_TABLE()

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

+{
+    long ref = GetControlReference( browser ) ;
+    if ( ref )
+    {
+        wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
+        int i = itemID - 1 ;
+        if (i >= 0 && i < list->GetCount() )
+        {
+            bool trigger = false ;
+            wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+            switch ( message )
+            {
+                case kDataBrowserItemDeselected :
+                    if ( list->HasMultipleSelection() )
+                        trigger = !list->MacIsSelectionSuppressed() ;
+                    break ;
+
+                case kDataBrowserItemSelected :
+                    trigger = !list->MacIsSelectionSuppressed() ;
+                    break ;
+
+                case kDataBrowserItemDoubleClicked :
+                    event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED ) ;
+                    trigger = true ;
+                    break ;
+
+                default :
+                    break ;
+            }
+
+            if ( trigger )
+            {
+                event.SetEventObject( list );
+                if ( list->HasClientObjectData() )
+                    event.SetClientObject( list->GetClientObject( i ) );
+                else if ( list->HasClientUntypedData() )
+                    event.SetClientData( list->GetClientData( i ) );
+                event.SetString( list->GetString( i ) );
+                event.SetInt( i ) ;
+                event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
+                wxPostEvent( list->GetEventHandler() , event ) ;
+                // direct notification is not always having the listbox GetSelection() having in synch with event
+                // list->GetEventHandler()->ProcessEvent(event) ;
+            }
+        }
+    }
+}

 
 

-#include <wx/mac/uma.h>
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+    DataBrowserItemID itemID, DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData, Boolean changeValue)
+{
+    OSStatus err = errDataBrowserPropertyNotSupported;

 
 

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

 
 

-// ============================================================================
-// list box control implementation
-// ============================================================================
+    return err;
+}
+
+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 )
+    {
+        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 ;
-}
-
-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_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 ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, 
-               kControlListBoxProc , (long) this ) ;
-       
-       long    result ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
-
-       HLock( (Handle) m_macList ) ;
-       NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = 0 ;
-       if ( style & wxLB_MULTIPLE )
-       {
-               (**m_macList).selFlags += lNoExtend ;
-       }
-       else if ( style & wxLB_EXTENDED )
-       {
-               (**m_macList).selFlags += lExtendDrag ;
-       }
-       else
-       {
-               (**m_macList).selFlags = lOnlyOne ;
-       }
-       Point pt = (**m_macList).cellSize ;
-       pt.v = 14 ;
-       LCellSize( pt , m_macList ) ;
-
-       LAddColumn( 1 , 0 , m_macList ) ;
-
-       MacPostControlCreate() ;
-
-       ControlFontStyleRec             controlstyle ;
-       controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
-       //controlstyle.font = kControlFontSmallSystemFont ;
-       controlstyle.font = kFontIDMonaco ;
-       controlstyle.size = 9 ;
-       ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
-
-       for ( int i = 0 ; i < n ; i++ )
-       {
-               Append( choices[i] ) ;
-       }
-
-       LSetDrawingMode( true , m_macList ) ;
-
-  return TRUE;
+    m_noItems = 0;
+    m_selected = 0;
+    m_macList = NULL ;
+    m_suppressSelection = false ;

 }
 
 }
 

-wxListBox::~wxListBox()
+bool wxListBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)

 {
 {

-       Free() ;
-       if ( m_macList )
-       {
-               DisposeExtLDEFInfo( m_macList ) ;
-               m_macList = NULL ;
-       }
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);

 }
 
 }
 

-void wxListBox::Free()
+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)

 {
 {

-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
+    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;
+
+    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 )

     {
     {

-        size_t uiCount = m_aItems.Count();
-        while ( uiCount-- != 0 ) {
-            delete m_aItems[uiCount];
-        }
+        gDataBrowserItemNotificationUPP =
+#if TARGET_API_MAC_OSX
+            (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+    }
+
+    if ( gDataBrowserDrawItemUPP == NULL )
+        gDataBrowserDrawItemUPP = NewDataBrowserDrawItemUPP(ListBoxDrawProc) ;
+
+    DataBrowserCallbacks callbacks ;
+    InitializeDataBrowserCallbacks( &callbacks , kDataBrowserLatestCallbacks ) ;

 
 

-        m_aItems.Clear();
+    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+    callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+    m_peer->SetCallbacks( &callbacks);
+
+    DataBrowserCustomCallbacks customCallbacks ;
+    InitializeDataBrowserCustomCallbacks( &customCallbacks , kDataBrowserLatestCustomCallbacks ) ;
+
+    customCallbacks.u.v1.drawItemCallback = gDataBrowserDrawItemUPP ;
+
+    SetDataBrowserCustomCallbacks( m_peer->GetControlRef() , &customCallbacks ) ;
+
+    DataBrowserListViewColumnDesc columnDesc ;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+    columnDesc.headerBtnDesc.btnFontStyle.flags = 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( "" );
+
+    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
+
+    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] ) ;

     }
     }

-    else
-#endif // wxUSE_OWNER_DRAWN
+
+    // Needed because it is a wxControlWithItems
+    SetBestSize(size);
+
+    return true;
+}
+
+wxListBox::~wxListBox()
+{
+    m_peer->SetReference( 0 ) ;
+    FreeData() ;
+
+    // avoid access during destruction
+    if ( m_macList )
+        m_macList = NULL ;
+}
+
+void wxListBox::FreeData()
+{

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

         }
     }
 }
 
         }
     }
 }
 

-void wxListBox::DoSetFirstItem(int N)
+void  wxListBox::DoSetSize(int x, int y,
+            int width, int height,
+            int sizeFlags )

 {
 {

-       MacScrollTo( N ) ;
+    wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    MacScrollTo( n ) ;
+}
+
+void wxListBox::Delete(int n)
+{
+    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.Remove(N);
-#else // !wxUSE_OWNER_DRAWN

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

-    {
-        delete GetClientObject(N);
-    }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-       m_stringArray.Remove( N ) ;
-       m_dataArray.Remove( N ) ;
-       m_noItems --;
-       
-       MacDelete( N ) ;
+        delete GetClientObject( 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)
 {

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

 
 

-       return index ;
+    return index ;

 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)

-{ 
-  MacSetRedraw( false ) ;
-  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"));
-#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.Empty();
+{
+    Clear() ;
+    int n = choices.GetCount();

 
 

-        // 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 ( int i = 0 ; i < n ; ++i )
+    {
+        if ( clientData )
+            Append( choices[i] , clientData[i] ) ;
+        else
+            Append( choices[i] ) ;

     }
     }

-#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);
-}
+    if ( s.Right(1) == wxT("*") )
+    {
+        wxString search = s.Left( s.Length() - 1 ) ;
+        int len = search.Length() ;
+        Str255 s1 , s2 ;
+        wxMacStringToPascal( search , s2 ) ;

 
 

-int wxListBox::FindString(const wxString& st) const
-{
-       wxString s ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-       {
-               s = wxMacMakeMacStringFromPC( st ) ;
-       }
-       else
-               s = st ;
-               
-       if ( s.Right(1) == "*" )
-       {
-               wxString search = s.Left( s.Length() - 1 ) ;
-               int len = search.Length() ;
-               Str255 s1 , s2 ;
+        for ( int i = 0 ; i < m_noItems ; ++ i )
+        {
+            wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;

 
 

-#if TARGET_CARBON
-               c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
-#else
-               strcpy( (char *) s2 , search.c_str() ) ;
-               c2pstr( (char *) s2 ) ;
-#endif
+            if ( EqualString( s1 , s2 , bCase , false ) )
+                return 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 ) )
-                       return i ;
-           }
-           if ( s.Left(1) = "*" && s.Length() > 1 )
-           {
-               s.MakeLower() ;
-                   for ( int i = 0 ; i < m_noItems ; ++i )
-                       {
-                               if ( GetString(i).Lower().Matches(s) )
-                                       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
+        if ( s.Left(1) == wxT("*") && s.Length() > 1 )
+        {
+            wxString st = s ;
+            st.MakeLower() ;
+
+            for ( int i = 0 ; i < m_noItems ; ++i )
+            {
+                if ( GetString( i ).Lower().Matches(st) )
+                    return i ;
+            }
+        }
+    }
+    else
+    {
+        Str255 s1 , 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
-               if ( EqualString( s1 , s2 , false , false ) )
-                       return i ;
-           }
-   }
-   return -1;
+        wxMacStringToPascal( s , s2 ) ;
+
+        for ( int i = 0 ; i < m_noItems ; ++ i )
+        {
+            wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+
+            if ( EqualString( s1 , s2 , bCase , false ) )
+                return i ;
+        }
+    }
+
+    return wxNOT_FOUND;

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

-  Free();
-  m_noItems = 0;
-  m_stringArray.Empty() ;
-  m_dataArray.Empty() ;
-  MacClear() ;
+    FreeData();
+    m_noItems = 0;
+    m_stringArray.Empty() ;
+    m_dataArray.Empty() ;
+    MacClear() ;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
-       MacSetSelection( N , select ) ;
+    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" );
+    wxCHECK_MSG( n >= 0 && n < m_noItems, false,
+        wxT("invalid index in wxListBox::Selected") );

 
 

-       return MacIsSelected( N ) ;
+    return MacIsSelected( n ) ;

 }
 
 }
 

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

 {
 {

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


@@ -378,76 +497,110 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {

-       return MacGetSelections( aSelections ) ;
-
-/* TODO
-    if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED))
-    {
-        int no_sel = ??
-        for ( int n = 0; n < no_sel; n++ )
-            aSelections.Add(??);
-
-        return no_sel;
-    }
-    else  // single-selection listbox
-    {
-        aSelections.Add(??);
-
-        return 1;
-    }
-*/
+    return MacGetSelections( aSelections ) ;

 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {
 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {

-       return MacGetSelection() ;
+    return MacGetSelection() ;

 }
 
 // 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,
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,

-                 wxT("invalid index in wxListBox::InsertItems") );
+        wxT("invalid index in wxListBox::InsertItems") );

 
 

-    int nItems = items.GetCount();
+    InvalidateBestSize();

 
 

-       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] ) ;
-       }
+    int nItems = items.GetCount();

 
 

-    m_noItems += nItems;
+    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] ) ;
+    }

 }
 
 }
 

-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
 {

-    return wxSize(100, 100);
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) ) ;
+
+        // TODO: clean this up
+        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 ;
+
+            // 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() ) ;
+#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
 }
 
 int wxListBox::GetCount() const


@@ -455,206 +608,292 @@ int wxListBox::GetCount() const
     return m_noItems;
 }
 
     return m_noItems;
 }
 

-void wxListBox::SetupColours()
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(GetParent()->GetForegroundColour());
+    wxControl::Refresh( eraseBack , rect ) ;

 }
 
 }
 

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

 
 

-void wxListBox::MacDelete( int N )
-{
-       ListHandle list ;
-       long    result ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list  , &result ) ;
-       LDelRow( 1 , N , list ) ;
+    UInt32 id = m_noItems + 1 ;
+
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    for ( size_t i = 0 ; i < selectionBefore.GetCount() ; ++i )
+    {
+        int current = selectionBefore[i] ;
+        if ( current == n )
+        {
+            // selection was deleted
+            MacSetSelection( current , false ) ;
+        }
+        else if ( current > n )
+        {
+            // something behind the deleted item was selected -> move up
+            MacSetSelection( current - 1 , true ) ;
+            MacSetSelection( current , false ) ;
+        }
+    }
+
+    // refresh all
+    verify_noerr(
+        m_peer->UpdateItems(
+            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-void wxListBox::MacInsert( int n , const char * text) 
+void wxListBox::MacInsert( int n , const wxString& text )

 {
 {

-       Cell    cell ;
+    wxArrayInt selectionBefore ;
+    MacGetSelections( selectionBefore ) ;

 
 

-       cell.h = 0 ;
-       cell.v = n ;
+    // this has already been increased
+    UInt32 id = m_noItems ;
+    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;

 
 

-       LAddRow( 1 , cell.v , m_macList ) ;
+    for ( int i = selectionBefore.GetCount()-1 ; i >= 0 ; --i )
+    {
+        int current = selectionBefore[i] ;
+        if ( current >= n )
+        {
+            MacSetSelection( current + 1 , true ) ;
+            MacSetSelection( current , false ) ;
+        }
+    }
+
+    // refresh all
+    verify_noerr(
+        m_peer->UpdateItems(
+            kDataBrowserNoItem, 1, (UInt32*)kDataBrowserNoItem,
+            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty ) ) ;

 }
 
 }
 

-void wxListBox::MacAppend( const char * text) 
+void wxListBox::MacAppend( const wxString& text )

 {
 {

-       Cell cell = { 0 , 0 } ;
-       cell.v = (**m_macList).dataBounds.bottom ;
-       LAddRow( 1 , cell.v , 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::MacClear() 
+void wxListBox::MacClear()

 {
 {

-       LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+}
+
+void wxListBox::MacDeselectAll()
+{
+    bool former = MacSuppressSelection( true ) ;
+    verify_noerr(m_peer->SetSelectedItems( 0 , NULL , kDataBrowserItemsRemove ) ) ;
+    MacSuppressSelection( former ) ;

 }
 
 void wxListBox::MacSetSelection( int n , bool select )
 {
 }
 
 void wxListBox::MacSetSelection( int n , bool select )
 {

-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( TRUE , &cell , m_macList ) )
-       {
-               LSetSelect( false , cell , m_macList ) ;
-       }
-       
-       cell.v = n ;
-       LSetSelect( select , cell , m_macList ) ;
-       LAutoScroll( m_macList ) ;
+    bool former = MacSuppressSelection( true ) ;
+    UInt32 id = n + 1 ;
+
+    if ( m_peer->IsItemSelected( id ) != select )
+    {
+        if ( select )
+            verify_noerr( m_peer->SetSelectedItems( 1 , & id , HasMultipleSelection() ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ) ) ;
+        else
+            verify_noerr( m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsRemove ) ) ;
+    }
+
+    MacScrollTo( n ) ;
+    MacSuppressSelection( former ) ;

 }
 
 }
 

-bool wxListBox::MacIsSelected( int n ) const
+bool wxListBox::MacSuppressSelection( bool suppress )

 {
 {

-       Cell cell = { 0 , 0 } ;
-       cell.v = n ;
-       return LGetSelect( false , &cell , m_macList ) ;
+    bool former = m_suppressSelection ;
+    m_suppressSelection = suppress ;
+    return former ;

 }
 
 }
 

-void wxListBox::MacDestroy()
+bool wxListBox::MacIsSelected( int n ) const

 {
 {

-//     DisposeExtLDEFInfo( m_macList ) ;
+    return m_peer->IsItemSelected( n + 1 ) ;

 }
 
 int wxListBox::MacGetSelection() const
 {
 }
 
 int wxListBox::MacGetSelection() const
 {

-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( true , &cell , m_macList ) )
-               return cell.v ;
-       else
-               return -1 ;
+    for ( int i = 0 ; i < GetCount() ; ++i )
+    {
+        if ( m_peer->IsItemSelected( i + 1 ) )
+            return i ;
+    }
+
+    return -1 ;

 }
 
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
 }
 
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {

-       int no_sel = 0 ;
-       
+    int no_sel = 0 ;
+

     aSelections.Empty();
 
     aSelections.Empty();
 

-       Cell cell = { 0 , 0 } ;
-       cell.v = 0 ;
-       
-       while ( LGetSelect( true , &cell , m_macList ) )
-       {
-               aSelections.Add( cell.v ) ;
-               no_sel++ ;
-               cell.v++ ;
-       }
-       return no_sel ;
+    UInt32 first , last ;
+    m_peer->GetSelectionAnchor( &first , &last ) ;
+    if ( first != kDataBrowserNoItem )
+    {
+        for ( size_t i = first ; i <= last ; ++i )
+        {
+            if ( m_peer->IsItemSelected( i ) )
+            {
+                aSelections.Add( i - 1 ) ;
+                no_sel++ ;
+            }
+        }
+    }
+
+    return no_sel ;

 }
 
 }
 

-void wxListBox::MacSet( int n , const char * text )
+void wxListBox::MacSet( int n , const wxString& text )

 {
 {

-       // our implementation does not store anything in the list
-       // so we just have to redraw
-       Cell cell = { 0 , 0 } ;
-       cell.v = n ;
-       LDraw( cell , m_macList ) ;
+    // as we don't store the strings we only have to issue a redraw
+    UInt32 id = n + 1 ;
+    verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;

 }
 
 void wxListBox::MacScrollTo( int n )
 {
 }
 
 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)
-{
-       Point pt = (**m_macList).cellSize ;
-       pt.h =  m_width - 15  ;
-       LCellSize( pt , m_macList ) ;
-}
+#if !TARGET_API_MAC_OSX

 
 

-void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxListBox::OnChar(wxKeyEvent& event)

 {
 {

-       Boolean wasDoubleClick = false ;
-       long    result ;
+    // TODO: trigger proper events here
+    event.Skip() ;
+    return ;

 
 

-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-       if ( !wasDoubleClick )
-       {
-               MacDoClick() ;
-       }
-       else
-       {
-               MacDoDoubleClick() ;
-       }
-}
+    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
+    {
+        wxWindow* parent = GetParent() ;

 
 

-void wxListBox::MacSetRedraw( bool doDraw ) 
-{
-       LSetDrawingMode( doDraw , m_macList ) ;
-       
-}
+        while ( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
+            parent = parent->GetParent() ;

 
 

-void wxListBox::MacDoClick()
-{
-       wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-    event.SetEventObject( this );
+        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 ;
+            }
+        }

 
 

-       wxArrayInt aSelections;
-       int n, count = GetSelections(aSelections);
-       if ( count > 0 )
-       {
-           n = aSelections[0];
-           if ( HasClientObjectData() )
-              event.SetClientObject( GetClientObject(n) );
-          else if ( HasClientUntypedData() )
-              event.SetClientData( GetClientData(n) );
-          event.SetString( GetString(n) );
-       }
-       else
-       {
-         n = -1;
-       }
-       
-    event.m_commandInt = n;
+        event.Skip() ;
+    }

 
 

-    GetEventHandler()->ProcessEvent(event);
-}
+    /* 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 ) ;

 
 

-void wxListBox::MacDoDoubleClick()
-{
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-    event.SetEventObject( this );
-       GetEventHandler()->ProcessEvent(event) ; 
+        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId );
+        event.SetEventObject( this );
+
+        wxArrayInt aSelections;
+        int n, count = GetSelections(aSelections);
+        if ( count > 0 )
+        {
+            n = aSelections[0];
+            if ( HasClientObjectData() )
+                event.SetClientObject( GetClientObject( n ) );
+            else if ( HasClientUntypedData() )
+                event.SetClientData( GetClientData( n ) );
+            event.SetString( GetString( n ) );
+        }
+        else
+        {
+            n = -1;
+        }
+
+        event.SetInt( 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.SetInt( line );
+
+                GetEventHandler()->ProcessEvent(event);
+            }
+        }
+    }

 }
 }

+
+#endif // !TARGET_API_MAC_OSX
+
+#endif