[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index bc015e9ecdf125b5e2a1764d5d52443c752b974e..88212da6bfd4a4839dd0d172900b32ab278483ad 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
     // constructors
@@ -24,35 +24,11 @@ public:
 
     // default
     wxColour() { Init(); }
-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB )
-        { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-        { InitFromName(colourName); }
-    wxColour( const wxChar *colourName )
-        { InitFromName(colourName); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // 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; }
 
@@ -72,13 +48,13 @@ public:
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
-    void InitFromName(const wxString& col);
-
 protected :
 
     // Helper function
     void Init();
 
+    void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+
 private:
     bool          m_isInit;
     unsigned char m_red;

diff --git a/include/wx/mac/classic/colour.h b/include/wx/mac/classic/colour.h
index 785325450f50d31fc5c67dc4333fbf98a76950d0..87a768d9366c300a498af7011ac3d4153b8f384e 100644 (file)
--- a/include/wx/mac/classic/colour.h
+++ b/include/wx/mac/classic/colour.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
     // constructors
@@ -24,20 +24,7 @@ public:
 
     // default
     wxColour() { Init(); }
-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB )
-        { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-        { InitFromName(colourName); }
-    wxColour( const wxChar *colourName )
-        { InitFromName(colourName); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
@@ -47,17 +34,6 @@ public:
     // 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; }
 
@@ -77,13 +53,13 @@ public:
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
-    void InitFromName(const wxString& col);
-
-protected :
+protected:
 
     // Helper function
     void Init();
 
+    void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+
 private:
     bool          m_isInit;
     unsigned char m_red;