switching to safe yields, because we got into loops when handling print document...

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 557d05f213a40aeff08bf5d6d8f4dba045777fc9..5c3dc855d0687f45cd9614cd1fe2db37328014b5 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -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"


@@ -26,7 +27,7 @@
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(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
        EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()
 #endif


@@ -54,6 +55,12 @@ typedef struct {
     #pragma pack()
 #endif
 
     #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,
 extern "C"
 {
 static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,


@@ -75,9 +82,9 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
   grafPtr = (**listHandle).port ;
     // typecast our refCon
     list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
   grafPtr = (**listHandle).port ;
     // typecast our refCon
     list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );

-    
+

     //  Calculate the cell rect.
     //  Calculate the cell rect.

-    
+

     switch( message ) {
         case lInitMsg:
             break;
     switch( message ) {
         case lInitMsg:
             break;


@@ -91,40 +98,76 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
 
             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.
 
             //  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 );
             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 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 );
             }
             if( isSelected ) {
                 savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
                 SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
                 PaintRect( drawRect );
                 SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
             }

-            
+

             //  Restore the saved clip region.
             //  Restore the saved clip region.

-            
+

             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
             }
             break;
         case lHiliteMsg:
             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
             }
             break;
         case lHiliteMsg:

-            
+

             //  Hilite or unhilite the cell. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             //  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 );
             GetPort( &grafPtr );
             savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
             SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );


@@ -134,12 +177,11 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
         default :
           break ;
     }
         default :
           break ;
     }

-    SetPort(savePort);  
+    SetPort(savePort);

 }
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
 }
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;

-const short kwxMacListItemHeight = 14 ;

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


@@ -165,20 +207,32 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
 {
     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;

-    
+

     Rect bounds ;
     Str255 title ;
     Rect bounds ;
     Str255 title ;

-    
+

     MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;
     if ( macListDefUPP == NULL )
     {
     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 ;
+#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;
 
 #if TARGET_CARBON
     Size asize;
 


@@ -197,7 +251,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     long    result ;
     wxStAppResource resload ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
     long    result ;
     wxStAppResource resload ;
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,

-                  kwxMacListWithVerticalScrollbar , 0 , 0, 
+                  kwxMacListWithVerticalScrollbar , 0 , 0,

                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;


@@ -211,7 +265,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
       (**ldef).function = (void(*)()) listDef.u.userProc;
       (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
     }
       (**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 ) ;
     Point pt = (**(ListHandle)m_macList).cellSize ;
     pt.v = kwxMacListItemHeight ;
     LCellSize( pt , (ListHandle)m_macList ) ;


@@ -228,17 +282,17 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     }
     else
     {
     }
     else
     {

-        options = lOnlyOne ;
+        options = (OptionBits) lOnlyOne ;

     }
     SetListSelectionFlags((ListHandle)m_macList, options);
     }
     SetListSelectionFlags((ListHandle)m_macList, options);

-    
-    MacPostControlCreate() ;
-    
+

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

-    
+
+    MacPostControlCreate() ;
+

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


@@ -246,7 +300,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-    Free() ;
+    FreeData() ;

     if ( m_macList )
     {
 #if !TARGET_CARBON
     if ( m_macList )
     {
 #if !TARGET_CARBON


@@ -257,7 +311,7 @@ wxListBox::~wxListBox()
     }
 }
 
     }
 }
 

-void wxListBox::Free()
+void wxListBox::FreeData()

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


@@ -265,6 +319,7 @@ void wxListBox::Free()
         size_t uiCount = m_aItems.Count();
         while ( uiCount-- != 0 ) {
             delete m_aItems[uiCount];
         size_t uiCount = m_aItems.Count();
         while ( uiCount-- != 0 ) {
             delete m_aItems[uiCount];

+            m_aItems[uiCount] = NULL;

         }
 
         m_aItems.Clear();
         }
 
         m_aItems.Clear();


@@ -295,7 +350,7 @@ void  wxListBox::DoSetSize(int x, int y,
         GetControlBounds( control , &scrollbounds ) ;
         if( scrollbounds.right != bounds.right + 1 )
         {
         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 ) ;
         }
     }
                 scrollbounds.top ) ;
         }
     }


@@ -323,7 +378,7 @@ 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 ) ;
 }
 
     MacDelete( N ) ;
 }
 


@@ -347,9 +402,9 @@ int wxListBox::DoAppend(const wxString& item)
 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 }
 
 void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)

-{ 
+{

   MacSetRedraw( false ) ;
   MacSetRedraw( false ) ;

-  Clear() ;  
+  Clear() ;

   int n = choices.GetCount();
 
   for( int i = 0 ; i < n ; ++i )
   int n = choices.GetCount();
 
   for( int i = 0 ; i < n ; ++i )


@@ -373,6 +428,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         size_t ui = m_aItems.Count();
         while ( ui-- != 0 ) {
             delete m_aItems[ui];
         size_t ui = m_aItems.Count();
         while ( ui-- != 0 ) {
             delete m_aItems[ui];

+            m_aItems[ui] = NULL;

         }
         m_aItems.Empty();
 
         }
         m_aItems.Empty();
 


@@ -401,7 +457,7 @@ int wxListBox::FindString(const wxString& st) const
     }
     else
         s = st ;
     }
     else
         s = st ;

-        
+

     if ( s.Right(1) == "*" )
     {
         wxString search = s.Left( s.Length() - 1 ) ;
     if ( s.Right(1) == "*" )
     {
         wxString search = s.Left( s.Length() - 1 ) ;


@@ -435,7 +491,7 @@ int wxListBox::FindString(const wxString& st) const
                 if ( GetString(i).Lower().Matches(s) )
                     return i ;
             }
                 if ( GetString(i).Lower().Matches(s) )
                     return i ;
             }

-        }   
+        }

 
     }
     else
 
     }
     else


@@ -466,7 +522,7 @@ int wxListBox::FindString(const wxString& st) const
 
 void wxListBox::Clear()
 {
 
 void wxListBox::Clear()
 {

-  Free();
+  FreeData();

   m_noItems = 0;
   m_stringArray.Empty() ;
   m_dataArray.Empty() ;
   m_noItems = 0;
   m_stringArray.Empty() ;
   m_dataArray.Empty() ;


@@ -515,9 +571,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" ) ;
-    
-    if ( m_dataArray.GetCount() > N )
+    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , "invalid client_data array" ) ;
+
+    if ( m_dataArray.GetCount() > (size_t) N )

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


@@ -587,7 +643,48 @@ void wxListBox::SetString(int N, const wxString& s)
 
 wxSize wxListBox::DoGetBestSize() const
 {
 
 wxSize wxListBox::DoGetBestSize() const
 {

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


@@ -632,28 +729,29 @@ 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;
 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());
     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::MacDelete( int N )
 {
     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 ;
 {
     Cell cell = { 0 , 0 } ;
     cell.v = n ;


@@ -662,7 +760,7 @@ void wxListBox::MacInsert( int n , const char * text)
     Refresh();
 }
 
     Refresh();
 }
 

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

 {
     Cell cell = { 0 , 0 } ;
     cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
 {
     Cell cell = { 0 , 0 } ;
     cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;


@@ -671,7 +769,7 @@ void wxListBox::MacAppend( const char * text)
     Refresh();
 }
 
     Refresh();
 }
 

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

 {
     LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
     Refresh();
 {
     LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
     Refresh();


@@ -687,7 +785,7 @@ void wxListBox::MacSetSelection( int n , bool select )
             LSetSelect( false , cell , (ListHandle)m_macList ) ;
         }
     }
             LSetSelect( false , cell , (ListHandle)m_macList ) ;
         }
     }

-    
+

     cell.v = n ;
     LSetSelect( select , cell , (ListHandle)m_macList ) ;
     LAutoScroll( (ListHandle)m_macList ) ;
     cell.v = n ;
     LSetSelect( select , cell , (ListHandle)m_macList ) ;
     LAutoScroll( (ListHandle)m_macList ) ;


@@ -718,12 +816,12 @@ int wxListBox::MacGetSelection() const
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;

-    
+

     aSelections.Empty();
 
     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;
     aSelections.Empty();
 
     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;

-    
+

     while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
     {
         aSelections.Add( cell.v ) ;
     while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
     {
         aSelections.Add( cell.v ) ;


@@ -761,7 +859,7 @@ void wxListBox::OnSize( const wxSizeEvent &event)
     LCellSize( pt , (ListHandle)m_macList ) ;
 }
 
     LCellSize( pt , (ListHandle)m_macList ) ;
 }
 

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

 {
     Boolean wasDoubleClick = false ;
     long    result ;
 {
     Boolean wasDoubleClick = false ;
     long    result ;


@@ -777,21 +875,22 @@ void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
     }
 }
 
     }
 }
 

-void wxListBox::MacSetRedraw( bool doDraw ) 
+void wxListBox::MacSetRedraw( bool doDraw )

 {
     LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
 {
     LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;

-    
+

 }
 
 void wxListBox::MacDoClick()
 {
     wxArrayInt aSelections;
 }
 
 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 ;
     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] )
             {


@@ -804,9 +903,9 @@ void wxListBox::MacDoClick()
             return ;
         }
     }
             return ;
         }
     }

-    
+

     m_selectionPreImage = aSelections;
     m_selectionPreImage = aSelections;

-    
+

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


@@ -823,7 +922,7 @@ void wxListBox::MacDoClick()
     {
          n = -1;
     }
     {
          n = -1;
     }

-    
+

     event.m_commandInt = n;
 
     GetEventHandler()->ProcessEvent(event);
     event.m_commandInt = n;
 
     GetEventHandler()->ProcessEvent(event);


@@ -833,20 +932,55 @@ 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 ;
-

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

-       EventRecord *ev = (EventRecord*) (wxTheApp->MacGetCurrentEvent() ) ;
-       short keycode ;
-       short keychar ;
-       keychar = short(ev->message & charCodeMask);
-       keycode = short(ev->message & keyCodeMask) >> 8 ;
-       if ( event.KeyCode() == WXK_SPACE )
+    if ( event.KeyCode() == WXK_RETURN || event.KeyCode() == 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.KeyCode() == WXK_ESCAPE || (event.KeyCode() == '.' && 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.KeyCode() == 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.KeyCode() == WXK_DOWN || event.KeyCode() == 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 );
 


@@ -870,22 +1004,33 @@ void wxListBox::OnChar(wxKeyEvent& event)
 
         GetEventHandler()->ProcessEvent(event);
        }
 
         GetEventHandler()->ProcessEvent(event);
        }

-       else if ( event.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
-       {
-         ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
-       } 

        else
        {
        else
        {

-         if ( ev->when > m_lastTypeIn + 60 )
+         if ( event.GetTimestamp() > m_lastTypeIn + 60 )

          {
            m_typeIn = "" ;
          }
          {
            m_typeIn = "" ;
          }

-         m_lastTypeIn = ev->when ;
+         m_lastTypeIn = event.GetTimestamp() ;

          m_typeIn += (char) event.KeyCode() ;
          int line = FindString("*"+m_typeIn+"*") ;
          if ( line >= 0 )
          {
          m_typeIn += (char) event.KeyCode() ;
          int line = FindString("*"+m_typeIn+"*") ;
          if ( line >= 0 )
          {

-           SetSelection(line) ;
+               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);
+           }

          }
        }
 }
          }
        }
 }