no need to iterate over all special icon names after a match was found, there won...

[wxWidgets.git] / src / os2 / colour.cpp

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 205a2475bbd0bdf7cde0dbca8f1e765c79ecf050..08d79a82f166858e9c1f528a3c16fa8cdb64b957 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -22,7 +22,7 @@
 #define INCL_PM
 #include<os2.h>
 
 #define INCL_PM
 #include<os2.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

 
 // Colour
 
 
 // Colour
 


@@ -33,11 +33,6 @@ void wxColour::Init()
     m_cRed = m_cBlue = m_cGreen = 0;
 } // end of wxColour::Init
 
     m_cRed = m_cBlue = m_cGreen = 0;
 } // end of wxColour::Init
 

-wxColour::wxColour ()
-{
-    Init();
-} // end of wxColour::wxColour
-

 wxColour::wxColour( const wxColour& rCol )
 {
     *this = rCol;
 wxColour::wxColour( const wxColour& rCol )
 {
     *this = rCol;


@@ -57,9 +52,10 @@ wxColour::~wxColour()
 {
 } // end of wxColour::~wxColour
 
 {
 } // end of wxColour::~wxColour
 

-void wxColour::InitWith( unsigned char cRed,
+void wxColour::InitRGBA( unsigned char cRed,

                          unsigned char cGreen,
                          unsigned char cGreen,

-                         unsigned char cBlue )
+                         unsigned char cBlue,
+                         unsigned char WXUNUSED(calpha) )

 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;
 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;