added wxArtProvider::InsertProvider to accompany PushProvider

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index e168cb381045d1f929b3eb1fbdb0f8d3bc1d6b8a..c09dfe5ef1f1db265bf5ac8dd7756d1d8f46c298 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/colour.h
+// Name:        wx/gtk1/colour.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -31,7 +31,7 @@ class WXDLLIMPEXP_CORE wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
 // wxColour
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxColour: public wxGDIObject
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -39,63 +39,33 @@ public:
 
     // default
     wxColour() { }
 
     // default
     wxColour() { }

-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue );
-
-    // 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
-
-
-    wxColour( const wxColour& col )
-        : wxGDIObject()
-        { Ref(col); }
-    wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
     ~wxColour();
 
 
     ~wxColour();
 

+    virtual bool FromString(const wxChar *str);
+

     bool Ok() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
     bool Ok() 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;
 
 
     unsigned char Red() const;
     unsigned char Green() const;
     unsigned char Blue() const;
 
 

-    // Get colour from name or wxNullColour
-    static wxColour CreateByName(const wxString& name);
-

     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
 
     // Implementation part
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
 

-    void InitFromName(const wxString& colourName);
-

 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 

+    virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );

 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)