rename method to prevent collision with some BSD definitions of macro Free()

[wxWidgets.git] / src / mac / carbon / palette.cpp

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 676f54739aa1b8b2be49a6e394ad455461566535..c847131f4021a64d2d4e3cd5f6d5520e0add2a1e 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -13,9 +13,15 @@
 #pragma implementation "palette.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_PALETTE
+
 #include "wx/palette.h"
 
+#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
+#endif
 
 /*
  * Palette
@@ -30,7 +36,10 @@ wxPaletteRefData::wxPaletteRefData()
 
 wxPaletteRefData::~wxPaletteRefData()
 {
-       delete[] m_palette ;
+    if (m_palette != NULL) {
+        delete[] m_palette ;
+        m_palette = NULL;
+    }
 }
 
 wxPalette::wxPalette()
@@ -104,4 +113,6 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     return TRUE;
 }
 
+#endif
+    // wxUSE_PALETTE