don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index d3417248c84ab539da1c16469fc34b004aa9e0cf..642af2b89bbbb2c374a7a901982f6c0ad3099110 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -1,27 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        src/mac/carbon/palette.cpp

 // Purpose:     wxPalette
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxPalette
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "palette.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if wxUSE_PALETTE
 
 #include "wx/palette.h"
 
 #include "wx/wxprec.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


@@ -58,61 +52,60 @@ wxPalette::~wxPalette()
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
     UnRef();
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
     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 )
 {
     if ( !m_refData )

-        return -1;
-    
+        return wxNOT_FOUND;
+

     long bestdiff = 3 * 256 ;
     long bestpos = 0 ;
     long currentdiff ;
     long bestdiff = 3 * 256 ;
     long bestpos = 0 ;
     long currentdiff ;

-    
+

     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 )
         {
             bestdiff = currentdiff ;
             bestpos = i ;
             if ( bestdiff == 0 )
         currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue )  ;
         if ( currentdiff < bestdiff )
         {
             bestdiff = currentdiff ;
             bestpos = i ;
             if ( bestdiff == 0 )

-                break ; 
+                break ;

         }
     }
         }
     }

-    
+

     return bestpos;
 }
 
 bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
 {
     if ( !m_refData )
     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)
     if (index < 0 || index >= M_PALETTEDATA->m_count)

-        return FALSE;
-    
-    const wxColour& col = &M_PALETTEDATA->m_palette[index] ;
+        return false;
+
+    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() ;

-    
-    return TRUE;
+
+    return true;

 }
 
 #endif
 // wxUSE_PALETTE
 }
 
 #endif
 // wxUSE_PALETTE

-