merged in the commit from the 2.2 branch

[wxWidgets.git] / include / wx / gtk / palette.h

diff --git a/include/wx/gtk/palette.h b/include/wx/gtk/palette.h
index d6b7bbb64ba82b92996fab0ffb0737458fb4a75f..8574526cb35476156a6cdf189d89c8b095f68a3f 100644 (file)
--- a/include/wx/gtk/palette.h
+++ b/include/wx/gtk/palette.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -36,17 +36,16 @@ class wxPalette: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
   public:
-  
-    wxPalette(void);
+
+    wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
     wxPalette( const wxPalette& palette );
-    wxPalette( const wxPalette* palette );
-    ~wxPalette(void);
+    ~wxPalette();
     wxPalette& operator = ( const wxPalette& palette );
     bool operator == ( const wxPalette& palette );
     bool operator != ( const wxPalette& palette );
-    bool Ok(void) const;
-    
+    bool Ok() const;
+
     bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     int GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const;
     bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;