correcting Drag Data handling for 'TEXT' and 'utxt'

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

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 60a0de6a8a57792b32270aa48ef3b1c3f21f9748..d6295de46a0f762da761139fe7aba5e0116b7803 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -9,19 +9,17 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "palette.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_PALETTE
 
 #include "wx/palette.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-#endif
 
 /*
  * Palette
@@ -83,7 +81,7 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons
     
     for ( int i = 0  ; i < M_PALETTEDATA->m_count ; ++i )
     {
-        const wxColour& col = &M_PALETTEDATA->m_palette[i] ;
+        const wxColour& col = M_PALETTEDATA->m_palette[i] ;
         currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue )  ;
         if ( currentdiff < bestdiff )
         {
@@ -105,7 +103,7 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     if (index < 0 || index >= M_PALETTEDATA->m_count)
         return FALSE;
     
-    const wxColour& col = &M_PALETTEDATA->m_palette[index] ;
+    const wxColour& col = M_PALETTEDATA->m_palette[index] ;
     *red = col.Red() ;
     *green = col.Green() ;
     *blue = col.Blue() ;