X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..2ab25aca26bffe363b1f76623c736602a70eb56f:/include/wx/mac/choice.h

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 82c7a52228..2d526e0d56 100644
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 
@@ -67,7 +67,7 @@ public:
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual void SetString( int , const wxString& s ) ;
-	void		MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+    void        MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 
 /*
   virtual void Append(const wxString& item);
@@ -81,7 +81,7 @@ public:
 
   // Mac specific
   virtual void Command(wxCommandEvent& event);
-  void		MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+  void        MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 
   virtual inline int GetColumns() const { return 1 ; };
 */
@@ -93,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 ;
-  WXHMENU	m_macPopUpMenuHandle ;
+  WXHMENU    m_macPopUpMenuHandle ;
 };
 
 #endif
-	// _WX_CHOICE_H_
+    // _WX_CHOICE_H_