Only include/build pnghand if the user builds the png library (avoids multiple build...

[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..f94cff95b9c781dc719c9651a1fa0e76d7441568 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -125,9 +125,14 @@ 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 ;
 
     void*           m_macList ;
     wxArrayString   m_stringArray ;


@@ -148,7 +153,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() ;