X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9453cf2bd702241fabc417e9dd5cd7422bcd9966..e12c92c2f7829e0d4666c0464e6c0d5b622768cc:/include/wx/mac/choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 50a506940b..86419c148b 100644
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -1,37 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.h
 // Purpose:     wxChoice class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "choice.h"
 #endif
 
 #include "wx/control.h"
 
-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 
- public:
-  wxChoice() {}
-  virtual ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -64,7 +67,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,7 +81,7 @@ 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 ; };
 */
@@ -90,12 +93,13 @@ protected:
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // 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_datas ;
-  MenuHandle	m_macPopUpMenuHandle ;
+  WXHMENU    m_macPopUpMenuHandle ;
 };
 
 #endif
-	// _WX_CHOICE_H_
+    // _WX_CHOICE_H_