Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 82c7a52228711308647cc405e47fb46fb63eca89..a122f95f3787de5c490d02a646f515b0dedcdad7 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "choice.h"
 #endif
 
@@ -93,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 ;