cleanups, proper event handling/cleanup

[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 d471bb7940e76a4faaee0392ea521e3a07bad8f6..d5aa80277db3cff8447bdea33ebf517410ab02ee 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -125,18 +125,19 @@ public:
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
     // Windows callbacks
-
-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-       virtual bool MacCanFocus() const { return true ; }
+#if !__WXMAC_OSX__
     void OnChar(wxKeyEvent& event);
+#endif
 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;
     wxArrayInt      m_selectionPreImage ;
-    wxArrayLong     m_idArray ;
-    wxUint32        m_nextId ;
     
     void            MacSetRedraw( bool doDraw ) ;
 protected:
@@ -150,12 +151,12 @@ protected:
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;
+#if !__WXMAC_OSX__
     void            OnSize( wxSizeEvent &size ) ;
+#endif
     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()