X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..9154a136d5e1d79a4be2cf012e4a815fdc6df3ff:/src/mac/carbon/palette.cpp

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 676f54739a..cb5ca9487b 100644
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.cpp
+// Name:        src/mac/carbon/palette.cpp
 // Purpose:     wxPalette
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "palette.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_PALETTE
 
 #include "wx/palette.h"
 
@@ -24,13 +24,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
 wxPaletteRefData::wxPaletteRefData()
 {
-	m_palette = NULL ;
-	m_count = 0 ;
+    m_palette = NULL ;
+    m_count = 0 ;
 }
 
 wxPaletteRefData::~wxPaletteRefData()
 {
-	delete[] m_palette ;
+    if (m_palette != NULL) {
+        delete[] m_palette ;
+        m_palette = NULL;
+    }
 }
 
 wxPalette::wxPalette()
@@ -48,60 +51,70 @@ wxPalette::~wxPalette()
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
-  UnRef();
+    UnRef();
+
+    m_refData = new wxPaletteRefData;
 
-  m_refData = new wxPaletteRefData;
+    M_PALETTEDATA->m_count = n ;
+    M_PALETTEDATA->m_palette = new wxColour[n] ;
 
-  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] ) ;
-	}
+    for ( int i = 0 ; i < n ; ++i)
+    {
+        M_PALETTEDATA->m_palette[i].Set( red[i] , green[i] , blue[i] ) ;
+    }
 
-  return FALSE;
+    return false;
 }
 
-int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
+int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char blue) const
 {
     if ( !m_refData )
-  	return -1;
+        return wxNOT_FOUND;
 
     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;
 }
 
 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;
+        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() ;
+
+    return true;
+}
+
+int wxPalette::GetColoursCount() const
+{
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
     
-    return TRUE;
+    return 0;    
 }
 
 
+#endif
+// wxUSE_PALETTE