don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/os2/colour.cpp b/src/os2/colour.cpp
index fa7a6239700e0f0a9591cbf778389ae5e5e93a95..72fecad2e7d6b4369f11dbe67444da6c06e4e8d4 100644 (file)
--- a/src/os2/colour.cpp
+++ b/src/os2/colour.cpp
@@ -12,6 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+
 #include "wx/gdicmn.h"
 #define INCL_GPI
 #define INCL_PM
@@ -21,85 +25,78 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
+void wxColour::Init()
+{
+    m_bIsInit = false;
+    m_vPixel = 0;
+    m_cRed = m_cBlue = m_cGreen = 0;
+} // end of wxColour::Init
+
 wxColour::wxColour ()
 {
-    m_isInit = FALSE;
-    m_pixel = 0;
-    m_red = m_blue = m_green = 0;
-}
+    Init();
+} // end of wxColour::wxColour
 
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+wxColour::wxColour (
+  unsigned char                     cRed
+, unsigned char                     cGreen
+, unsigned char                     cBlue
+)
 {
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-//    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-}
+    Set(cRed, cGreen, cBlue);
+} // end of wxColour::wxColour
 
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(
+  const wxColour&                   rCol
+)
 {
-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
-    m_pixel = col.m_pixel;
-}
+    *this = rCol;
+} // end of wxColour::wxColour
 
-wxColour& wxColour::operator =(const wxColour& col)
+wxColour& wxColour::operator =(
+  const wxColour&                   rCol
+)
 {
-  m_red = col.m_red;
-  m_green = col.m_green;
-  m_blue = col.m_blue;
-  m_isInit = col.m_isInit;
-  m_pixel = col.m_pixel;
-  return *this;
-}
+    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;
+    return *this;
+} // end of wxColour& wxColour::operator =
 
-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(
+  const wxString&                   sCol
+)
 {
-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
-    {
-        m_red = the_colour->Red ();
-        m_green = the_colour->Green ();
-        m_blue = the_colour->Blue ();
-        m_isInit = TRUE;
-    }
-    else
+    if ( wxTheColourDatabase )
     {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
+        wxColour col = wxTheColourDatabase->Find(sCol);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
     }
-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
 
-wxColour::~wxColour ()
-{
-}
+    // leave invalid
+    Init();
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
-{
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
-}
+} // end of wxColour::InitFromName
 
-// Obsolete
-#if WXWIN_COMPATIBILITY
-void wxColour::Get (unsigned char *r, unsigned char *g, unsigned char *b) const
+wxColour::~wxColour()
 {
-  *r = m_red;
-  *g = m_green;
-  *b = m_blue;
-}
-#endif
+} // end of wxColour::~wxColour
 
+void wxColour::Set(
+  unsigned char                     cRed
+, unsigned char                     cGreen
+, unsigned char                     cBlue
+)
+{
+    m_cRed    = cRed;
+    m_cGreen  = cGreen;
+    m_cBlue   = cBlue;
+    m_bIsInit = true;
+    m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
+} // end of wxColour::Set