using newer API

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index fd72a8d887b107cb65dd0f2884f649366f0f0ff3..7f289660bf8c7480187700866a24734231321dab 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.h
+// Name:        wx/motif/colour.h

 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLOUR_H_


@@ -16,21 +16,16 @@
 #include "wx/string.h"
 
 // Colour
 #include "wx/string.h"
 
 // Colour

-class WXDLLEXPORT wxColour : public wxObject
+class WXDLLEXPORT wxColour : public wxColourBase

 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:

-    // ctors
-    // default
-    wxColour();
-    // from RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
+    // constructors
+    // ------------

 
 

-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName ) { InitFromName(colourName); }
-    wxColour( const char *colourName ) { InitFromName(colourName); }
+    // default
+    wxColour() { Init(); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );


@@ -39,16 +34,6 @@ public:
     // dtor
     ~wxColour();
 
     // dtor
     ~wxColour();
 

-    // Set() functions
-    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));
-    }

 
     // accessors
     bool Ok() const {return m_isInit; }
 
     // accessors
     bool Ok() const {return m_isInit; }


@@ -63,9 +48,6 @@ public:
 
     inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 
 
     inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 

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

     // Allocate a colour, or nearest colour, using the given display.
     // If realloc is true, ignore the existing pixel, otherwise just return
     // the existing one.
     // Allocate a colour, or nearest colour, using the given display.
     // If realloc is true, ignore the existing pixel, otherwise just return
     // the existing one.


@@ -76,12 +58,12 @@ public:
 
     int AllocColour(WXDisplay* display, bool realloc = false);
 
 
     int AllocColour(WXDisplay* display, bool realloc = false);
 

-    void InitFromName(const wxString& col);
-

 protected:
     // Helper function
     void Init();
 
 protected:
     // Helper function
     void Init();
 

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

 private:
     bool          m_isInit;
     unsigned char m_red;
 private:
     bool          m_isInit;
     unsigned char m_red;