X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56d4016a1685178f2156ee65fb9fc5143c3f7bed..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/mac/choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index fa92e234d1..f9d790df06 100644
--- 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;
 
@@ -27,11 +27,14 @@ WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 
- public:
-  wxChoice() {}
-  ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -52,16 +55,19 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 
-    virtual int DoAppend(const wxString& item);
+  // implement base class pure virtuals
+  virtual int DoAppend(const wxString& item);
   virtual void Delete(int n);
   virtual void Clear();
+
   virtual int GetCount() const ;
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);
+
   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);
@@ -73,28 +79,26 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
-  virtual inline int Number() const { return m_strings.GetCount(); }
-  virtual inline int GetCount() const { return m_strings.GetCount(); }
+  // Mac specific
   virtual void Command(wxCommandEvent& event);
+  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();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();
 
   wxArrayString m_strings;
-  wxChoiceDataArray m_dataArray ;
-  MenuHandle	m_macPopUpMenuHandle ;
+  wxChoiceDataArray m_datas ;
+  WXHMENU	m_macPopUpMenuHandle ;
 };
 
 #endif