Deallocate wxThreadSpecificInfo when wxThread ends.

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

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 1995b8fa2c90b6535e66e8cc28605e910e5519be..287e2c4181559c6bc36a6868bead2107218d5d69 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/os2/colour.cpp

 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,49 +11,31 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/gdicmn.h"
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+

 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-

 // Colour
 
 // Colour
 

-wxColour::wxColour ()
+void wxColour::Init()

 {
 {

-    m_bIsInit = FALSE;
+    m_bIsInit = false;

     m_vPixel = 0;
     m_cRed = m_cBlue = m_cGreen = 0;
     m_vPixel = 0;
     m_cRed = m_cBlue = m_cGreen = 0;

-} // end of wxColour::wxColour
+} // end of wxColour::Init

 
 

-wxColour::wxColour (
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+wxColour::wxColour( const wxColour& rCol )

 {
 {

-    m_cRed    = cRed;
-    m_cGreen  = cGreen;
-    m_cBlue   = cBlue;
-    m_bIsInit = TRUE;
-    m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+    *this = rCol;

 } // end of wxColour::wxColour
 
 } // end of wxColour::wxColour
 

-wxColour::wxColour (
-  const wxColour&                   rCol
-)
-{
-    m_cRed    = rCol.m_cRed;
-    m_cGreen  = rCol.m_cGreen;
-    m_cBlue   = rCol.m_cBlue;
-    m_bIsInit = rCol.m_bIsInit;
-    m_vPixel  = rCol.m_vPixel;
-} // end of wxColour::wxColour
-
-wxColour& wxColour::operator =(
-  const wxColour&                   rCol
-)
+wxColour& wxColour::operator= (const wxColour& rCol)

 {
     m_cRed    = rCol.m_cRed;
     m_cGreen  = rCol.m_cGreen;
 {
     m_cRed    = rCol.m_cRed;
     m_cGreen  = rCol.m_cGreen;


@@ -64,42 +45,18 @@ wxColour& wxColour::operator =(
     return *this;
 } // end of wxColour& wxColour::operator =
 
     return *this;
 } // end of wxColour& wxColour::operator =
 

-void wxColour::InitFromName(
-  const wxString&                   sCol
-)
-{
-    wxColour*                       pTheColour = wxTheColourDatabase->FindColour(sCol);
-
-    if (pTheColour)
-    {
-        m_cRed    = pTheColour->Red();
-        m_cGreen  = pTheColour->Green();
-        m_cBlue   = pTheColour->Blue();
-        m_bIsInit = TRUE;
-    }
-    else
-    {
-        m_cRed = 0;
-        m_cGreen = 0;
-        m_cBlue = 0;
-        m_bIsInit = FALSE;
-    }
-    m_vPixel = OS2RGB (m_cRed, m_cGreen, m_cBlue);
-} // end of wxColour::InitFromName
-
-wxColour::~wxColour ()
+wxColour::~wxColour()

 {
 } // end of wxColour::~wxColour
 
 {
 } // end of wxColour::~wxColour
 

-void wxColour::Set (
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+void wxColour::InitRGBA( unsigned char cRed,
+                         unsigned char cGreen,
+                         unsigned char cBlue,
+                         unsigned char WXUNUSED(calpha) )

 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;
     m_cBlue   = cBlue;
 {
     m_cRed    = cRed;
     m_cGreen  = cGreen;
     m_cBlue   = cBlue;

-    m_bIsInit = TRUE;
+    m_bIsInit = true;

     m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
 } // end of wxColour::Set
     m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
 } // end of wxColour::Set