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 ecb867cdd36d14b61a06008265843808818d8f77..d5aa80277db3cff8447bdea33ebf517410ab02ee 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -125,16 +125,19 @@ public:
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 

+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // Windows callbacks
     // Windows callbacks

-
+#if !__WXMAC_OSX__

     void OnChar(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);

+#endif

 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;
     wxArrayInt      m_selectionPreImage ;
 
     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:


@@ -148,7 +151,9 @@ protected:
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;

+#if !__WXMAC_OSX__

     void            OnSize( wxSizeEvent &size ) ;
     void            OnSize( wxSizeEvent &size ) ;

+#endif

     void            MacDoClick() ;
     void            MacDoDoubleClick() ;
 
     void            MacDoClick() ;
     void            MacDoDoubleClick() ;