continue with loading the message catalog even if setting the locale failed

[wxWidgets.git] / src / mgl / palette.cpp

diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp
index 4414b2d587c922296c7ccd5bd5d5c430296de5e8..48717b498b331eb183f16e3efbce4b3bc70dccda 100644 (file)
--- a/src/mgl/palette.cpp
+++ b/src/mgl/palette.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        src/mgl/palette.cpp

 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$


@@ -26,8 +26,8 @@ class wxPaletteRefData: public wxObjectRefData
 {
     public:
         wxPaletteRefData(void);
 {
     public:
         wxPaletteRefData(void);

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

         int m_count;
         palette_t *m_entries;
 };
         int m_count;
         palette_t *m_entries;
 };


@@ -59,46 +59,24 @@ 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)
-{
-    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) const
-{
-    return m_refData == palette.m_refData;
-}
-
-bool wxPalette::operator != (const wxPalette& palette) const
-{
-    return m_refData != palette.m_refData;
-}
-
-bool wxPalette::Ok(void) const
+bool wxPalette::IsOk(void) const

 {
     return (m_refData != NULL);
 }
 
 bool wxPalette::Create(int n,
                        const unsigned char *red,
 {
     return (m_refData != NULL);
 }
 
 bool wxPalette::Create(int n,
                        const unsigned char *red,

-                       const unsigned char *green, 
+                       const unsigned char *green,

                        const unsigned char *blue)
 {
     UnRef();
     m_refData = new wxPaletteRefData();
                        const unsigned char *blue)
 {
     UnRef();
     m_refData = new wxPaletteRefData();

-    
-    M_PALETTEDATA->m_count = n;    
+
+    M_PALETTEDATA->m_count = n;

     M_PALETTEDATA->m_entries = new palette_t[n];
 
     palette_t *e = M_PALETTEDATA->m_entries;
     M_PALETTEDATA->m_entries = new palette_t[n];
 
     palette_t *e = M_PALETTEDATA->m_entries;


@@ -110,17 +88,17 @@ bool wxPalette::Create(int n,
         e->alpha = 0;
     }
 
         e->alpha = 0;
     }
 

-    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

 
     palette_t *e = M_PALETTEDATA->m_entries;
     for (int i = 0; i < M_PALETTEDATA->m_count; i++, e++)
 
     palette_t *e = M_PALETTEDATA->m_entries;
     for (int i = 0; i < M_PALETTEDATA->m_count; i++, e++)


@@ -132,33 +110,33 @@ int wxPalette::GetPixel(const unsigned char red,
             closest = i;
         }
     }
             closest = i;
         }
     }

-       return closest;
+
+    return closest;

 }
 
 }
 

-bool wxPalette::GetRGB(int pixel, 
+bool wxPalette::GetRGB(int pixel,

                        unsigned char *red,
                        unsigned char *red,

-                       unsigned char *green, 
+                       unsigned char *green,

                        unsigned char *blue) const
 {
                        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;
+

     palette_t& p = M_PALETTEDATA->m_entries[pixel];
     if (red) *red = p.red;
     if (green) *green = p.green;
     if (blue) *blue = p.blue;
     palette_t& 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;

 }
 
 int wxPalette::GetColoursCount() const
 {
 }
 
 int wxPalette::GetColoursCount() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid palette") );   
+    wxCHECK_MSG( Ok(), 0, wxT("invalid palette") );

     return M_PALETTEDATA->m_count;
 }
 
 palette_t *wxPalette::GetMGLpalette_t() const
 {
     return M_PALETTEDATA->m_count;
 }
 
 palette_t *wxPalette::GetMGLpalette_t() const
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid palette") );   
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid palette") );

     return M_PALETTEDATA->m_entries;
 }
     return M_PALETTEDATA->m_entries;
 }

-