X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26ac77dbe2e99a137619ce316dd5fbaa5bb81093..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/colour.cpp

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index 90469cec72..d1add0c9c3 100644
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/os2/colour.cpp
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
@@ -12,49 +12,38 @@
 // 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>
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
 
 // Colour
 
-wxColour::wxColour ()
+void wxColour::Init()
 {
-    m_bIsInit = FALSE;
+    m_bIsInit = false;
     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 ()
 {
-    m_cRed    = cRed;
-    m_cGreen  = cGreen;
-    m_cBlue   = cBlue;
-    m_bIsInit = TRUE;
-    m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+    Init();
 } // end of wxColour::wxColour
 
-wxColour::wxColour (
-  const wxColour&                   rCol
-)
+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;
+    *this = rCol;
 } // 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;
@@ -64,59 +53,18 @@ 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
 
-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_bIsInit = TRUE;
+    m_bIsInit = true;
     m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
 } // end of wxColour::Set
-
-//
-// Obsolete
-//
-#if WXWIN_COMPATIBILITY
-void wxColour::Get (
-  unsigned char*                   pRed
-, unsigned char*                   pGreen
-, unsigned char*                   pBlue
-) const
-{
-    *Red   = m_cRed;
-    *Green = m_cGreen;
-    *Blue  = m_cBlue;
-} // end of wxColour::Get
-#endif
-