Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 807d673645cf184b91ddc7389524ce52e2063555..7fc1a01c816e6428f5703a4ebc66ec2481b553d5 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -15,14 +15,11 @@
 #include "wx/object.h"
 
 // Colour
 #include "wx/object.h"
 
 // Colour

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

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

-
-    // default
-    wxColour() { Init(); }

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


@@ -31,10 +28,10 @@ public:
     wxColour&operator = (const wxColour& rCol);
 
     // Dtor
     wxColour&operator = (const wxColour& rCol);
 
     // Dtor

-    ~wxColour();
+    virtual ~wxColour();

 
     // Accessors
 
     // Accessors

-    bool Ok(void) const {return m_bIsInit; }
+    virtual bool IsOk(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; }


@@ -52,7 +49,7 @@ public:
 
     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 
 
     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 

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

 
 
 private:
 
 
 private:


@@ -65,7 +62,8 @@ private:
     unsigned char  m_cBlue;
     unsigned char  m_cGreen;
 
     unsigned char  m_cBlue;
     unsigned char  m_cGreen;
 

-    virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

 
 public:
     WXCOLORREF                      m_vPixel ;
 
 public:
     WXCOLORREF                      m_vPixel ;