use the right GdkWindow and origin for non-pizza widget with wxClientDC

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

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 93ae465dc26c105ef04d5cae838e26daa64779f1..08d79a82f166858e9c1f528a3c16fa8cdb64b957 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -15,14 +15,14 @@
 #include "wx/colour.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
@@ -33,11 +33,6 @@ void 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;
@@ -57,9 +52,10 @@ wxColour::~wxColour()
 {
 } // end of wxColour::~wxColour
 
-void wxColour::InitWith( unsigned char cRed,
+void wxColour::InitRGBA( unsigned char cRed,
                          unsigned char cGreen,
-                         unsigned char cBlue )
+                         unsigned char cBlue,
+                         unsigned char WXUNUSED(calpha) )
 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;