X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..81764280afaa3e2ff80aa16a2ee433358e7ff272:/include/wx/mac/choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 998f06d203..f9d790df06 100644
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -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() {}
-  virtual ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -90,7 +93,8 @@ 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 ;