added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index a69fa86430adf563e1d518d23058455cf6adc5d1..889a8ef798de35e833b743dcfd3fd9a3fea4aa3c 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -35,11 +35,13 @@ public:
              ,unsigned char cBlue
             );
 
              ,unsigned char cBlue
             );
 

+    wxColour( unsigned long colRGB ) { Set(colRGB); }
+

     //
     // Implicit conversion from the colour name
     //
     wxColour(const wxString& rColourName) { InitFromName(rColourName); }
     //
     // Implicit conversion from the colour name
     //
     wxColour(const wxString& rColourName) { InitFromName(rColourName); }

-    wxColour(const char* zColourName) { InitFromName(zColourName); }
+    wxColour(const wxChar *zColourName) { InitFromName(zColourName); }

 
     //
     // Copy ctors and assignment operators
 
     //
     // Copy ctors and assignment operators


@@ -71,20 +73,15 @@ public:
             ,(unsigned char)(lColRGB >> 16)
            );
     }
             ,(unsigned char)(lColRGB >> 16)
            );
     }

+    void Set(const wxString& rsColour)
+    {
+        InitFromName(rsColour);
+    }

 
     //
     // Accessors
 
     //
     // Accessors

-    bool Ok(void) const {return m_bIsInit; }
-
-    //
-    // Let's remove this inelegant function

     //
     //

-#if WXWIN_COMPATIBILITY
-    void Get( unsigned char* pRed
-             ,unsigned char* pGreen
-             ,unsigned char* pBlue
-            ) const;
-#endif
+    bool Ok(void) const {return m_bIsInit; }

 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }


@@ -95,17 +92,24 @@ public:
     //
     bool operator == (const wxColour& rColour) const
     {
     //
     bool operator == (const wxColour& rColour) const
     {

-        return (m_cRed   == rColour.m_cRed &&
-                m_cGreen == rColour.m_cGreen &&
-                m_cBlue  == rColour.m_cBlue
+        return (m_bIsInit == rColour.m_bIsInit
+                && m_cRed   == rColour.m_cRed
+                && m_cGreen == rColour.m_cGreen
+                && m_cBlue  == rColour.m_cBlue

                );
     }
                );
     }

+

     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 
     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 

-    void       InitFromName(const wxString& rCol);

     WXCOLORREF GetPixel(void) const { return m_vPixel; };
 
     WXCOLORREF GetPixel(void) const { return m_vPixel; };
 

+    void InitFromName(const wxString& rCol);
+

 private:
 private:

+
+    // Helper function
+    void Init();
+

     bool                            m_bIsInit;
     unsigned char                   m_cRed;
     unsigned char                   m_cBlue;
     bool                            m_bIsInit;
     unsigned char                   m_cRed;
     unsigned char                   m_cBlue;