BU_EXACTFIT adapted

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index dc3f4d20bbaaebcba79556a1085f7ba67e2ed57a..361bc4def7de3a2a6ff0e01fefb9be50f5f31807 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listbox.cpp
 // Purpose:     wxListBox
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listbox.cpp
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -15,6 +15,7 @@
 
 #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/toplevel.h"
 #include "wx/dynarray.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 #include "wx/dynarray.h"


@@ -23,138 +24,135 @@
 #include "wx/utils.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/utils.h"
 
 #if !USE_SHARED_LIBRARY

-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

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

-       EVT_SIZE( wxListBox::OnSize ) 
-       EVT_CHAR( wxListBox::OnChar )
+#if !__WXMAC_OSX__
+    EVT_SIZE( wxListBox::OnSize )
+    EVT_CHAR( wxListBox::OnChar )
+#endif

 END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
 
 END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
 

-#if PRAGMA_STRUCT_ALIGN
-    #pragma options align=mac68k
-#elif PRAGMA_STRUCT_PACKPUSH
-    #pragma pack(push, 2)
-#elif PRAGMA_STRUCT_PACK
-    #pragma pack(2)
-#endif
+const short kTextColumnId = 1024 ;

 
 

-typedef struct {
- unsigned short instruction;
- void (*function)();
-} ldefRec, *ldefPtr, **ldefHandle;
-
-#if PRAGMA_STRUCT_ALIGN
-    #pragma options align=reset
-#elif PRAGMA_STRUCT_PACKPUSH
-    #pragma pack(pop)
-#elif PRAGMA_STRUCT_PACK
-    #pragma pack()
-#endif
+// new databrowserbased version

 
 

-extern "C"
+// Listbox item
+wxListBox::wxListBox()

 {
 {

-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
-                                     Cell cell, short dataOffset, short dataLength,
-                                     ListHandle listHandle ) ;
+  m_noItems = 0;
+  m_selected = 0;
+  m_macList = NULL ;

 }
 
 }
 

-static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
-                                     Cell cell, short dataOffset, short dataLength,
-                                     ListHandle listHandle )
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       const wxArrayString& choices,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)

 {
 {

-    GrafPtr savePort;
-    GrafPtr grafPtr;
-    RgnHandle savedClipRegion;
-    SInt32 savedPenMode;
-    wxListBox*          list;
-  GetPort(&savePort);
-  SetPort((**listHandle).port);
-  grafPtr = (**listHandle).port ;
-    // typecast our refCon
-    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
-    
-    //  Calculate the cell rect.
-    
-    switch( message ) {
-        case lInitMsg:
-            break;
+    wxCArrayString chs(choices);

 
 

-        case lCloseMsg:
-            break;
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}

 
 

-        case lDrawMsg:
-        {
-            const wxString text = list->m_stringArray[cell.v] ;
-
-            //  Save the current clip region, and set the clip region to the area we are about
-            //  to draw.
-            
-            savedClipRegion = NewRgn();
-            GetClip( savedClipRegion );
-
-            ClipRect( drawRect );
-            EraseRect( drawRect );
-            
-        MoveTo(drawRect->left + 4 , drawRect->top + 10 );
-        ::TextFont( kFontIDMonaco ) ;
-        ::TextSize( 9  );
-        ::TextFace( 0 ) ;
- 
-        DrawText(text, 0 , text.Length());
-            //  If the cell is hilited, do the hilite now. Paint the cell contents with the
-            //  appropriate QuickDraw transform mode.
-            
-            if( isSelected ) {
-                savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
-                SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
-                PaintRect( drawRect );
-                SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
-            }
-            
-            //  Restore the saved clip region.
-            
-            SetClip( savedClipRegion );
-            DisposeRgn( savedClipRegion );
+#if TARGET_API_MAC_OSX
+static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
+    DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
+#else
+static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
+    DataBrowserItemNotification message)
+#endif
+{
+    long ref = GetControlReference( browser ) ;
+    if ( ref )
+    {
+        wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
+        for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
+            if ( list->m_idArray[i] == (long) itemID )
+            {
+                bool trigger = false ;
+                wxCommandEvent event(
+                    wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+                switch( message )
+                {
+                    case kDataBrowserItemDeselected :
+                        if ( list->HasMultipleSelection() )
+                            trigger = true ;
+                        break ;
+                    case kDataBrowserItemSelected :
+                        trigger = true ;
+                        break ;
+                    case kDataBrowserItemDoubleClicked :
+                        event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ;
+                        trigger = true ;
+                        break ;
+                    default :
+                        break ;
+                }
+                if ( trigger )
+                {
+                    event.SetEventObject( list );
+                    if ( list->HasClientObjectData() )
+                        event.SetClientObject( list->GetClientObject(i) );
+                    else if ( list->HasClientUntypedData() )
+                        event.SetClientData( list->GetClientData(i) );
+                    event.SetString( list->GetString(i) );
+                    event.SetInt(i) ;
+                    event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
+                    wxPostEvent( list->GetEventHandler() , event ) ;
+                    // direct notification is not always having the listbox GetSelection() having in synch with event
+                    // list->GetEventHandler()->ProcessEvent(event) ; 
+                } 
+                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);  

 }
 
 }
 

-extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
-const short kwxMacListWithVerticalScrollbar = 128 ;
-const short kwxMacListItemHeight = 14 ;
-
-// ============================================================================
-// list box control implementation
-// ============================================================================

 
 

-// Listbox item
-wxListBox::wxListBox()
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, 
+    DataBrowserItemID itemID, DataBrowserPropertyID property, 
+    DataBrowserItemDataRef itemData, Boolean changeValue)

 {
 {

-  m_noItems = 0;
-  m_selected = 0;
-  m_macList = NULL ;
+       OSStatus err = errDataBrowserPropertyNotSupported;
+       
+       if ( ! changeValue )
+       {       
+       switch (property)
+       {
+               
+           case kTextColumnId:
+               {       
+                   long ref = GetControlReference( browser ) ;
+                   if ( ref )
+                   {
+                       wxListBox* list = wxDynamicCast( (wxObject*) ref , wxListBox ) ;
+                       for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
+                           if ( list->m_idArray[i] == (long) itemID )
+                           {
+                               wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
+                               verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+                               err = noErr ;
+                               break ;
+                           }
+                       }
+               }       
+               break;
+                               
+               default:
+               
+               break;
+       }
+       }
+       
+       return err;

 }
 }

-
-static ListDefUPP macListDefUPP = NULL ;
-

 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,


@@ -163,96 +161,106 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        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;

+    m_nextId = 1 ;

     
     

-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;

 
 

-    ListDefSpec listDef;
-    listDef.defType = kListDefUserProcType;
-    if ( macListDefUPP == NULL )
-    {
-      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
-    }
-        listDef.u.userProc = macListDefUPP ;
-
-#if TARGET_CARBON
-    Size asize;
-
-
-    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
-                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
-
-    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
-                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
-
-    SetControlReference( (ControlHandle) m_macControl, (long) this);
-    SetControlVisibility( (ControlHandle) m_macControl, false, false);
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

 
 

-#else
+    m_peer = new wxMacControl() ;
+    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , *m_peer ) );

 
 

-    long    result ;
-    wxStAppResource resload ;
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
-                  kwxMacListWithVerticalScrollbar , 0 , 0, 
-                  kControlListBoxProc , (long) this ) ;
-    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
-               sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
-
-    HLock( (Handle) m_macList ) ;
-    ldefHandle ldef ;
-    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
-    if (  (**(ListHandle)m_macList).listDefProc != NULL )
-    {
-      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
-      (**ldef).function = (void(*)()) listDef.u.userProc;
-      (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
-    }
-        
-    Point pt = (**(ListHandle)m_macList).cellSize ;
-    pt.v = kwxMacListItemHeight ;
-    LCellSize( pt , (ListHandle)m_macList ) ;
-    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
-#endif
-    OptionBits  options = 0;
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;

     if ( style & wxLB_MULTIPLE )
     {
     if ( style & wxLB_MULTIPLE )
     {

-        options += lNoExtend ;
+        options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection  ;

     }
     else if ( style & wxLB_EXTENDED )
     {
     }
     else if ( style & wxLB_EXTENDED )
     {

-        options += lExtendDrag ;
+        // default behaviour

     }
     else
     {
     }
     else
     {

-        options = lOnlyOne ;
-    }
-    SetListSelectionFlags((ListHandle)m_macList, options);
+        options += kDataBrowserSelectOnlyOne ;
+    }
+    verify_noerr(SetDataBrowserSelectionFlags  (*m_peer, options ) ); 
+
+    DataBrowserListViewColumnDesc columnDesc ;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+       columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+               
+       columnDesc.headerBtnDesc.btnFontStyle.flags     = 
+               kControlUseFontMask | kControlUseJustMask;
+       
+       columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+       columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+       columnDesc.headerBtnDesc.minimumWidth = 0;
+       columnDesc.headerBtnDesc.maximumWidth = 10000;
+       
+       columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+       columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+       columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
+
+       columnDesc.propertyDesc.propertyID = kTextColumnId;
+       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+       columnDesc.propertyDesc.propertyFlags =
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+        kDataBrowserListViewTypeSelectColumn | 
+#endif
+        kDataBrowserTableViewSelectionColumn ;
+
+       
+       verify_noerr(::AddDataBrowserListViewColumn(*m_peer, &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+    verify_noerr(::AutoSizeDataBrowserListViewColumns( *m_peer ) ) ;
+    verify_noerr(::SetDataBrowserHasScrollBars( *m_peer , false , true ) ) ;
+    verify_noerr(::SetDataBrowserTableViewHiliteStyle( *m_peer, kDataBrowserTableViewFillHilite  ) ) ;
+    verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( *m_peer , 0 ) ) ;
+    DataBrowserCallbacks callbacks ;

     
     

-    MacPostControlCreate() ;
+    callbacks.version = kDataBrowserLatestCallbacks;

     
     

+    InitDataBrowserCallbacks(&callbacks);
+    
+    callbacks.u.v1.itemDataCallback = 
+        NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
+       
+       callbacks.u.v1.itemNotificationCallback =
+#if TARGET_API_MAC_OSX
+           (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+#else
+           NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+#endif
+    SetDataBrowserCallbacks(*m_peer, &callbacks);
+
+    MacPostControlCreate(pos,size) ;
+

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

-    
-    LSetDrawingMode( true , (ListHandle)m_macList ) ;

 
 

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

     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {
     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {

+    SetControlReference( *m_peer , NULL ) ;

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


@@ -286,22 +294,8 @@ 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)
 {
     MacScrollTo( N ) ;
 void wxListBox::DoSetFirstItem(int N)
 {
     MacScrollTo( N ) ;


@@ -324,22 +318,15 @@ void wxListBox::Delete(int N)
     m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     m_noItems --;
     m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     m_noItems --;

-    
+

     MacDelete( N ) ;
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
     int index = m_noItems ;
     MacDelete( N ) ;
 }
 
 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_stringArray.Add( item ) ;
+    m_dataArray.Add( NULL );

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


@@ -348,26 +335,25 @@ 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();
-
-  for( int i = 0 ; i < n ; ++i )
-  {
-    if ( clientData )
+{
+    Clear() ;
+    int n = choices.GetCount();
+    
+    for( int i = 0 ; i < n ; ++i )

     {
     {

+        if ( clientData )
+        {

 #if wxUSE_OWNER_DRAWN
             wxASSERT_MSG(clientData[i] == NULL,
 #if wxUSE_OWNER_DRAWN
             wxASSERT_MSG(clientData[i] == NULL,

-                         wxT("Can't use client data with owner-drawn listboxes"));
+                wxT("Can't use client data with owner-drawn listboxes"));

 #else // !wxUSE_OWNER_DRAWN
 #else // !wxUSE_OWNER_DRAWN

-        Append( choices[i] , clientData[i] ) ;
- #endif
+            Append( choices[i] , clientData[i] ) ;
+#endif
+        }
+        else
+            Append( choices[i] ) ;

     }
     }

-    else
-        Append( choices[i] ) ;
-  }
-
+    

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items


@@ -377,7 +363,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();

-
+        

         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);
         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);


@@ -386,116 +372,84 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         }
     }
 #endif // wxUSE_OWNER_DRAWN
         }
     }
 #endif // wxUSE_OWNER_DRAWN

-  MacSetRedraw( true ) ;

 }
 
 }
 

-bool wxListBox::HasMultipleSelection() const
+int wxListBox::FindString(const wxString& s) const

 {
 {

-    return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
-}
-
-int wxListBox::FindString(const wxString& st) const
-{
-    wxString s ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        s = wxMacMakeMacStringFromPC( st ) ;
-    }
-    else
-        s = st ;
-        
-    if ( s.Right(1) == "*" )
+    
+    if ( s.Right(1) == wxT("*") )

     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;
     {
         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
+               wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+

             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }

-        if ( s.Left(1) == "*" && s.Length() > 1 )
+        if ( s.Left(1) == wxT("*") && s.Length() > 1 )

         {
         {

-            s = st ;
-            s.MakeLower() ;
+            wxString st = s ;
+            st.MakeLower() ;

             for ( int i = 0 ; i < m_noItems ; ++i )
             {
             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
+               wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+

             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }

-   }
-   return -1;
+    }
+    return -1;

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

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

 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-                 "invalid index in wxListBox::SetSelection" );
-      MacSetSelection( N , select ) ;
-      GetSelections( m_selectionPreImage ) ;
+        wxT("invalid index in wxListBox::SetSelection") );
+    MacSetSelection( N , select ) ;
+    GetSelections( m_selectionPreImage ) ;

 }
 
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
 }
 
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,

-                 "invalid index in wxListBox::Selected" );
-
-      return MacIsSelected( N ) ;
+        wxT("invalid index in wxListBox::Selected") );
+    
+    return MacIsSelected( N ) ;

 }
 
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
 }
 
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,

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

     return (void *)m_dataArray[N];
 }
 
     return (void *)m_dataArray[N];
 }
 


@@ -507,8 +461,8 @@ wxClientData *wxListBox::DoGetItemClientObject(int N) const
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {


@@ -517,9 +471,9 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN

-    wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;

     
     

-    if ( m_dataArray.GetCount() > N )
+    if ( m_dataArray.GetCount() > (size_t) N )

     {
         m_dataArray[N] = (char*) Client_data ;
     }
     {
         m_dataArray[N] = (char*) Client_data ;
     }


@@ -549,47 +503,87 @@ int wxListBox::GetSelection() const
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {

-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        return      wxMacMakePCStringFromMac( m_stringArray[N] ) ;
-    }
-    else
-        return m_stringArray[N]  ;
+       return m_stringArray[N]  ;

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

-
+    

     for ( int i = 0 ; i < nItems ; i++ )
     {
         m_stringArray.Insert( items[i] , pos + i ) ;
         m_dataArray.Insert( NULL , pos + i ) ;
         MacInsert( pos + i , items[i] ) ;
     }
     for ( int i = 0 ; i < nItems ; i++ )
     {
         m_stringArray.Insert( items[i] , pos + i ) ;
         m_dataArray.Insert( NULL , pos + i ) ;
         MacInsert( pos + i , items[i] ) ;
     }

-
+    

     m_noItems += nItems;
 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {
     m_noItems += nItems;
 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {

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

     MacSet( N , s ) ;
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {
     MacSet( N , s ) ;
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {

-    return wxSize(100, 100);
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; 
+        
+        if ( m_font.Ok() )
+        {
+            ::TextFont( m_font.MacGetFontNum() ) ;
+            ::TextSize( m_font.MacGetFontSize() ) ;
+            ::TextFace( m_font.MacGetFontStyle() ) ;
+        }
+        else
+        {
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9  );
+            ::TextFace( 0 ) ;
+        }
+        
+        // Find the widest line
+        for(int i = 0; i < GetCount(); i++) {
+            wxString str(GetString(i));
+        #if wxUSE_UNICODE
+            Point bounds={0,0} ;
+            SInt16 baseline ;
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h ;
+        #else
+            wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+        #endif
+            lbWidth = wxMax(lbWidth, wLine);
+        }
+        
+        // Add room for the scrollbar
+        lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+        
+        // And just a bit more
+        int cy = 12 ;
+        int cx = ::TextWidth( "X" , 0 , 1 ) ;
+        lbWidth += cx ;
+        
+        // don't make the listbox too tall (limit height to around 10 items) but don't
+        // make it too small neither
+        lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
+    }
+
+    return wxSize(lbWidth, lbHeight);

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


@@ -597,16 +591,10 @@ 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() ;
+    //    MacRedrawControl() ;

 }
 
 #if wxUSE_OWNER_DRAWN
 }
 
 #if wxUSE_OWNER_DRAWN


@@ -634,86 +622,66 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
-{
-    wxListBox*          list;
-    // typecast our refCon
-    list = (wxListBox*)refCon;
-        
-    MoveTo(cellRect->left + 4 , cellRect->top + 10 );
-    const wxString text = list->m_stringArray[lCell.v] ;
-    ::TextFont( kFontIDMonaco ) ;
-    ::TextSize( 9  );
-    ::TextFace( 0 ) ;
-    DrawText(text, 0 , text.Length());
-        
-}
-

 void wxListBox::MacDelete( int N )
 {
 void wxListBox::MacDelete( int N )
 {

-    LDelRow( 1 , N , (ListHandle)m_macList) ;
-    Refresh();
+    UInt32 id = m_idArray[N] ;
+    verify_noerr(::RemoveDataBrowserItems(*m_peer , kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    m_idArray.RemoveAt( N ) ;

 }
 
 }
 

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

 {
 {

-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
-//    LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
+    verify_noerr(::AddDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+    m_idArray.Insert( m_nextId , n ) ;
+    ++m_nextId ;

 }
 
 }
 

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

 {
 {

-    Cell cell = { 0 , 0 } ;
-    cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
-    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
- //   LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
+    verify_noerr(::AddDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+    m_idArray.Add( m_nextId ) ;
+    ++m_nextId ;

 }
 
 }
 

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

 {
 {

-    LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
-    Refresh();
+    verify_noerr(::RemoveDataBrowserItems(*m_peer , kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+    m_idArray.Empty() ;

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

-    Cell cell = { 0 , 0 } ;
-    if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+    UInt32 id = m_idArray[n] ;
+    if ( !(GetWindowStyle() & (wxLB_MULTIPLE|wxLB_EXTENDED) ) )

     {
     {

-        if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        int n = MacGetSelection() ;
+        if ( n >= 0 )

         {
         {

-            LSetSelect( false , cell , (ListHandle)m_macList ) ;
+            UInt32 idOld = m_idArray[n] ;
+            SetDataBrowserSelectedItems(*m_peer , 1 , & idOld , kDataBrowserItemsRemove ) ;

         }
     }
         }
     }

-    
-    cell.v = n ;
-    LSetSelect( select , cell , (ListHandle)m_macList ) ;
-    LAutoScroll( (ListHandle)m_macList ) ;
-    Refresh();
+    if ( ::IsDataBrowserItemSelected( *m_peer , id ) != select )
+    {
+        verify_noerr(::SetDataBrowserSelectedItems(*m_peer , 1 , & id , kDataBrowserItemsToggle ) ) ;
+    }
+    MacScrollTo( n ) ;

 }
 
 bool wxListBox::MacIsSelected( int n ) const
 {
 }
 
 bool wxListBox::MacIsSelected( int n ) const
 {

-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-    return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
-}
-
-void wxListBox::MacDestroy()
-{
-//    DisposeExtLDEFInfo( m_macList ) ;
+    return ::IsDataBrowserItemSelected( *m_peer , m_idArray[n] ) ;

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

-    Cell cell = { 0 , 0 } ;
-    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
-        return cell.v ;
-    else
+    for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
+    {
+        if ( ::IsDataBrowserItemSelected(*m_peer , m_idArray[i] ) )
+        {
+            return i ;
+        }
+    }

         return -1 ;
 }
 
         return -1 ;
 }
 


@@ -722,78 +690,51 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     int no_sel = 0 ;
     
     aSelections.Empty();
     int no_sel = 0 ;
     
     aSelections.Empty();

-
-    Cell cell = { 0 , 0 } ;
-    cell.v = 0 ;
-    
-    while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+    for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )

     {
     {

-        aSelections.Add( cell.v ) ;
-        no_sel++ ;
-        cell.v++ ;
+        if ( ::IsDataBrowserItemSelected(*m_peer , m_idArray[i] ) )
+        {
+            aSelections.Add( i ) ;
+            no_sel++ ;
+        }

     }
     return no_sel ;
 }
 
     }
     return no_sel ;
 }
 

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

 {
 {

-    // our implementation does not store anything in the list
-    // so we just have to redraw
-    Cell cell = { 0 , 0 } ;
-    cell.v = n ;
-//  LSetCell(text, strlen(text), cell, m_macList);
-    Refresh();
+    // as we don't store the strings we only have to issue a redraw
+    UInt32 id = m_idArray[n] ;
+    verify_noerr( ::UpdateDataBrowserItems( *m_peer , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;

 }
 
 void wxListBox::MacScrollTo( int n )
 {
 }
 
 void wxListBox::MacScrollTo( int n )
 {

-    // TODO implement scrolling
+    UInt32 id = m_idArray[n] ;
+    verify_noerr( ::RevealDataBrowserItem(*m_peer , id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;

 }
 
 }
 

-void wxListBox::OnSize( const wxSizeEvent &event)
+#if !TARGET_API_MAC_OSX
+void wxListBox::OnSize( wxSizeEvent &event)

 {
 {

-    Point pt;
-
-#if TARGET_CARBON
-    GetListCellSize((ListHandle)m_macList, &pt);
-#else
-    pt = (**(ListHandle)m_macList).cellSize ;
-#endif
-    pt.h =  m_width - 15  ;
-    LCellSize( pt , (ListHandle)m_macList ) ;

 }
 }

+#endif

 
 

-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxListBox::MacSetRedraw( bool doDraw )

 {
 {

-    Boolean wasDoubleClick = false ;
-    long    result ;
-
-    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-    if ( !wasDoubleClick )
-    {
-        MacDoClick() ;
-    }
-    else
-    {
-        MacDoDoubleClick() ;
-    }
-}
-
-void wxListBox::MacSetRedraw( bool doDraw ) 
-{
-    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
-    
+    // nothing to do in compositing mode

 }
 
 void wxListBox::MacDoClick()
 }
 
 void wxListBox::MacDoClick()

-{
+{/*

     wxArrayInt aSelections;
     wxArrayInt aSelections;

-    int n, count = GetSelections(aSelections);
+    int n ;
+    size_t count = GetSelections(aSelections);

     
     if ( count == m_selectionPreImage.GetCount() )
     {
         bool hasChanged = false ;
     
     if ( count == m_selectionPreImage.GetCount() )
     {
         bool hasChanged = false ;

-        for ( int i = 0 ; i < count ; ++i )
+        for ( size_t i = 0 ; i < count ; ++i )

         {
             if ( aSelections[i] != m_selectionPreImage[i] )
             {
         {
             if ( aSelections[i] != m_selectionPreImage[i] )
             {


@@ -811,7 +752,7 @@ void wxListBox::MacDoClick()
     
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );
     
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );

-
+    

     if ( count > 0 )
     {
         n = aSelections[0];
     if ( count > 0 )
     {
         n = aSelections[0];


@@ -823,54 +764,65 @@ void wxListBox::MacDoClick()
     }
     else
     {
     }
     else
     {

-         n = -1;
+        n = -1;

     }
     
     event.m_commandInt = n;
     }
     
     event.m_commandInt = n;

-
+    

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

+*/

 }
 
 void wxListBox::MacDoDoubleClick()
 {
 }
 
 void wxListBox::MacDoDoubleClick()
 {

+/*

     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );

-       GetEventHandler()->ProcessEvent(event) ; 
+    GetEventHandler()->ProcessEvent(event) ;
+*/

 }
 
 }
 

-static long sLastTypeIn = 0 ;
+#if !TARGET_API_MAC_OSX

 
 void wxListBox::OnChar(wxKeyEvent& event)
 {
 
 void wxListBox::OnChar(wxKeyEvent& event)
 {

-    if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
+    // todo trigger proper events here
+    event.Skip() ;
+    return ;
+    
+    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)

     {
     {

-       wxWindow* parent = GetParent() ;
-       while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
-               parent = parent->GetParent() ;
-               
-       if ( parent && parent->GetDefaultItem() )
-       {
-               wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                               wxButton);
-               if ( def && def->IsEnabled() )
-               {
-                    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                    event.SetEventObject(def);
-                    def->Command(event);
-                    return ;
-               }
-           }
-           event.Skip() ;
+        wxWindow* parent = GetParent() ;
+        while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
+            parent = parent->GetParent() ;
+        
+        if ( parent && parent->GetDefaultItem() )
+        {
+            wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+                wxButton);
+            if ( def && def->IsEnabled() )
+            {
+                wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                event.SetEventObject(def);
+                def->Command(event);
+                return ;
+            }
+        }
+        event.Skip() ;

     }
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     }
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */

-    else if (event.KeyCode() == WXK_ESCAPE || (event.KeyCode() == '.' && event.MetaDown() ) )
+    else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )

     {
     {

-       wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
-        wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-        new_event.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( new_event );
+       // 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.KeyCode() == WXK_TAB )
+    else if ( event.GetKeyCode() == WXK_TAB )

     {
         wxNavigationKeyEvent new_event;
         new_event.SetEventObject( this );
     {
         wxNavigationKeyEvent new_event;
         new_event.SetEventObject( this );


@@ -879,65 +831,66 @@ void wxListBox::OnChar(wxKeyEvent& event)
         new_event.SetWindowChange( event.ControlDown() );
         new_event.SetCurrentFocus( this );
         if ( !GetEventHandler()->ProcessEvent( new_event ) )
         new_event.SetWindowChange( event.ControlDown() );
         new_event.SetCurrentFocus( this );
         if ( !GetEventHandler()->ProcessEvent( new_event ) )

-               event.Skip() ;
+            event.Skip() ;

     }
     }

-       else if ( event.KeyCode() == WXK_SPACE || event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
-       {
-               // perform the default key handling first
-               if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
-                       wxControl::OnKeyDown( event ) ;
-                       
+    else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP )
+    {
+        // perform the default key handling first
+        wxControl::OnKeyDown( event ) ;
+        

         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );

-
+        

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

-               n = aSelections[0];
-               if ( HasClientObjectData() )
-                  event.SetClientObject( GetClientObject(n) );
-              else if ( HasClientUntypedData() )
-                  event.SetClientData( GetClientData(n) );
-              event.SetString( GetString(n) );
+            n = aSelections[0];
+            if ( HasClientObjectData() )
+                event.SetClientObject( GetClientObject(n) );
+            else if ( HasClientUntypedData() )
+                event.SetClientData( GetClientData(n) );
+            event.SetString( GetString(n) );

         }
         else
         {
         }
         else
         {

-             n = -1;
+            n = -1;

         }
         }

-
+        

         event.m_commandInt = n;
         event.m_commandInt = n;

-
+        

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

-       }
-       else
-       {
-         if ( event.GetTimestamp() > m_lastTypeIn + 60 )
-         {
-           m_typeIn = "" ;
-         }
-         m_lastTypeIn = event.GetTimestamp() ;
-         m_typeIn += (char) event.KeyCode() ;
-         int line = FindString("*"+m_typeIn+"*") ;
-         if ( line >= 0 )
-         {
-               if ( GetSelection() != line )
-               {
-               SetSelection(line) ;
-               wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-               event.SetEventObject( this );
-
-            if ( HasClientObjectData() )
-              event.SetClientObject( GetClientObject( line ) );
-               else if ( HasClientUntypedData() )
-              event.SetClientData( GetClientData(line) );
-               event.SetString( GetString(line) );
-
-               event.m_commandInt = line ;
-
-               GetEventHandler()->ProcessEvent(event);
-           }
-         }
-       }
+    }
+    else
+    {
+        if ( event.GetTimestamp() > m_lastTypeIn + 60 )
+        {
+            m_typeIn = wxEmptyString ;
+        }
+        m_lastTypeIn = event.GetTimestamp() ;
+        m_typeIn += (char) event.GetKeyCode() ;
+        int line = FindString(wxT("*")+m_typeIn+wxT("*")) ;
+        if ( line >= 0 )
+        {
+            if ( GetSelection() != line )
+            {
+                SetSelection(line) ;
+                wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+                event.SetEventObject( this );
+                
+                if ( HasClientObjectData() )
+                    event.SetClientObject( GetClientObject( line ) );
+                else if ( HasClientUntypedData() )
+                    event.SetClientData( GetClientData(line) );
+                event.SetString( GetString(line) );
+                
+                event.m_commandInt = line ;
+                
+                GetEventHandler()->ProcessEvent(event);
+            }
+        }
+    }

 }
 
 }
 

+#endif
+