Mac compilation fix after const patch

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

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 60a0de6a8a57792b32270aa48ef3b1c3f21f9748..33cd9b972dee43dd32be8e6e29a7c2598d9f58a2 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -9,19 +9,13 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "palette.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_PALETTE
 
 #include "wx/palette.h"
 
 
 #if wxUSE_PALETTE
 
 #include "wx/palette.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)

-#endif

 
 /*
  * Palette
 
 /*
  * Palette


@@ -83,7 +77,7 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons
     
     for ( int i = 0  ; i < M_PALETTEDATA->m_count ; ++i )
     {
     
     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 )
         {
         currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue )  ;
         if ( currentdiff < bestdiff )
         {


@@ -105,7 +99,7 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     if (index < 0 || index >= M_PALETTEDATA->m_count)
         return FALSE;
     
     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() ;
     *red = col.Red() ;
     *green = col.Green() ;
     *blue = col.Blue() ;