adding measuring contexts, streamlining printing code

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 622b55e0145fd8db2e0e026088dea60561bcf2e1..101055920a921206700644142c927e2d13a960a7 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -33,48 +33,23 @@ class WXDLLIMPEXP_CORE wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour : public wxColourBase
 {
 public:
     // constructors
     // ------------
 
-    // default
-    wxColour() { }
+    wxColour() {}
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue );
+    virtual ~wxColour();
 
-    // from packed RGB
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
-
-    // Implicit conversion from the colour name
-    wxColour( const wxString &colourName ) { InitFromName(colourName); }
-    wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); }
-#if wxUSE_UNICODE
-    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
-#endif
-
-    // Get colour from name or wxNullColour
-    static wxColour CreateByName(const wxString& name);
-
-    ~wxColour();
-
-    bool Ok() const { return m_refData != NULL; }
+    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); }
 
-    void Set( unsigned char red, unsigned char green, unsigned char blue );
-    void Set( unsigned long colRGB )
-    {
-        // We don't need to know sizeof(long) here because we assume that the three
-        // least significant bytes contain the R, G and B values
-        Set((unsigned char)colRGB,
-            (unsigned char)(colRGB >> 8),
-            (unsigned char)(colRGB >> 16));
-    }
-
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
@@ -85,13 +60,15 @@ public:
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
 
-    void InitFromName(const wxString& colourName);
-
 protected:
     // 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);
+
+    virtual bool FromString(const wxChar *str);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)