added carbon events for navigation keys, size corrections

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 1dad21e12c4167ff042aa439ebb08261f70c4caf..9a10e64d2976092fc2e4de20157a02a626ca429f 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,15 +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/dynarray.h"
 #include "wx/log.h"
 

+#include "wx/utils.h"
+

 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

+
+BEGIN_EVENT_TABLE(wxListBox, wxControl)
+    EVT_SIZE( wxListBox::OnSize ) 
+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
 
 #endif
 

+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 ;
+const short kwxMacListItemHeight = 14 ;
+

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


@@ -31,8 +149,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,


@@ -41,195 +162,674 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-  m_noItems = n;
-  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 ;
+
+#if TARGET_CARBON
+    Size asize;
+
+
+    CreateListBoxControl( MAC_WXHWND(parent->MacGetRootWindow()), &bounds, false, 0, 1, false, true,
+                          kwxMacListItemHeight, kwxMacListItemHeight, false, &listDef, (ControlRef *)&m_macControl );

 
 

-  SetName(name);
-  SetValidator(validator);
+    GetControlData( (ControlHandle) m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);

 
 

-  if (parent) parent->AddChild(this);
+    SetControlReference( (ControlHandle) m_macControl, (long) this);
+    SetControlVisibility( (ControlHandle) m_macControl, false, false);

 
 

-  wxSystemSettings settings;
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+#else

 
 

-  m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
+    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 ) ;

 
 

-  // TODO create listbox
+    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 FALSE;
+    return TRUE;

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

+    Free() ;
+    if ( m_macList )
+    {
+#if !TARGET_CARBON
+      DisposeHandle( (**(ListHandle)m_macList).listDefProc ) ;
+      (**(ListHandle)m_macList).listDefProc = NULL ;
+#endif
+        m_macList = NULL ;
+    }

 }
 
 }
 

-void wxListBox::SetFirstItem(int N)
+void wxListBox::Free()

 {
 {

-    // TODO
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        size_t uiCount = m_aItems.Count();
+        while ( uiCount-- != 0 ) {
+            delete m_aItems[uiCount];
+        }
+
+        m_aItems.Clear();
+    }
+    else
+#endif // wxUSE_OWNER_DRAWN
+    if ( HasClientObjectData() )
+    {
+        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }

 }
 
 }
 

-void wxListBox::SetFirstItem(const wxString& s)
+void  wxListBox::DoSetSize(int x, int y,
+            int width, int height,
+            int sizeFlags )

 {
 {

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

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

-  m_noItems --;
-    // TODO
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 wxT("invalid index in wxListBox::Delete") );
+
+#if wxUSE_OWNER_DRAWN
+    delete m_aItems[N];
+    m_aItems.RemoveAt(N);
+#else // !wxUSE_OWNER_DRAWN
+    if ( HasClientObjectData() )
+    {
+        delete GetClientObject(N);
+    }
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+    m_stringArray.Remove( N ) ;
+    m_dataArray.RemoveAt( N ) ;
+    m_noItems --;
+    
+    MacDelete( N ) ;

 }
 
 }
 

-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)

 {
 {

-  m_noItems ++;
+    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 ) ;

 
 

-  // TODO
+    return index ;

 }
 
 }
 

-void wxListBox::Append(const wxString& item, char *Client_data)
-{
-  m_noItems ++;
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+{ 
+  MacSetRedraw( false ) ;
+  Clear() ;  
+  int n = choices.GetCount();

 
 

-  // TODO
+  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"));
+#else // !wxUSE_OWNER_DRAWN
+        Append( choices[i] , clientData[i] ) ;
+ #endif
+    }
+    else
+        Append( choices[i] ) ;
+  }
+
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW ) {
+        // first delete old items
+        size_t ui = m_aItems.Count();
+        while ( ui-- != 0 ) {
+            delete m_aItems[ui];
+        }
+        m_aItems.Empty();
+
+        // then create new ones
+        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
+            wxOwnerDrawn *pNewItem = CreateItem(ui);
+            pNewItem->SetName(choices[ui]);
+            m_aItems.Add(pNewItem);
+        }
+    }
+#endif // wxUSE_OWNER_DRAWN
+  MacSetRedraw( true ) ;

 }
 
 }
 

-void wxListBox::Set(int n, const wxString *choices, char** clientData)
+bool wxListBox::HasMultipleSelection() const

 {
 {

-  m_noItems = n;
-
-  // TODO
+    return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);

 }
 
 }
 

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

 {
 {

-    // TODO
-    return -1;
+    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() ;
+        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.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()
 {
 }
 
 void wxListBox::Clear()
 {

+  Free();

   m_noItems = 0;
   m_noItems = 0;

-  // TODO
+  m_stringArray.Empty() ;
+  m_dataArray.Empty() ;
+  MacClear() ;

 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
 }
 
 void wxListBox::SetSelection(int N, bool select)
 {

-    // TODO
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 "invalid index in wxListBox::SetSelection" );
+      MacSetSelection( N , select ) ;
+      GetSelections( m_selectionPreImage ) ;

 }
 
 }
 

-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const

 {
 {

-    // TODO
-    return FALSE;
+    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
+                 "invalid index in wxListBox::Selected" );
+
+      return MacIsSelected( N ) ;

 }
 
 }
 

-void wxListBox::Deselect(int N)
+void *wxListBox::DoGetItemClientData(int N) const

 {
 {

-    // TODO
+    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
+                 wxT("invalid index in wxListBox::GetClientData"));
+
+    return (void *)m_dataArray[N];

 }
 
 }
 

-char *wxListBox::GetClientData(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(int N) const

 {
 {

-    // TODO
-    return (char *)NULL;
+    return (wxClientData *) DoGetItemClientData( N ) ;

 }
 
 }
 

-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::DoSetItemClientData(int N, void *Client_data)

 {
 {

-    // TODO
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 "invalid index in wxListBox::SetClientData" );
+
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        // client data must be pointer to wxOwnerDrawn, otherwise we would crash
+        // in OnMeasure/OnDraw.
+        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 )
+    {
+        m_dataArray[N] = (char*) Client_data ;
+    }
+    else
+    {
+        m_dataArray.Add( (char*) Client_data ) ;
+    }
+}
+
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+{
+    DoSetItemClientData(n, 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
 {

-    aSelections.Empty();
+    return MacGetSelections( aSelections ) ;
+}

 
 

-/* TODO
-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
+// Get single selection, for single choice list items
+int wxListBox::GetSelection() const
+{
+    return MacGetSelection() ;
+}
+
+// Find string for position
+wxString wxListBox::GetString(int N) const
+{
+    if( wxApp::s_macDefaultEncodingIsPC )

     {
     {

-        int no_sel = ??
-        for ( int n = 0; n < no_sel; n++ )
-            aSelections.Add(??);
+        return      wxMacMakePCStringFromMac( m_stringArray[N] ) ;
+    }
+    else
+        return m_stringArray[N]  ;
+}

 
 

-        return no_sel;
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+                 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] ) ;

     }
     }

-    else  // single-selection listbox
+
+    m_noItems += nItems;
+}
+
+void wxListBox::SetString(int N, const wxString& s)
+{
+    wxString str ;
+    if( wxApp::s_macDefaultEncodingIsPC )

     {
     {

-        aSelections.Add(??);
+        str = wxMacMakeMacStringFromPC( s )  ;
+    }
+    else
+        str = s ;
+    m_stringArray[N] = str ;
+    MacSet( N , s ) ;
+}
+
+wxSize wxListBox::DoGetBestSize() const
+{
+    return wxSize(100, 100);
+}
+
+int wxListBox::GetCount() const
+{
+    return m_noItems;
+}
+
+void wxListBox::SetupColours()
+{
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(GetParent()->GetForegroundColour());
+}
+
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
+{
+    wxControl::Refresh( eraseBack , rect ) ;
+//    MacRedrawControl() ;
+}
+
+#if wxUSE_OWNER_DRAWN
+
+class wxListBoxItem : public wxOwnerDrawn
+{
+public:
+    wxListBoxItem(const wxString& str = "");
+};
+
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+{
+    // no bitmaps/checkmarks
+    SetMarginWidth(0);
+}
+
+wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+{
+    return new wxListBoxItem();
+}
+
+#endif  //USE_OWNER_DRAWN
+
+// ============================================================================
+// list box control implementation
+// ============================================================================
+
+void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon)
+{
+    wxListBox*          list;
+    // typecast our refCon
+    list = (wxListBox*)refCon;
+        
+    MoveTo(cellRect->left + 4 , cellRect->top + 10 );
+    const wxString text = list->m_stringArray[lCell.v] ;
+    ::TextFont( kFontIDMonaco ) ;
+    ::TextSize( 9  );
+    ::TextFace( 0 ) ;
+    DrawText(text, 0 , text.Length());
+        
+}
+
+void wxListBox::MacDelete( int N )
+{
+    LDelRow( 1 , N , (ListHandle)m_macList) ;
+    Refresh();
+}
+
+void wxListBox::MacInsert( int n , const char * text) 
+{
+    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) 
+{
+    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() 
+{
+    LDelRow( (**(ListHandle)m_macList).dataBounds.bottom , 0 ,(ListHandle) m_macList ) ;
+    Refresh();
+}

 
 

-        return 1;
+void wxListBox::MacSetSelection( int n , bool select )
+{
+    Cell cell = { 0 , 0 } ;
+    if ( ! (m_windowStyle & wxLB_MULTIPLE) )
+    {
+        if ( LGetSelect( true , &cell , (ListHandle)m_macList ) )
+        {
+            LSetSelect( false , cell , (ListHandle)m_macList ) ;
+        }

     }
     }

-*/
-    return 0;
+    
+    cell.v = n ;
+    LSetSelect( select , cell , (ListHandle)m_macList ) ;
+    LAutoScroll( (ListHandle)m_macList ) ;
+    Refresh();

 }
 
 }
 

-// Get single selection, for single choice list items
-int wxListBox::GetSelection() const
+bool wxListBox::MacIsSelected( int n ) const

 {
 {

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

 }
 
 }
 

-// Find string for position
-wxString wxListBox::GetString(int N) const
+void wxListBox::MacDestroy()

 {
 {

-    // TODO
-    return wxString("");
+//    DisposeExtLDEFInfo( m_macList ) ;

 }
 
 }
 

-void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+int wxListBox::MacGetSelection() const

 {
 {

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

 }
 
 }
 

-void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const

 {
 {

-    m_noItems += nItems;
+    int no_sel = 0 ;
+    
+    aSelections.Empty();

 
 

-    // TODO
+    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::SetString(int N, const wxString& s)
+void wxListBox::MacSet( int n , const char * text )

 {
 {

-    // TODO
+    // 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();

 }
 
 }
 

-int wxListBox::Number () const
+void wxListBox::MacScrollTo( int n )

 {
 {

-  return m_noItems;
+    // TODO implement scrolling

 }
 
 }
 

-// For single selection items only
-wxString wxListBox::GetStringSelection () const
+void wxListBox::OnSize( const wxSizeEvent &event)

 {
 {

-  int sel = GetSelection ();
-  if (sel > -1)
-    return this->GetString (sel);
-  else
-    return wxString("");
+    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 ) ;

 }
 
 }
 

-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
 {

-  int sel = FindString (s);
-  if (sel > -1)
+    Boolean wasDoubleClick = false ;
+    long    result ;
+
+    ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+    if ( !wasDoubleClick )

     {
     {

-      SetSelection (sel, flag);
-      return TRUE;
+        MacDoClick() ;
+    }
+    else
+    {
+        MacDoDoubleClick() ;

     }
     }

-  else
-    return FALSE;

 }
 
 }
 

-void wxListBox::Command (wxCommandEvent & event)
+void wxListBox::MacSetRedraw( bool doDraw ) 

 {
 {

-  if (event.m_extraLong)
-    SetSelection (event.m_commandInt);
-  else
+    LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
+    
+}
+
+void wxListBox::MacDoClick()
+{
+    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 );
+
+    if ( count > 0 )

     {
     {

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

     }
     }

-  ProcessCommand (event);
+    else
+    {
+         n = -1;
+    }
+    
+    event.m_commandInt = n;
+
+    GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

+void wxListBox::MacDoDoubleClick()
+{
+    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(event) ; 
+}