only fowarding events if there is a focus window

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ae89e0bcab84e46b6af8bed6c3e8c37e3edbc1af..f4ddc539b3942a36e993e29a73b5cf39c0c2972a 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,24 +13,133 @@
 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

+#include "wx/app.h"

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

+#include "wx/toplevel.h"

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

-#include "extldef.h"

 
 

+#if !USE_SHARED_LIBRARY

   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
        EVT_SIZE( wxListBox::OnSize ) 
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
        EVT_SIZE( wxListBox::OnSize ) 

+       EVT_CHAR( wxListBox::OnChar )

 END_EVENT_TABLE()
 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

 
 

-#include <wx/mac/uma.h>
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} ldefRec, *ldefPtr, **ldefHandle;
+
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack()
+#endif
+
+extern "C"
+{
+static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle ) ;
+}
+
+static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect *drawRect,
+                                     Cell cell, short dataOffset, short dataLength,
+                                     ListHandle listHandle )
+{
+    GrafPtr savePort;
+    GrafPtr grafPtr;
+    RgnHandle savedClipRegion;
+    SInt32 savedPenMode;
+    wxListBox*          list;
+  GetPort(&savePort);
+  SetPort((**listHandle).port);
+  grafPtr = (**listHandle).port ;
+    // typecast our refCon
+    list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
+    
+    //  Calculate the cell rect.
+    
+    switch( message ) {
+        case lInitMsg:
+            break;
+
+        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());
+            //  If the cell is hilited, do the hilite now. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            if( isSelected ) {
+                savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
+                SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
+                PaintRect( drawRect );
+                SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
+            }
+            
+            //  Restore the saved clip region.
+            
+            SetClip( savedClipRegion );
+            DisposeRgn( savedClipRegion );
+            }
+            break;
+        case lHiliteMsg:
+            
+            //  Hilite or unhilite the cell. Paint the cell contents with the
+            //  appropriate QuickDraw transform mode.
+            
+            GetPort( &grafPtr );
+            savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
+            SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
+            PaintRect( drawRect );
+            SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
+            break;
+        default :
+          break ;
+    }
+    SetPort(savePort);  
+}

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


@@ -41,8 +150,11 @@ wxListBox::wxListBox()
 {
   m_noItems = 0;
   m_selected = 0;
 {
   m_noItems = 0;
   m_selected = 0;

+  m_macList = NULL ;

 }
 
 }
 

+static ListDefUPP macListDefUPP = NULL ;
+

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


@@ -51,64 +163,101 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-  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 ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+
+    ListDefSpec listDef;
+    listDef.defType = kListDefUserProcType;
+    if ( macListDefUPP == NULL )
+    {
+      macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
+    }
+        listDef.u.userProc = macListDefUPP ;

 
 

-       Rect bounds ;
-       Str255 title ;
-       m_macHorizontalBorder = 5 ; // additional pixels around the real control
-       m_macVerticalBorder = 5 ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0, 
-               kControlListBoxProc , (long) this ) ;
-       
-       long    result ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
-
-       NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = lOnlyOne ;
-       if ( style  & wxLB_MULTIPLE )
-       {
-               (**m_macList).selFlags += lNoExtend ;
-       }
-       else if ( style & wxLB_EXTENDED )
-       {
-               (**m_macList).selFlags += lExtendDrag ;
-       }
-       Point pt = (**m_macList).cellSize ;
-       pt.v = 14 ;
-       LCellSize( pt , m_macList ) ;
+#if TARGET_CARBON
+    Size asize;

 
 

-       LAddColumn( 1 , 0 , m_macList ) ;

 
 

-       MacPostControlCreate() ;
+    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
+                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );

 
 

-       ControlFontStyleRec             controlstyle ;
-       controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
-       //controlstyle.font = kControlFontSmallSystemFont ;
-       controlstyle.font = kFontIDMonaco ;
-       controlstyle.size = 9 ;
-       ::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);

 
 

-       for ( int i = 0 ; i < n ; i++ )
-       {
-               Append( choices[i] ) ;
-       }
+    SetControlReference( (ControlHandle) m_macControl, (long) this);
+    SetControlVisibility( (ControlHandle) m_macControl, false, false);

 
 

-       LSetDrawingMode( true , m_macList ) ;
+#else

 
 

-  return TRUE;
+    long    result ;
+    wxStAppResource resload ;
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
+                  kwxMacListWithVerticalScrollbar , 0 , 0, 
+                  kControlListBoxProc , (long) this ) ;
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+               sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    ldefHandle ldef ;
+    ldef = (ldefHandle) NewHandle( sizeof(ldefRec) ) ;
+    if (  (**(ListHandle)m_macList).listDefProc != NULL )
+    {
+      (**ldef).instruction = 0x4EF9;  /* JMP instruction */
+      (**ldef).function = (void(*)()) listDef.u.userProc;
+      (**(ListHandle)m_macList).listDefProc = (Handle) ldef ;
+    }
+        
+    Point pt = (**(ListHandle)m_macList).cellSize ;
+    pt.v = kwxMacListItemHeight ;
+    LCellSize( pt , (ListHandle)m_macList ) ;
+    LAddColumn( 1 , 0 , (ListHandle)m_macList ) ;
+#endif
+    OptionBits  options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags((ListHandle)m_macList, options);
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+        Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , (ListHandle)m_macList ) ;
+
+    return TRUE;

 }
 
 wxListBox::~wxListBox()
 {
 }
 
 wxListBox::~wxListBox()
 {

-       Free() ;
-       DisposeExtLDEFInfo( m_macList ) ;
+    FreeData() ;
+    if ( m_macList )
+    {
+#if !TARGET_CARBON
+      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 )
 {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )


@@ -116,6 +265,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();


@@ -131,9 +281,30 @@ void wxListBox::Free()
     }
 }
 
     }
 }
 

+void  wxListBox::DoSetSize(int x, int y,
+            int width, int height,
+            int sizeFlags )
+{
+    wxControl::DoSetSize( x , y , width , height , sizeFlags ) ;
+#if TARGET_CARBON
+    Rect bounds ;
+    GetControlBounds( (ControlHandle) m_macControl , &bounds ) ;
+    ControlRef control = GetListVerticalScrollBar( (ListHandle)m_macList ) ;
+    if ( control )
+    {
+        Rect scrollbounds ;
+        GetControlBounds( control , &scrollbounds ) ;
+        if( scrollbounds.right != bounds.right + 1 )
+        {
+            UMAMoveControl( control , bounds.right - (scrollbounds.right - scrollbounds.left) + 1 , 
+                scrollbounds.top ) ;
+        }
+    }
+#endif
+}

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

-       MacScrollTo( N ) ;
+    MacScrollTo( N ) ;

 }
 
 void wxListBox::Delete(int N)
 }
 
 void wxListBox::Delete(int N)


@@ -143,32 +314,37 @@ void wxListBox::Delete(int N)
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];

-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);

 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
         delete GetClientObject(N);
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
         delete GetClientObject(N);
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN

-       m_stringArray.Remove( N ) ;
-       m_noItems --;
-       
-       MacDelete( N ) ;
+    m_stringArray.RemoveAt( N ) ;
+    m_dataArray.RemoveAt( N ) ;
+    m_noItems --;
+    
+    MacDelete( N ) ;

 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {

-       int index = m_noItems ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-       {
-               m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
-       }
-       else
-               m_stringArray.Add( item ) ;
-       m_noItems ++;
-       MacAppend( item ) ;
+    int index = m_noItems ;
+    if( wxApp::s_macDefaultEncodingIsPC )
+    {
+        m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
+        m_dataArray.Add( NULL );
+    }
+    else {
+        m_stringArray.Add( item ) ;
+        m_dataArray.Add( NULL );
+    }
+    m_noItems ++;
+    DoSetItemClientData( index , NULL ) ;
+    MacAppend( item ) ;

 
 

-       return index ;
+    return index ;

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


@@ -179,17 +355,17 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 
   for( int i = 0 ; i < n ; ++i )
   {
 
   for( int i = 0 ; i < n ; ++i )
   {

-       if ( clientData )
-       {
+    if ( clientData )
+    {

 #if wxUSE_OWNER_DRAWN
             wxASSERT_MSG(clientData[i] == NULL,
                          wxT("Can't use client data with owner-drawn listboxes"));
 #else // !wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN
             wxASSERT_MSG(clientData[i] == NULL,
                          wxT("Can't use client data with owner-drawn listboxes"));
 #else // !wxUSE_OWNER_DRAWN

-               Append( choices[i] , clientData[0] ) ;
+        Append( choices[i] , clientData[i] ) ;

  #endif
  #endif

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

   }
 
 #if wxUSE_OWNER_DRAWN
   }
 
 #if wxUSE_OWNER_DRAWN


@@ -198,6 +374,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();
 


@@ -219,38 +396,79 @@ bool wxListBox::HasMultipleSelection() const
 
 int wxListBox::FindString(const wxString& st) const
 {
 
 int wxListBox::FindString(const wxString& st) const
 {

-       wxString s ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-       {
-               s = wxMacMakeMacStringFromPC( st ) ;
-       }
-       else
-               s = st ;
-               
-       if ( s.Right(1) == "*" )
-       {
-               wxString search = s.Left( s.Length() - 1 ) ;
-               int len = search.Length() ;
-    for ( int i = 0 ; i < m_noItems ; ++ i )
+    wxString s ;
+    if( wxApp::s_macDefaultEncodingIsPC )

     {
     {

-       if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) )
-               return i ;
+        s = wxMacMakeMacStringFromPC( st ) ;

     }
     }

-       }
-       else
-       {
-    for ( int i = 0 ; i < m_noItems ; ++ i )
+    else
+        s = st ;
+        
+    if ( s.Right(1) == "*" )

     {
     {

-       if ( equalstring( m_stringArray[i] , s , false , false ) )
-               return i ;
+        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
+            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+#else
+            strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+            c2pstr( (char *) s1 ) ;
+#endif
+            if ( EqualString( s1 , s2 , false , false ) )
+                return i ;
+        }
+        if ( s.Left(1) == "*" && s.Length() > 1 )
+        {
+            s = 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
+            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
+#else
+            strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
+            c2pstr( (char *) s1 ) ;
+#endif
+            if ( EqualString( s1 , s2 , false , false ) )
+                return i ;
+        }

    }
    return -1;
 }
 
 void wxListBox::Clear()
 {
    }
    return -1;
 }
 
 void wxListBox::Clear()
 {

-  Free();
+  FreeData();

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


@@ -261,7 +479,8 @@ void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  "invalid index in wxListBox::SetSelection" );
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
                  "invalid index in wxListBox::SetSelection" );

-       MacSetSelection( N , select ) ;
+      MacSetSelection( N , select ) ;
+      GetSelections( m_selectionPreImage ) ;

 }
 
 bool wxListBox::IsSelected(int N) const
 }
 
 bool wxListBox::IsSelected(int N) const


@@ -269,20 +488,20 @@ bool wxListBox::IsSelected(int N) const
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
                  "invalid index in wxListBox::Selected" );
 
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
                  "invalid index in wxListBox::Selected" );
 

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

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

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

 
     return (void *)m_dataArray[N];
 }
 
 wxClientData *wxListBox::DoGetItemClientObject(int N) const
 {
 
     return (void *)m_dataArray[N];
 }
 
 wxClientData *wxListBox::DoGetItemClientObject(int N) const
 {

-       return (wxClientData *) DoGetItemClientData( N ) ;
+    return (wxClientData *) DoGetItemClientData( N ) ;

 }
 
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 }
 
 void wxListBox::DoSetItemClientData(int N, void *Client_data)


@@ -298,7 +517,16 @@ 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

-    m_dataArray[N] = (char*) Client_data ;
+    wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+    
+    if ( m_dataArray.GetCount() > N )
+    {
+        m_dataArray[N] = (char*) Client_data ;
+    }
+    else
+    {
+        m_dataArray.Add( (char*) Client_data ) ;
+    }

 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)


@@ -309,41 +537,24 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
 // Return number of selections and an array of selected integers
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {

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

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

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

 }
 
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
 }
 
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {

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

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)


@@ -353,23 +564,30 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
     int nItems = items.GetCount();
 
 
     int nItems = items.GetCount();
 

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

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

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

 }
 
 }
 

-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const

 {
     return wxSize(100, 100);
 }
 {
     return wxSize(100, 100);
 }


@@ -381,10 +599,16 @@ int wxListBox::GetCount() const
 
 void wxListBox::SetupColours()
 {
 
 void wxListBox::SetupColours()
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 

+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
+{
+    wxControl::Refresh( eraseBack , rect ) ;
+//    MacRedrawControl() ;
+}
+

 #if wxUSE_OWNER_DRAWN
 
 class wxListBoxItem : public wxOwnerDrawn
 #if wxUSE_OWNER_DRAWN
 
 class wxListBoxItem : public wxOwnerDrawn


@@ -412,166 +636,196 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 
 void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long 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());
-               
+    wxListBox*          list;
+    // typecast our refCon
+    list = (wxListBox*)refCon;
+        
+    MoveTo(cellRect->left + 4 , cellRect->top + 10 );
+    const wxString text = list->m_stringArray[lCell.v] ;
+    ::TextFont( kFontIDMonaco ) ;
+    ::TextSize( 9  );
+    ::TextFace( 0 ) ;
+    DrawText(text, 0 , text.Length());
+        

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

-       ListHandle list ;
-       long    result ;
-       Cell cell = { 0 , 0 } ;
-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list  , &result ) ;
-       LDelRow( 1 , N , list ) ;
+    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 ;
-
-       cell.h = 0 ;
-       cell.v = n ;
-
-       LAddRow( 1 , cell.v , m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = n ;
+    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 ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
+    LAddRow( 1 , cell.v , (ListHandle)m_macList ) ;
+ //   LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();

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

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

-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( TRUE , &cell , m_macList ) )
-       {
-               LSetSelect( false , cell , m_macList ) ;
-       }
-       
-       cell.v = n ;
-       LSetSelect( select , cell , m_macList ) ;
-       LAutoScroll( m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+    {
+        if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        {
+            LSetSelect( false , cell , (ListHandle)m_macList ) ;
+        }
+    }
+    
+    cell.v = n ;
+    LSetSelect( select , cell , (ListHandle)m_macList ) ;
+    LAutoScroll( (ListHandle)m_macList ) ;
+    Refresh();

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

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

 }
 
 void wxListBox::MacDestroy()
 {
 }
 
 void wxListBox::MacDestroy()
 {

-//     DisposeExtLDEFInfo( m_macList ) ;
+//    DisposeExtLDEFInfo( m_macList ) ;

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

-       Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( true , &cell , m_macList ) )
-               return cell.v ;
-       else
-               return -1 ;
+    Cell cell = { 0 , 0 } ;
+    if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        return cell.v ;
+    else
+        return -1 ;

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

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

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

-       Cell cell = { 0 , 0 } ;
-       cell.v = 0 ;
-       
-       while ( LGetSelect( true , &cell , m_macList ) )
-       {
-               aSelections.Add( cell.v ) ;
-               no_sel++ ;
-               cell.v++ ;
-       }
-       return no_sel ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = 0 ;
+    
+    while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
+    {
+        aSelections.Add( cell.v ) ;
+        no_sel++ ;
+        cell.v++ ;
+    }
+    return no_sel ;

 }
 
 void wxListBox::MacSet( int n , const char * text )
 {
 }
 
 void wxListBox::MacSet( int n , const char * text )
 {

-       // our implementation does not store anything in the list
-       // so we just have to redraw
-       Cell cell = { 0 , 0 } ;
-       cell.v = n ;
-       LDraw( cell , m_macList ) ;
+    // our implementation does not store anything in the list
+    // so we just have to redraw
+    Cell cell = { 0 , 0 } ;
+    cell.v = n ;
+//  LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();

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

-       // TODO implement scrolling
+    // TODO implement scrolling

 }
 
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
 }
 
 void wxListBox::OnSize( const wxSizeEvent &event)
 {

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

 }
 
 }
 

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

 {
 {

-       Boolean wasDoubleClick = false ;
-       long    result ;
+    Boolean wasDoubleClick = false ;
+    long    result ;

 
 

-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
-       if ( !wasDoubleClick )
-       {
-               MacDoClick() ;
-       }
-       else
-       {
-               MacDoDoubleClick() ;
-       }
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+    if ( !wasDoubleClick )
+    {
+        MacDoClick() ;
+    }
+    else
+    {
+        MacDoDoubleClick() ;
+    }

 }
 
 void wxListBox::MacSetRedraw( bool doDraw ) 
 {
 }
 
 void wxListBox::MacSetRedraw( bool doDraw ) 
 {

-       LSetDrawingMode( doDraw , m_macList ) ;
-       
+    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
+    

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

-       wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
+    wxArrayInt aSelections;
+    int n, count = GetSelections(aSelections);
+    
+    if ( count == m_selectionPreImage.GetCount() )
+    {
+        bool hasChanged = false ;
+        for ( int i = 0 ; i < count ; ++i )
+        {
+            if ( aSelections[i] != m_selectionPreImage[i] )
+            {
+                hasChanged = true ;
+                break ;
+            }
+        }
+        if ( !hasChanged )
+        {
+            return ;
+        }
+    }
+    
+    m_selectionPreImage = aSelections;
+    
+    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);

     event.SetEventObject( this );
 
     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
-       {
+    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;
          n = -1;

-       }
-       
+    }
+    

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


@@ -583,3 +837,60 @@ void wxListBox::MacDoDoubleClick()
     event.SetEventObject( this );
        GetEventHandler()->ProcessEvent(event) ; 
 }
     event.SetEventObject( this );
        GetEventHandler()->ProcessEvent(event) ; 
 }

+
+static long sLastTypeIn = 0 ;
+
+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 )
+       {
+        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.KeyCode() == WXK_DOWN || event.KeyCode() == WXK_UP )
+       {
+           // default handling
+           event.Skip() ;
+//       ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
+       } 
+       else
+       {
+         if ( ev->when > m_lastTypeIn + 60 )
+         {
+           m_typeIn = "" ;
+         }
+         m_lastTypeIn = ev->when ;
+         m_typeIn += (char) event.KeyCode() ;
+         int line = FindString("*"+m_typeIn+"*") ;
+         if ( line >= 0 )
+         {
+           SetSelection(line) ;
+         }
+       }
+}
+