X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/202848fe9e424cd3a9fa9a23ff7e6fdd78dbe4cf..28b4db7f890258e83fa0a57ea85c72585e48b756:/src/mac/listbox.cpp

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 899cc62cb2..9daaf275e8 100644
--- a/src/mac/listbox.cpp
+++ b/src/mac/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,6 +15,7 @@
 
 #include "wx/app.h"
 #include "wx/listbox.h"
+#include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/toplevel.h"
 #include "wx/dynarray.h"
@@ -23,11 +24,11 @@
 #include "wx/utils.h"
 
 #if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
-	EVT_SIZE( wxListBox::OnSize ) 
-	EVT_CHAR( wxListBox::OnChar )
+    EVT_SIZE( wxListBox::OnSize )
+    EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()
 #endif
 
@@ -42,8 +43,8 @@ END_EVENT_TABLE()
 #endif
 
 typedef struct {
- unsigned short instruction;
- void (*function)();
+    unsigned short instruction;
+    void (*function)();
 } ldefRec, *ldefPtr, **ldefHandle;
 
 #if PRAGMA_STRUCT_ALIGN
@@ -76,61 +77,71 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
     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] ;
-
+            const wxString linetext = list->m_stringArray[cell.v] ;
+            
             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.
             
             savedClipRegion = NewRgn();
             GetClip( savedClipRegion );
-
+            
             ClipRect( drawRect );
             EraseRect( drawRect );
             
+            wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
+            
+            if ( font )
+            {
+                ::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} ;
-                CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text.c_str(), text.Length(), CFStringGetSystemEncoding(), false ) ;
-        		::DrawThemeTextBox( mString,
-        							kThemeViewsFont,
-        							kThemeStateActive,
-        							false,
-        							&frame,
-        							teJustLeft,
-        							nil );
-        	    CFRelease( mString ) ;
+			{
+				Rect frame = { drawRect->top, drawRect->left + 4,
+				    drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
+				CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , wxMacCFStringHolder(linetext) ) ;
+				::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
+				::DrawThemeTextBox( mString,
+				    kThemeCurrentPortFont,
+				    kThemeStateActive,
+				    false,
+				    &frame,
+				    teJustLeft,
+				    nil );
+				CFRelease( mString ) ;
+			}
+#else
+            {	
+            	wxCharBuffer text = wxMacStringToCString( linetext ) ;
+                MoveTo(drawRect->left + 4 , drawRect->top + 10 );
+                DrawText(text, 0 , strlen(text) );
             }
-   		    else
-#endif
-   		    {
-		        MoveTo(drawRect->left + 4 , drawRect->top + 10 );
-		        ::TextFont( kFontIDMonaco ) ;
-		        ::TextSize( 9  );
-		        ::TextFace( 0 ) ;
-        		DrawText(text, 0 , text.Length());
-		    }
- 
+#endif            
             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             
@@ -145,27 +156,29 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
             
             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( (CGrafPtr)grafPtr );
-            SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
-            PaintRect( drawRect );
-            SetPortPenMode( (CGrafPtr)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
@@ -191,25 +204,36 @@ 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 ) ;
-
+    MacPreControlCreate( parent , id ,  wxEmptyString , 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 ;
+#if TARGET_CARBON
+    GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+#else
+    GetFontName( kFontIDMonaco , fontName ) ;
+    fontSize = 9 ;
+    fontStyle = normal ;
+#endif 
+    SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ) ) ;
 #if TARGET_CARBON
     Size asize;
 
 
-    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
+    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, (style & wxLB_HSCROLL), true,
                           kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );
 
     GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
@@ -223,8 +247,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     long    result ;
     wxStAppResource resload ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
-                  kwxMacListWithVerticalScrollbar , 0 , 0, 
-                  kControlListBoxProc , (long) this ) ;
+                  (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar , 
+                  0 , 0, kControlListBoxProc , (long) this ) ;
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
@@ -237,7 +261,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
       (**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 ) ;
@@ -254,17 +278,17 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
     else
     {
-        options = lOnlyOne ;
+        options = (OptionBits) lOnlyOne ;
     }
     SetListSelectionFlags((ListHandle)m_macList, options);
-    
-    MacPostControlCreate() ;
-    
+
     for ( int i = 0 ; i < n ; i++ )
     {
         Append( choices[i] ) ;
     }
-    
+
+    MacPostControlCreate() ;
+
     LSetDrawingMode( true , (ListHandle)m_macList ) ;
 
     return TRUE;
@@ -276,8 +300,8 @@ wxListBox::~wxListBox()
     if ( m_macList )
     {
 #if !TARGET_CARBON
-      DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
-      (**(ListHandle)m_macList).listDefProc = NULL ;
+        DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
+        (**(ListHandle)m_macList).listDefProc = NULL ;
 #endif
         m_macList = NULL ;
     }
@@ -322,7 +346,7 @@ void  wxListBox::DoSetSize(int x, int y,
         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 ) ;
         }
     }
@@ -350,22 +374,15 @@ void wxListBox::Delete(int N)
     m_stringArray.RemoveAt( N ) ;
     m_dataArray.RemoveAt( N ) ;
     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 ) ;
@@ -374,26 +391,26 @@ 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
@@ -403,7 +420,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();
-
+        
         // then create new ones
         for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
             wxOwnerDrawn *pNewItem = CreateItem(ui);
@@ -412,7 +429,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         }
     }
 #endif // wxUSE_OWNER_DRAWN
-  MacSetRedraw( true ) ;
+    MacSetRedraw( true ) ;
 }
 
 bool wxListBox::HasMultipleSelection() const
@@ -420,108 +437,82 @@ bool wxListBox::HasMultipleSelection() const
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 }
 
-int wxListBox::FindString(const wxString& st) const
+int wxListBox::FindString(const wxString& s) const
 {
-    wxString s ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        s = wxMacMakeMacStringFromPC( st ) ;
-    }
-    else
-        s = st ;
-        
-    if ( s.Right(1) == "*" )
+    
+    if ( s.Right(1) == wxT("*") )
     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;
-
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
-#else
-        strcpy( (char *) s2 , search.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
-
+        wxMacStringToPascal( search , s2 ) ;
+        
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
+        	wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
-        if ( s.Left(1) == "*" && s.Length() > 1 )
+        if ( s.Left(1) == wxT("*") && s.Length() > 1 )
         {
-            s = st ;
-            s.MakeLower() ;
+            wxString st = s ;
+            st.MakeLower() ;
             for ( int i = 0 ; i < m_noItems ; ++i )
             {
-                if ( GetString(i).Lower().Matches(s) )
+                if ( GetString(i).Lower().Matches(st) )
                     return i ;
             }
-        }   
-
+        }
+        
     }
     else
     {
         Str255 s1 , s2 ;
-
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
-#else
-        strcpy( (char *) s2 , s.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
-
+        
+        wxMacStringToPascal( s , s2 ) ;
+        
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
+        	wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
-   }
-   return -1;
+    }
+    return -1;
 }
 
 void wxListBox::Clear()
 {
-  FreeData();
-  m_noItems = 0;
-  m_stringArray.Empty() ;
-  m_dataArray.Empty() ;
-  MacClear() ;
+    FreeData();
+    m_noItems = 0;
+    m_stringArray.Empty() ;
+    m_dataArray.Empty() ;
+    MacClear() ;
 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
-      MacSetSelection( N , select ) ;
-      GetSelections( m_selectionPreImage ) ;
+        wxT("invalid index in wxListBox::SetSelection") );
+    MacSetSelection( N , select ) ;
+    GetSelections( m_selectionPreImage ) ;
 }
 
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 "invalid index in wxListBox::Selected" );
-
-      return MacIsSelected( N ) ;
+        wxT("invalid index in wxListBox::Selected") );
+    
+    return MacIsSelected( N ) ;
 }
 
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 wxT("invalid index in wxListBox::GetClientData"));
-
+        wxT("invalid index in wxListBox::GetClientData"));
+    
     return (void *)m_dataArray[N];
 }
 
@@ -533,8 +524,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" );
-
+        wxT("invalid index in wxListBox::SetClientData") );
+    
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
@@ -543,9 +534,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 , wxT("invalid client_data array") ) ;
     
-    if ( m_dataArray.GetCount() > N )
+    if ( m_dataArray.GetCount() > (size_t) N )
     {
         m_dataArray[N] = (char*) Client_data ;
     }
@@ -575,47 +566,89 @@ int wxListBox::GetSelection() 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,
-                 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;
 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {
-    wxString str ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        str = wxMacMakeMacStringFromPC( s )  ;
-    }
-    else
-        str = s ;
-    m_stringArray[N] = str ;
+    m_stringArray[N] = s ;
     MacSet( N , s ) ;
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {
-    return wxSize(100, 100);
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 110;
+    int wLine;
+    
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) 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));
+        #if wxUSE_UNICODE
+            Point bounds={0,0} ;
+            SInt16 baseline ;
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h ;
+        #else
+            wxCharBuffer text = wxMacStringToCString( str ) ;
+            wLine = ::TextWidth( text , 0 , strlen(text) ) ;
+        #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
@@ -632,7 +665,7 @@ void wxListBox::SetupColours()
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     wxControl::Refresh( eraseBack , rect ) ;
-//    MacRedrawControl() ;
+    //    MacRedrawControl() ;
 }
 
 #if wxUSE_OWNER_DRAWN
@@ -660,46 +693,47 @@ 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 , (ListHandle)m_macList) ;
     Refresh();
 }
 
-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);
+    //    LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
-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);
+    //   LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
-void wxListBox::MacClear() 
+void wxListBox::MacClear()
 {
     LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
     Refresh();
@@ -731,7 +765,7 @@ bool wxListBox::MacIsSelected( int n ) const
 
 void wxListBox::MacDestroy()
 {
-//    DisposeExtLDEFInfo( m_macList ) ;
+    //    DisposeExtLDEFInfo( m_macList ) ;
 }
 
 int wxListBox::MacGetSelection() const
@@ -748,7 +782,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     int no_sel = 0 ;
     
     aSelections.Empty();
-
+    
     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;
     
@@ -761,13 +795,13 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     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);
+    //  LSetCell(text, strlen(text), cell, m_macList);
     Refresh();
 }
 
@@ -779,7 +813,7 @@ void wxListBox::MacScrollTo( int n )
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
     Point pt;
-
+    
 #if TARGET_CARBON
     GetListCellSize((ListHandle)m_macList, &pt);
 #else
@@ -789,11 +823,11 @@ void wxListBox::OnSize( const wxSizeEvent &event)
     LCellSize( pt , (ListHandle)m_macList ) ;
 }
 
-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown))
 {
     Boolean wasDoubleClick = false ;
     long    result ;
-
+    
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
     if ( !wasDoubleClick )
     {
@@ -805,7 +839,7 @@ void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
     }
 }
 
-void wxListBox::MacSetRedraw( bool doDraw ) 
+void wxListBox::MacSetRedraw( bool doDraw )
 {
     LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
     
@@ -814,12 +848,13 @@ void wxListBox::MacSetRedraw( bool doDraw )
 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] )
             {
@@ -837,7 +872,7 @@ void wxListBox::MacDoClick()
     
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );
-
+    
     if ( count > 0 )
     {
         n = aSelections[0];
@@ -849,11 +884,11 @@ void wxListBox::MacDoClick()
     }
     else
     {
-         n = -1;
+        n = -1;
     }
     
     event.m_commandInt = n;
-
+    
     GetEventHandler()->ProcessEvent(event);
 }
 
@@ -861,42 +896,44 @@ void wxListBox::MacDoDoubleClick()
 {
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
     event.SetEventObject( this );
-	GetEventHandler()->ProcessEvent(event) ; 
+    GetEventHandler()->ProcessEvent(event) ;
 }
 
-static long sLastTypeIn = 0 ;
-
 void wxListBox::OnChar(wxKeyEvent& event)
 {
-    if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == WXK_NUMPAD_ENTER)
+    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) */
-    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 );
@@ -905,64 +942,64 @@ void wxListBox::OnChar(wxKeyEvent& event)
         new_event.SetWindowChange( event.ControlDown() );
         new_event.SetCurrentFocus( this );
         if ( !GetEventHandler()->ProcessEvent( new_event ) )
-        	event.Skip() ;
+            event.Skip() ;
     }
-	else if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
-	{
-		// perform the default key handling first
-		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 );
-
+        
         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )
         {
-               n = aSelections[0];
-               if ( HasClientObjectData() )
-                  event.SetClientObject( GetClientObject(n) );
-              else if ( HasClientUntypedData() )
-                  event.SetClientData( GetClientData(n) );
-              event.SetString( GetString(n) );
+            n = aSelections[0];
+            if ( HasClientObjectData() )
+                event.SetClientObject( GetClientObject(n) );
+            else if ( HasClientUntypedData() )
+                event.SetClientData( GetClientData(n) );
+            event.SetString( GetString(n) );
         }
         else
         {
-             n = -1;
+            n = -1;
         }
-
+        
         event.m_commandInt = n;
-
+        
         GetEventHandler()->ProcessEvent(event);
-	}
-	else
-	{
-	  if ( event.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);
+            }
+        }
+    }
 }