.cvsignores added

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 8757d2c00bb08e5e7e6a1126b4a7638346710641..43f9d528399f808cf3cd47e899866d6f0de509c1 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -20,6 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
+#include "wx/palette.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -38,39 +39,43 @@ class wxColour;
 
 class wxColour: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxColour)
-
   public:
 
-    wxColour(void);
+    wxColour();
     wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName );
+    wxColour( const wxString &colourName ) { InitFromName(colourName); }
+//    wxColour( const char *colourName ) { InitFromName(colourName); }
     wxColour( const wxColour& col );
     wxColour( const wxColour* col );
-    ~wxColour(void);
+    ~wxColour();
     wxColour& operator = ( const wxColour& col );
     wxColour& operator = ( const wxString& colourName );
     bool operator == ( const wxColour& col );
     bool operator != ( const wxColour& col );
     void Set( const unsigned char red, const unsigned char green, const unsigned char blue );
-    unsigned char Red(void) const;
-    unsigned char Green(void) const;
-    unsigned char Blue(void) const;
-    bool Ok(void) const;
+    unsigned char Red() const;
+    unsigned char Green() const;
+    unsigned char Blue() const;
+    bool Ok() const;
 
   private:
   public:
-  
+
     friend wxDC;
     friend wxPaintDC;
     friend wxBitmap;
     friend wxWindow;
-        
+
     void CalcPixel( GdkColormap *cmap );
-    int GetPixel(void);
-    GdkColor *GetColor(void);
-    
-    // no data :-)
+    int GetPixel() const;
+    GdkColor *GetColor() const;
+
+protected:
+    // helper functions
+    void InitFromName(const wxString& colourName);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxColour)
 };
-  
+
 #endif // __GTKCOLOURH__