X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41c9a21f8cc72250ee4b0d5230c5f529c0ab0aab..0b2e45b16264cf196e069adb1137cd47e426284d:/src/mac/carbon/listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 7cfcbc5bce..2d7dff4fbc 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        listbox.cpp
 // Purpose:     wxListBox
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -15,31 +15,52 @@
 
 #include "wx/app.h"
 #include "wx/listbox.h"
+#include "wx/button.h"
 #include "wx/settings.h"
+#include "wx/toplevel.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifndef __DARWIN__
-//  #include "extldef.h"
-#endif
 
 #if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
-    EVT_SIZE( wxListBox::OnSize ) 
+    EVT_SIZE( wxListBox::OnSize )
+    EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
 
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=mac68k
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(push, 2)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack(2)
+#endif
 
 typedef struct {
- unsigned short instruction;
- void (*function)();
+    unsigned short instruction;
+    void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack()
+#endif
+
+#if TARGET_CARBON
+const short kwxMacListItemHeight = 19 ;
+#else
+const short kwxMacListItemHeight = 14 ;
+#endif
+
 extern "C"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
@@ -51,81 +72,118 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
                                      Cell cell, short dataOffset, short dataLength,
                                      ListHandle listHandle )
 {
-    FontInfo fontInfo;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     SInt32 savedPenMode;
     wxListBox*          list;
-  GetPort(&savePort);
-  SetPort((**listHandle).port);
-  grafPtr = (**listHandle).port ;
+    GetPort(&savePort);
+    SetPort((**listHandle).port);
+    grafPtr = (**listHandle).port ;
     // typecast our refCon
     list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
     
     //  Calculate the cell rect.
     
     switch( message ) {
-        case lInitMsg:
-            break;
-
-        case lCloseMsg:
-            break;
-
-        case lDrawMsg:
+    case lInitMsg:
+        break;
+        
+    case lCloseMsg:
+        break;
+        
+    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());
+            wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
+            
+            if ( font )
+            {
+                ::TextFont( font->m_macFontNum ) ;
+                ::TextSize( short(font->m_macFontSize) ) ;
+                ::TextFace( font->m_macFontStyle ) ;
+            }
+            else
+            {
+                ::TextFont( kFontIDMonaco ) ;
+                ::TextSize( 9  );
+                ::TextFace( 0 ) ;
+            }
+            
+#if TARGET_CARBON
+            bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+            
+               if ( useDrawThemeText )
+               {
+                Rect frame = { drawRect->top, drawRect->left + 4,
+                    drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
+                CFStringRef sString = CFStringCreateWithBytes( NULL , (UInt8*) text.c_str(), text.Length(), CFStringGetSystemEncoding(), false ) ;
+                CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , sString ) ;
+                CFRelease( sString ) ;
+                ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
+                ::DrawThemeTextBox( mString,
+                    kThemeCurrentPortFont,
+                    kThemeStateActive,
+                    false,
+                    &frame,
+                    teJustLeft,
+                    nil );
+                CFRelease( mString ) ;
+            }
+            else
+#endif
+            {
+                MoveTo(drawRect->left + 4 , drawRect->top + 10 );
+                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( grafPtr );
-                SetPortPenMode( grafPtr, hilitetransfermode );
+                savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
+                SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
                 PaintRect( drawRect );
-                SetPortPenMode( grafPtr, savedPenMode );
+                SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
             }
             
             //  Restore the saved clip region.
             
             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
-            }
-            break;
-        case lHiliteMsg:
-            
-            //  Hilite or unhilite the cell. Paint the cell contents with the
-            //  appropriate QuickDraw transform mode.
-            
-            GetPort( &grafPtr );
-            savedPenMode = GetPortPenMode( grafPtr );
-            SetPortPenMode( grafPtr, hilitetransfermode );
-            PaintRect( drawRect );
-            SetPortPenMode( grafPtr, savedPenMode );
-            break;
-        default :
-          break ;
+        }
+        break;
+    case lHiliteMsg:
+        
+        //  Hilite or unhilite the cell. Paint the cell contents with the
+        //  appropriate QuickDraw transform mode.
+        
+        GetPort( &grafPtr );
+        savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
+        SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
+        PaintRect( drawRect );
+        SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
+        break;
+    default :
+        break ;
     }
-    SetPort(savePort);  
+    SetPort(savePort);
 }
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
+// resources ldef ids
 const short kwxMacListWithVerticalScrollbar = 128 ;
+const short kwxMacListWithVerticalAndHorizontalScrollbar = 129 ;
 
 // ============================================================================
 // list box control implementation
@@ -151,56 +209,70 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
-    
+
     Rect bounds ;
     Str255 title ;
     
     MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
-
+    
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;
     if ( macListDefUPP == NULL )
     {
-      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
+        macListDefUPP = NewListDefUPP( wxMacListDefinition );
     }
-        listDef.u.userProc = macListDefUPP ;
+    listDef.u.userProc = macListDefUPP ;
+    
+    Str255 fontName ;
+    SInt16 fontSize ;
+    Style fontStyle ;
+    SInt16 fontNum ;
+#if TARGET_CARBON
+    GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+#else
+    GetFontName( kFontIDMonaco , fontName ) ;
+    fontSize = 9 ;
+    fontStyle = normal ;
+#endif 
+    CopyPascalStringToC( fontName , (char*) fontName ) ;
+    SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ) ) ;
 #if TARGET_CARBON
     Size asize;
 
 
-    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
-                          14, 14, false, &listDef, &m_macControl );
+    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true,
+                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
 
-    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
                    sizeof(ListHandle), (Ptr) &m_macList, &asize);
 
-    SetControlReference(m_macControl, (long) this);
-    SetControlVisibility(m_macControl, false, false);
+    SetControlReference( (ControlHandle) m_macControl, (long) this);
+    SetControlVisibility( (ControlHandle) m_macControl, false, false);
 
 #else
-    long    result ;
 
-    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
-                  kwxMacListWithVerticalScrollbar , 0 , 0, 
-                  kControlListBoxProc , (long) this ) ;
-    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+    long    result ;
+    wxStAppResource resload ;
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
+                  (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar , 
+                  0 , 0, kControlListBoxProc , (long) this ) ;
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;
     ldefHandle ldef ;
     ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
-    if (  (**m_macList).listDefProc != NULL )
+    if (  (**(ListHandle)m_macList).listDefProc != NULL )
     {
       (**ldef).instruction = 0x4EF9;  /* JMP instruction */
       (**ldef).function = (void(*)()) listDef.u.userProc;
-      (**m_macList).listDefProc = (Handle) ldef ;
+      (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
     }
-        
-    Point pt = (**m_macList).cellSize ;
-    pt.v = 14 ;
-    LCellSize( pt , m_macList ) ;
-    
-    LAddColumn( 1 , 0 , m_macList ) ;
+
+    Point pt = (**(ListHandle)m_macList).cellSize ;
+    pt.v = kwxMacListItemHeight ;
+    LCellSize( pt , (ListHandle)m_macList ) ;
+    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
 #endif
     OptionBits  options = 0;
     if ( style & wxLB_MULTIPLE )
@@ -213,36 +285,36 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
     else
     {
-        options = lOnlyOne ;
+        options = (OptionBits) lOnlyOne ;
     }
-    SetListSelectionFlags(m_macList, options);
-    
-    MacPostControlCreate() ;
-    
+    SetListSelectionFlags((ListHandle)m_macList, options);
+
     for ( int i = 0 ; i < n ; i++ )
     {
         Append( choices[i] ) ;
     }
-    
-    LSetDrawingMode( true , m_macList ) ;
+
+    MacPostControlCreate() ;
+
+    LSetDrawingMode( true , (ListHandle)m_macList ) ;
 
     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {
-    Free() ;
+    FreeData() ;
     if ( m_macList )
     {
 #if !TARGET_CARBON
-      DisposeHandle( (**m_macList).listDefProc ) ;
-      (**m_macList).listDefProc = NULL ;
+        DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
+        (**(ListHandle)m_macList).listDefProc = NULL ;
 #endif
         m_macList = NULL ;
     }
 }
 
-void wxListBox::Free()
+void wxListBox::FreeData()
 {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
@@ -250,6 +322,7 @@ void wxListBox::Free()
         size_t uiCount = m_aItems.Count();
         while ( uiCount-- != 0 ) {
             delete m_aItems[uiCount];
+            m_aItems[uiCount] = NULL;
         }
 
         m_aItems.Clear();
@@ -272,15 +345,15 @@ void  wxListBox::DoSetSize(int x, int y,
     wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
 #if TARGET_CARBON
     Rect bounds ;
-    GetControlBounds( m_macControl , &bounds ) ;
-    ControlRef control = GetListVerticalScrollBar( m_macList ) ;
+    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 , 
+            UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 ,
                 scrollbounds.top ) ;
         }
     }
@@ -305,10 +378,10 @@ void wxListBox::Delete(int N)
         delete GetClientObject(N);
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-    m_stringArray.Remove( N ) ;
+    m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     m_noItems --;
-    
+
     MacDelete( N ) ;
 }
 
@@ -332,35 +405,36 @@ int wxListBox::DoAppend(const wxString& item)
 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
-{ 
-  MacSetRedraw( false ) ;
-  Clear() ;  
-  int n = choices.GetCount();
-
-  for( int i = 0 ; i < n ; ++i )
-  {
-    if ( clientData )
+{
+    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"));
+                wxT("Can't use client data with owner-drawn listboxes"));
 #else // !wxUSE_OWNER_DRAWN
-        Append( choices[i] , clientData[i] ) ;
- #endif
+            Append( choices[i] , clientData[i] ) ;
+#endif
+        }
+        else
+            Append( choices[i] ) ;
     }
-    else
-        Append( choices[i] ) ;
-  }
-
+    
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items
         size_t ui = m_aItems.Count();
         while ( ui-- != 0 ) {
             delete m_aItems[ui];
+            m_aItems[ui] = NULL;
         }
         m_aItems.Empty();
-
+        
         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);
@@ -369,7 +443,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         }
     }
 #endif // wxUSE_OWNER_DRAWN
-  MacSetRedraw( true ) ;
+    MacSetRedraw( true ) ;
 }
 
 bool wxListBox::HasMultipleSelection() const
@@ -386,20 +460,20 @@ int wxListBox::FindString(const wxString& st) const
     }
     else
         s = st ;
-        
+    
     if ( s.Right(1) == "*" )
     {
         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
-
+        
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
 #if TARGET_CARBON
@@ -413,26 +487,27 @@ int wxListBox::FindString(const wxString& st) const
         }
         if ( s.Left(1) == "*" && s.Length() > 1 )
         {
+            s = st ;
             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
-
+        
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
 #if TARGET_CARBON
@@ -444,40 +519,40 @@ int wxListBox::FindString(const wxString& st) const
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
-   }
-   return -1;
+    }
+    return -1;
 }
 
 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)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
-      MacSetSelection( N , select ) ;
-      GetSelections( m_selectionPreImage ) ;
+        "invalid index in wxListBox::SetSelection" );
+    MacSetSelection( N , select ) ;
+    GetSelections( m_selectionPreImage ) ;
 }
 
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 "invalid index in wxListBox::Selected" );
-
-      return MacIsSelected( N ) ;
+        "invalid index in wxListBox::Selected" );
+    
+    return MacIsSelected( N ) ;
 }
 
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 wxT("invalid index in wxListBox::GetClientData"));
-
+        wxT("invalid index in wxListBox::GetClientData"));
+    
     return (void *)m_dataArray[N];
 }
 
@@ -489,8 +564,8 @@ wxClientData *wxListBox::DoGetItemClientObject(int N) const
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetClientData" );
-
+        "invalid index in wxListBox::SetClientData" );
+    
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
@@ -499,9 +574,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
-    wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , "invalid client_data array" ) ;
     
-    if ( m_dataArray.GetCount() > N )
+    if ( m_dataArray.GetCount() > (size_t) N )
     {
         m_dataArray[N] = (char*) Client_data ;
     }
@@ -542,17 +617,17 @@ wxString wxListBox::GetString(int N) const
 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();
-
+    
     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;
 }
 
@@ -571,7 +646,48 @@ void wxListBox::SetString(int N, const wxString& s)
 
 wxSize wxListBox::DoGetBestSize() const
 {
-    return wxSize(100, 100);
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+    
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
+        
+        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+        
+        if ( font )
+        {
+            ::TextFont( font->m_macFontNum ) ;
+            ::TextSize( short(font->m_macFontSize) ) ;
+            ::TextFace( font->m_macFontStyle ) ;
+        }
+        else
+        {
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9  );
+            ::TextFace( 0 ) ;
+        }
+        
+        // Find the widest line
+        for(int i = 0; i < GetCount(); i++) {
+            wxString str(GetString(i));
+            wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+            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
@@ -581,18 +697,14 @@ int wxListBox::GetCount() const
 
 void wxListBox::SetupColours()
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
-    // Set up port
-    WindowRef rootwindow = MacGetRootWindow() ;
-    wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-    wxMacDrawingHelper focus( wxrootwindow );
-
-    UMADrawControl(m_macControl);
+    wxControl::Refresh( eraseBack , rect ) ;
+    //    MacRedrawControl() ;
 }
 
 #if wxUSE_OWNER_DRAWN
@@ -620,48 +732,49 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // 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());
-        
-}
-
+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 )
 {
-    LDelRow( 1 , N , m_macList) ;
+    LDelRow( 1 , N , (ListHandle)m_macList) ;
     Refresh();
 }
 
-void wxListBox::MacInsert( int n , const char * text) 
+void wxListBox::MacInsert( int n , const char * text)
 {
     Cell cell = { 0 , 0 } ;
     cell.v = n ;
-    LAddRow( 1 , cell.v , m_macList ) ;
-//    LSetCell(text, strlen(text), cell, m_macList);
+    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
+    //    LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
-void wxListBox::MacAppend( const char * text) 
+void wxListBox::MacAppend( const char * text)
 {
     Cell cell = { 0 , 0 } ;
-    cell.v = (**m_macList).dataBounds.bottom ;
-    LAddRow( 1 , cell.v , m_macList ) ;
- //   LSetCell(text, strlen(text), cell, m_macList);
+    cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
+    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
+    //   LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
-void wxListBox::MacClear() 
+void wxListBox::MacClear()
 {
-    LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
     Refresh();
 }
 
@@ -670,15 +783,15 @@ void wxListBox::MacSetSelection( int n , bool select )
     Cell cell = { 0 , 0 } ;
     if ( ! (m_windowStyle & wxLB_MULTIPLE) )
     {
-    if ( LGetSelect( true , &cell , m_macList ) )
-    {
-        LSetSelect( false , cell , m_macList ) ;
-    }
+        if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        {
+            LSetSelect( false , cell , (ListHandle)m_macList ) ;
+        }
     }
     
     cell.v = n ;
-    LSetSelect( select , cell , m_macList ) ;
-    LAutoScroll( m_macList ) ;
+    LSetSelect( select , cell , (ListHandle)m_macList ) ;
+    LAutoScroll( (ListHandle)m_macList ) ;
     Refresh();
 }
 
@@ -686,18 +799,18 @@ bool wxListBox::MacIsSelected( int n ) const
 {
     Cell cell = { 0 , 0 } ;
     cell.v = n ;
-    return LGetSelect( false , &cell , m_macList ) ;
+    return LGetSelect( false , &cell , (ListHandle)m_macList ) ;
 }
 
 void wxListBox::MacDestroy()
 {
-//    DisposeExtLDEFInfo( m_macList ) ;
+    //    DisposeExtLDEFInfo( m_macList ) ;
 }
 
 int wxListBox::MacGetSelection() const
 {
     Cell cell = { 0 , 0 } ;
-    if ( LGetSelect( true , &cell , m_macList ) )
+    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
         return cell.v ;
     else
         return -1 ;
@@ -708,11 +821,11 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     int no_sel = 0 ;
     
     aSelections.Empty();
-
+    
     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;
     
-    while ( LGetSelect( true , &cell , m_macList ) )
+    while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
     {
         aSelections.Add( cell.v ) ;
         no_sel++ ;
@@ -727,7 +840,7 @@ void wxListBox::MacSet( int n , const char * text )
     // so we just have to redraw
     Cell cell = { 0 , 0 } ;
     cell.v = n ;
-//  LSetCell(text, strlen(text), cell, m_macList);
+    //  LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
@@ -739,22 +852,22 @@ void wxListBox::MacScrollTo( int n )
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
     Point pt;
-
+    
 #if TARGET_CARBON
-    GetListCellSize(m_macList, &pt);
+    GetListCellSize((ListHandle)m_macList, &pt);
 #else
-    pt = (**m_macList).cellSize ;
+    pt = (**(ListHandle)m_macList).cellSize ;
 #endif
     pt.h =  m_width - 15  ;
-    LCellSize( pt , m_macList ) ;
+    LCellSize( pt , (ListHandle)m_macList ) ;
 }
 
-void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
 {
     Boolean wasDoubleClick = false ;
     long    result ;
-
-    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+    
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
     if ( !wasDoubleClick )
     {
         MacDoClick() ;
@@ -765,21 +878,22 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar
     }
 }
 
-void wxListBox::MacSetRedraw( bool doDraw ) 
+void wxListBox::MacSetRedraw( bool doDraw )
 {
-    LSetDrawingMode( doDraw , m_macList ) ;
+    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
     
 }
 
 void wxListBox::MacDoClick()
 {
     wxArrayInt aSelections;
-    int n, count = GetSelections(aSelections);
+    int n ;
+    size_t count = GetSelections(aSelections);
     
     if ( count == m_selectionPreImage.GetCount() )
     {
         bool hasChanged = false ;
-        for ( int i = 0 ; i < count ; ++i )
+        for ( size_t i = 0 ; i < count ; ++i )
         {
             if ( aSelections[i] != m_selectionPreImage[i] )
             {
@@ -797,7 +911,7 @@ void wxListBox::MacDoClick()
     
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );
-
+    
     if ( count > 0 )
     {
         n = aSelections[0];
@@ -809,11 +923,11 @@ void wxListBox::MacDoClick()
     }
     else
     {
-         n = -1;
+        n = -1;
     }
     
     event.m_commandInt = n;
-
+    
     GetEventHandler()->ProcessEvent(event);
 }
 
@@ -821,5 +935,106 @@ void wxListBox::MacDoDoubleClick()
 {
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event) ; 
+    GetEventHandler()->ProcessEvent(event) ;
 }
+
+void wxListBox::OnChar(wxKeyEvent& event)
+{
+    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
+    {
+        wxWindow* parent = GetParent() ;
+        while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
+            parent = parent->GetParent() ;
+        
+        if ( parent && parent->GetDefaultItem() )
+        {
+            wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
+                wxButton);
+            if ( def && def->IsEnabled() )
+            {
+                wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                event.SetEventObject(def);
+                def->Command(event);
+                return ;
+            }
+        }
+        event.Skip() ;
+    }
+    /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
+    else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
+    {
+        wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
+        wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+        new_event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( new_event );
+    }
+    else if ( event.GetKeyCode() == WXK_TAB )
+    {
+        wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( this );
+        new_event.SetDirection( !event.ShiftDown() );
+        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+        new_event.SetWindowChange( event.ControlDown() );
+        new_event.SetCurrentFocus( this );
+        if ( !GetEventHandler()->ProcessEvent( new_event ) )
+            event.Skip() ;
+    }
+    else if ( event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_UP )
+    {
+        // perform the default key handling first
+        wxControl::OnKeyDown( event ) ;
+        
+        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+        event.SetEventObject( this );
+        
+        wxArrayInt aSelections;
+        int n, count = GetSelections(aSelections);
+        if ( count > 0 )
+        {
+            n = aSelections[0];
+            if ( HasClientObjectData() )
+                event.SetClientObject( GetClientObject(n) );
+            else if ( HasClientUntypedData() )
+                event.SetClientData( GetClientData(n) );
+            event.SetString( GetString(n) );
+        }
+        else
+        {
+            n = -1;
+        }
+        
+        event.m_commandInt = n;
+        
+        GetEventHandler()->ProcessEvent(event);
+    }
+    else
+    {
+        if ( event.GetTimestamp() > m_lastTypeIn + 60 )
+        {
+            m_typeIn = "" ;
+        }
+        m_lastTypeIn = event.GetTimestamp() ;
+        m_typeIn += (char) event.GetKeyCode() ;
+        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);
+            }
+        }
+    }
+}
+