fixed wxString::FromAscii signature

[wxWidgets.git] / src / generic / paletteg.cpp

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 1b2ca8e2fff6943ef2a04d25fab9dd66ef2be0a9..ac8cd8a83bf522d9b2f473c5b9ac44cb4d1cf214 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -3,16 +3,11 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

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

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart

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

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

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -38,7 +33,7 @@ class wxPaletteRefData: public wxObjectRefData
   public:
 
     wxPaletteRefData(void);
   public:
 
     wxPaletteRefData(void);

-    ~wxPaletteRefData(void);
+    virtual ~wxPaletteRefData(void);

 
     int m_count;
     wxPaletteEntry *m_entries;
 
     int m_count;
     wxPaletteEntry *m_entries;


@@ -71,36 +66,21 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
     Create(n, red, green, blue);
 }
 
     Create(n, red, green, blue);
 }
 

-wxPalette::wxPalette(const wxPalette& palette)
-    : wxGDIObject()
-{
-    Ref(palette);
-}
-

 wxPalette::~wxPalette()
 {
 }
 
 wxPalette::~wxPalette()
 {
 }
 

-wxPalette& wxPalette::operator = (const wxPalette& palette)
-{
-    if (*this == palette) return (*this);
-    Ref(palette);
-    return *this;
-}
-
-bool wxPalette::operator == (const wxPalette& palette)
-{
-    return m_refData == palette.m_refData;
-}
-
-bool wxPalette::operator != (const wxPalette& palette)
+bool wxPalette::IsOk() const

 {
 {

-    return m_refData != palette.m_refData;
+    return (m_refData != NULL);

 }
 
 }
 

-bool wxPalette::Ok(void) const
+int wxPalette::GetColoursCount() const

 {
 {

-    return (m_refData != NULL);
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
+    
+    return 0;    

 }
 
 bool wxPalette::Create(int n,
 }
 
 bool wxPalette::Create(int n,


@@ -122,14 +102,14 @@ bool wxPalette::Create(int n,
         e->blue = blue[i];
     }
 
         e->blue = blue[i];
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-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 FALSE;
+    if (!m_refData) return wxNOT_FOUND;

 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256
 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256


@@ -152,16 +132,14 @@ bool wxPalette::GetRGB(int pixel,
                        unsigned char *green,
                        unsigned char *blue) const
 {
                        unsigned char *green,
                        unsigned char *blue) const
 {

-    if (!m_refData) return FALSE;
-    if (pixel >= M_PALETTEDATA->m_count) return FALSE;
+    if (!m_refData) return false;
+    if (pixel >= M_PALETTEDATA->m_count) return false;

 
     wxPaletteEntry& p = M_PALETTEDATA->m_entries[pixel];
     if (red) *red = p.red;
     if (green) *green = p.green;
     if (blue) *blue = p.blue;
 
     wxPaletteEntry& p = M_PALETTEDATA->m_entries[pixel];
     if (red) *red = p.red;
     if (green) *green = p.green;
     if (blue) *blue = p.blue;

-    return TRUE;
+    return true;

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

-
-