Fix for missing -g from wx-config

[wxWidgets.git] / include / wx / mac / choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 335bebd869d45f520ddb1657301f8d1b6a0e98dc..3f796ac07066411ce41b9a0c2db490533658fd8d 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 


@@ -83,20 +83,17 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:
   virtual inline int GetColumns() const { return 1 ; };
 */
 protected:

+    virtual wxSize DoGetBestSize() const ;

     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;

-  wxChoiceDataArray m_dataArray ;
+  wxChoiceDataArray m_datas ;

   MenuHandle   m_macPopUpMenuHandle ;
 };
 
   MenuHandle   m_macPopUpMenuHandle ;
 };