Update to Scintilla 1.48

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

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index ff4be4552789f7ec0cdeba6fc390f4608bb1ea7c..8158bf673138cc8c0ac74b8aa035d2e34c5a27ce 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -13,7 +13,7 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "listbox.h"
 #endif
 
     #pragma interface "listbox.h"
 #endif
 


@@ -138,7 +138,8 @@ protected:
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)

-    void Free();
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();

 
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;