use wxString::Format(), calling string.Format() has no effect patch 1267345)

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

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 1c18196135861acd9c20f81456b50ce4ef9b34dd..d6295de46a0f762da761139fe7aba5e0116b7803 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -1,27 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        palette.cpp
 // Purpose:     wxPalette
 /////////////////////////////////////////////////////////////////////////////
 // Name:        palette.cpp
 // Purpose:     wxPalette

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "palette.h"
 #endif
 
 #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


@@ -30,13 +28,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
 wxPaletteRefData::wxPaletteRefData()
 {
 
 wxPaletteRefData::wxPaletteRefData()
 {

-       m_palette = NULL ;
-       m_count = 0 ;
+    m_palette = NULL ;
+    m_count = 0 ;

 }
 
 wxPaletteRefData::~wxPaletteRefData()
 {
 }
 
 wxPaletteRefData::~wxPaletteRefData()
 {

-       delete[] m_palette ;
+    if (m_palette != NULL) {
+        delete[] m_palette ;
+        m_palette = NULL;
+    }

 }
 
 wxPalette::wxPalette()
 }
 
 wxPalette::wxPalette()


@@ -54,41 +55,41 @@ wxPalette::~wxPalette()
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {

-  UnRef();
-
-  m_refData = new wxPaletteRefData;
-
-  M_PALETTEDATA->m_count = n ;
-  M_PALETTEDATA->m_palette = new wxColour[n] ;
-  
-  for ( int i = 0 ; i < n ; ++i)
-  {
-       M_PALETTEDATA->m_palette[i].Set( red[i] , green[i] , blue[i] ) ;
-       }
-
-  return FALSE;
+    UnRef();
+    
+    m_refData = new wxPaletteRefData;
+    
+    M_PALETTEDATA->m_count = n ;
+    M_PALETTEDATA->m_palette = new wxColour[n] ;
+    
+    for ( int i = 0 ; i < n ; ++i)
+    {
+        M_PALETTEDATA->m_palette[i].Set( red[i] , green[i] , blue[i] ) ;
+    }
+    
+    return FALSE;

 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
     if ( !m_refData )
 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
     if ( !m_refData )

-       return -1;
-
+        return -1;
+    

     long bestdiff = 3 * 256 ;
     long bestpos = 0 ;
     long currentdiff ;
     
     for ( int i = 0  ; i < M_PALETTEDATA->m_count ; ++i )
     {
     long bestdiff = 3 * 256 ;
     long bestpos = 0 ;
     long currentdiff ;
     
     for ( int i = 0  ; i < M_PALETTEDATA->m_count ; ++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 )
-       {
-               bestdiff = currentdiff ;
-               bestpos = i ;
-               if ( bestdiff == 0 )
-                       break ; 
-       }
+        const wxColour& col = M_PALETTEDATA->m_palette[i] ;
+        currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue )  ;
+        if ( currentdiff < bestdiff )
+        {
+            bestdiff = currentdiff ;
+            bestpos = i ;
+            if ( bestdiff == 0 )
+                break ; 
+        }

     }
     
     return bestpos;
     }
     
     return bestpos;


@@ -97,12 +98,12 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons
 bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
 {
     if ( !m_refData )
 bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
 {
     if ( !m_refData )

-           return FALSE;
-
+        return FALSE;
+    

     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() ;


@@ -111,5 +112,5 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
 }
 
 #endif
 }
 
 #endif

-    // wxUSE_PALETTE
+// wxUSE_PALETTE