X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..6e807169c4b63b29b42c36ae15141a31adb29204:/src/mac/palette.cpp?ds=sidebyside

diff --git a/src/mac/palette.cpp b/src/mac/palette.cpp
index f8db96f8d0..676f54739a 100644
--- a/src/mac/palette.cpp
+++ b/src/mac/palette.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/palette.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-#endif
 
 /*
  * Palette
@@ -26,12 +24,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
 wxPaletteRefData::wxPaletteRefData()
 {
-    // TODO
+	m_palette = NULL ;
+	m_count = 0 ;
 }
 
 wxPaletteRefData::~wxPaletteRefData()
 {
-    // TODO
+	delete[] m_palette ;
 }
 
 wxPalette::wxPalette()
@@ -53,7 +52,13 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
 
   m_refData = new wxPaletteRefData;
 
-  // TODO
+  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;
 }
@@ -61,10 +66,26 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
     if ( !m_refData )
-  	return FALSE;
-
-    // TODO
-    return FALSE;
+  	return -1;
+
+    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 ; 
+    	}
+    }
+    
+    return bestpos;
 }
 
 bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
@@ -72,11 +93,15 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     if ( !m_refData )
 	    return FALSE;
 
-    if (index < 0 || index > 255)
+    if (index < 0 || index >= M_PALETTEDATA->m_count)
         return FALSE;
 
-    // TODO
-    return FALSE;
+    const wxColour& col = &M_PALETTEDATA->m_palette[index] ;
+    *red = col.Red() ;
+    *green = col.Green() ;
+    *blue = col.Blue() ;
+    
+    return TRUE;
 }