moved wxDash typedef to gdicmn.h

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

diff --git a/src/gtk/palette.cpp b/src/gtk/palette.cpp
index 4cdaef37264fa51d00ae037e1ce9a2309cacb369..b0e114a6b7df49a0f0ca65b578399c5584427f40 100644 (file)
--- a/src/gtk/palette.cpp
+++ b/src/gtk/palette.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/palette.h"
 
 
 #include "wx/palette.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-----------------------------------------------------------------------------
 // wxPalette
 
 //-----------------------------------------------------------------------------
 // wxPalette


@@ -33,13 +33,13 @@ class wxPaletteRefData: public wxObjectRefData
 
 wxPaletteRefData::wxPaletteRefData()
 {
 
 wxPaletteRefData::wxPaletteRefData()
 {

-  m_colormap = (GdkColormap *) NULL;
-};
+    m_colormap = (GdkColormap *) NULL;
+}

 
 wxPaletteRefData::~wxPaletteRefData()
 {
 
 wxPaletteRefData::~wxPaletteRefData()
 {

-  if (m_colormap) gdk_colormap_unref( m_colormap );
-};
+    if (m_colormap) gdk_colormap_unref( m_colormap );
+}

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -49,71 +49,71 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
 
 wxPalette::wxPalette()
 {
 
 wxPalette::wxPalette()
 {

-};
+}

 
 wxPalette::wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
 {
 
 wxPalette::wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue )
 {

-  m_refData = new wxPaletteRefData();
-  Create( n, red, green, blue );
-};
+    m_refData = new wxPaletteRefData();
+    Create( n, red, green, blue );
+}

 
 wxPalette::wxPalette( const wxPalette& palette )
 {
 
 wxPalette::wxPalette( const wxPalette& palette )
 {

-  Ref( palette );
-};
+    Ref( palette );
+}

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

-};
+}

 
 wxPalette& wxPalette::operator = ( const wxPalette& palette )
 {
 
 wxPalette& wxPalette::operator = ( const wxPalette& palette )
 {

-  if (*this == palette) return (*this);
-  Ref( palette );
-  return *this;
-};
+    if (*this == palette) return (*this);
+    Ref( palette );
+    return *this;
+}

 
 bool wxPalette::operator == ( const wxPalette& palette )
 {
 
 bool wxPalette::operator == ( const wxPalette& palette )
 {

-  return m_refData == palette.m_refData;
-};
+    return m_refData == palette.m_refData;
+}

 
 bool wxPalette::operator != ( const wxPalette& palette )
 {
 
 bool wxPalette::operator != ( const wxPalette& palette )
 {

-  return m_refData != palette.m_refData;
-};
+    return m_refData != palette.m_refData;
+}

 
 bool wxPalette::Ok(void) const
 {
 
 bool wxPalette::Ok(void) const
 {

-  return (m_refData);
-};
+    return (m_refData != NULL);
+}

 
 bool wxPalette::Create( int WXUNUSED(n), 
                         const unsigned char *WXUNUSED(red), 
                        const unsigned char *WXUNUSED(green), 
                        const unsigned char *WXUNUSED(blue) )
 {
 
 bool wxPalette::Create( int WXUNUSED(n), 
                         const unsigned char *WXUNUSED(red), 
                        const unsigned char *WXUNUSED(green), 
                        const unsigned char *WXUNUSED(blue) )
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemented"));

 
 

-  return FALSE;
-};
+    return FALSE;
+}

 
 int wxPalette::GetPixel( const unsigned char WXUNUSED(red), 
                          const unsigned char WXUNUSED(green), 
                         const unsigned char WXUNUSED(blue) ) const
 {
 
 int wxPalette::GetPixel( const unsigned char WXUNUSED(red), 
                          const unsigned char WXUNUSED(green), 
                         const unsigned char WXUNUSED(blue) ) const
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(wxT("not implemented"));

 
 

-  return 0;
-};
+    return 0;
+}

 
 bool wxPalette::GetRGB( int WXUNUSED(pixel), 
                         unsigned char *WXUNUSED(red), 
                        unsigned char *WXUNUSED(green), 
                        unsigned char *WXUNUSED(blue) ) const
 {
 
 bool wxPalette::GetRGB( int WXUNUSED(pixel), 
                         unsigned char *WXUNUSED(red), 
                        unsigned char *WXUNUSED(green), 
                        unsigned char *WXUNUSED(blue) ) const
 {

-  wxFAIL_MSG("not implemented");
-
-  return 0;
-};
+    wxFAIL_MSG(wxT("not implemented"));
+ 
+    return 0;
+}