More unicode related cleanup and fixes for wxPython

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 335bebd869d45f520ddb1657301f8d1b6a0e98dc..998f06d20329dce6c9bdfb0b63650b3294a7c47a 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;
-       void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+       void            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 
 /*
   virtual void Append(const wxString& item);
@@ -78,26 +78,23 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
   // Mac specific
   virtual void Command(wxCommandEvent& event);
-  void         MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 
   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 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;
-  wxChoiceDataArray m_dataArray ;
-  MenuHandle   m_macPopUpMenuHandle ;
+  wxChoiceDataArray m_datas ;
+  WXHMENU      m_macPopUpMenuHandle ;
 };
 
 #endif