remove check for missing gtk_icon_size_lookup, since it is for GTK+ 2.1, and 2.4...

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 26f30c60c4c88e66e6fdd755ded579a6e1b5b4ae..8eb61124f3dc14a0ea2ba4fd67f957b1e10eb8c2 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -1,21 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/gtk1/colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -26,56 +20,57 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxBitmap;
-class wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
-class wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColour: public wxGDIObject
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
-  public:
-
-    wxColour();
-    wxColour( char red, char green, char blue );
-    wxColour( const wxString &colourName ) { InitFromName(colourName); }
-    wxColour( const char *colourName ) { InitFromName(colourName); }
-    wxColour( const wxColour& col );
-    wxColour( const wxColour* col );
-    ~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 );
+public:
+    // constructors
+    // ------------
+
+    // default
+    wxColour() { }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    virtual ~wxColour();
+
+    virtual bool FromString(const wxString& str);
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
+
+    bool operator == ( const wxColour& col ) const;
+    bool operator != ( const wxColour& col ) const { return !(*this == col); }
+
     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;
-        
+
+
+    // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
-    
+
 protected:
-    // helper functions
-    void InitFromName(const wxString& colourName);
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
-  
+
 #endif // __GTKCOLOURH__