Get(Class)DefaultAttributes() for wxGTK controls

[wxWidgets.git] / include / wx / mac / carbon / listbox.h

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index 77c0f27209ffc97c07e43385b01f9c191ba923ca..ecb867cdd36d14b61a06008265843808818d8f77 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -127,18 +127,17 @@ public:
 
     // Windows callbacks
 
 
     // Windows callbacks
 

-    virtual void    SetupColours();
-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-       virtual bool MacCanFocus() const { return true ; }

     void OnChar(wxKeyEvent& event);
 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;
     wxArrayInt      m_selectionPreImage ;
     void OnChar(wxKeyEvent& event);
 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;
     wxArrayInt      m_selectionPreImage ;

+    wxArrayLong     m_idArray ;
+    wxUint32        m_nextId ;
+    

     void            MacSetRedraw( bool doDraw ) ;
 protected:
     void            MacSetRedraw( bool doDraw ) ;
 protected:

-    void            MacDestroy() ;

     void            MacDelete( int n ) ;
     void            MacInsert( int n , const wxString& item) ;
     void            MacAppend( const wxString& item) ;
     void            MacDelete( int n ) ;
     void            MacInsert( int n , const wxString& item) ;
     void            MacAppend( const wxString& item) ;


@@ -153,8 +152,6 @@ protected:
     void            MacDoClick() ;
     void            MacDoDoubleClick() ;
 
     void            MacDoClick() ;
     void            MacDoDoubleClick() ;
 

-    // do we have multiple selections?
-    bool HasMultipleSelection() const;

 
     // free memory (common part of Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
 
     // free memory (common part of Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()