Applied patch [ 828303 ] Slight wxColour cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -100,6 +100,7 @@ All (GUI):
 - make it possible to use wxRTTI macros with namespaces (Benjamin I. Williams)
 - wxColourDatabase API now uses objects instead of pointers
 - added resolution option to JPEG image handler (Jeff Burton)
+- added wxCalendarEvent::SetDate, wxCalendarEvent::SetWeekDay
 
 wxMSW:
 
@@ -120,6 +121,11 @@ wxGTK:
 - fix for crash when using user-dashed lines (Chris Borgolte)
 - fixed wxChoice::Delete() in presence of client data
 - allow calling wxWindow::SetFont if window not yet created
+- use same average character width as other ports when calculating dialog units
+
+wxMac:
+
+- use same average character width as other ports when calculating dialog units
 
 wxHTML:
 

include/wx/cocoa/colour.h

@@ -62,10 +62,10 @@ public:
     // comparison
     bool operator == (const wxColour& colour) const
     {
-        return (m_cocoaNSColor == colour.m_cocoaNSColor &&
+        return (m_cocoaNSColor == colour.m_cocoaNSColor
-            m_red == colour.m_red && 
+            && m_red == colour.m_red
-            m_green == colour.m_green && 
+            && m_green == colour.m_green
-            m_blue == colour.m_blue);
+            && m_blue == colour.m_blue);
     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }
@@ -83,7 +83,6 @@ public:
             (unsigned char)(colRGB >> 16));
     }
 
-protected:
     void InitFromName(const wxString& col);
 
 private:

include/wx/gtk/colour.h

@@ -88,13 +88,13 @@ public:
     int GetPixel() const;
     GdkColor *GetColor() const;
 
+    void InitFromName(const wxString& colourName);
+
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    // Helper functions
-    void InitFromName(const wxString& colourName);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)

include/wx/gtk1/colour.h

@@ -88,13 +88,13 @@ public:
     int GetPixel() const;
     GdkColor *GetColor() const;
 
+    void InitFromName(const wxString& colourName);
+
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    // Helper functions
-    void InitFromName(const wxString& colourName);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)

include/wx/mac/colour.h

@@ -67,16 +67,21 @@ public:
   // comparison
   bool operator == (const wxColour& colour) const
   {
-    return (m_isInit == colour.m_isInit &&
+    return (m_isInit == colour.m_isInit
-            m_red == colour.m_red && 
+            && m_red == colour.m_red
-            m_green == colour.m_green && 
+            && m_green == colour.m_green
-            m_blue == colour.m_blue);
+            && m_blue == colour.m_blue);
   }
   bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
+  const WXCOLORREF& GetPixel() const { return m_pixel; };
+
     void InitFromName(const wxString& col);
 
-  const WXCOLORREF& GetPixel() const { return m_pixel; };
+protected :
+
+    // Helper function
+    void Init();
 
 private:
   bool          m_isInit;
@@ -84,8 +89,6 @@ private:
   unsigned char m_blue;
   unsigned char m_green;
 
-  void Init();
-
 public:
   WXCOLORREF m_pixel ;
   void Set( const WXCOLORREF* color ) ;

include/wx/mgl/colour.h

@@ -69,16 +69,19 @@ public:
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
+    void InitFromName(const wxString& colourName);
+
+protected:
+
+    // Helper function
+    void Init();
+
 private:
     bool m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 
-    // ctors helpers
-    void Init();
-    void InitFromName(const wxString& colourName);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };

include/wx/motif/colour.h

@@ -61,7 +61,7 @@ public:
     unsigned char Blue() const { return m_blue; }
 
     int GetPixel() const { return m_pixel; };
-    void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; };
+    void SetPixel(int pixel) { m_pixel = pixel; m_isInit = true; };
 
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 
@@ -71,17 +71,21 @@ public:
     static wxColour CreateByName(const wxString& name);
 
     // Allocate a colour, or nearest colour, using the given display.
-    // If realloc is TRUE, ignore the existing pixel, otherwise just return
+    // If realloc is true, ignore the existing pixel, otherwise just return
     // the existing one.
     // Returns the allocated pixel.
 
     // TODO: can this handle mono displays? If not, we should have an extra
     // flag to specify whether this should be black or white by default.
 
-    int AllocColour(WXDisplay* display, bool realloc = FALSE);
+    int AllocColour(WXDisplay* display, bool realloc = false);
 
     void InitFromName(const wxString& col);
 
+protected:
+    // Helper function
+    void Init();
+
 private:
     bool          m_isInit;
     unsigned char m_red;

include/wx/msw/colour.h

@@ -72,7 +72,7 @@ public:
     // accessors
     // ---------
 
-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
@@ -81,29 +81,31 @@ public:
     // comparison
     bool operator==(const wxColour& colour) const
     {
-        return m_isInit == colour.m_isInit &&
+        return m_isInit == colour.m_isInit
-            m_red == colour.m_red &&
+            && m_red == colour.m_red
-            m_green == colour.m_green &&
+            && m_green == colour.m_green
-            m_blue == colour.m_blue;
+            && m_blue == colour.m_blue;
     }
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 
+    void InitFromName(const wxString& colourName);
+
 public:
     WXCOLORREF m_pixel;
 
+protected:
+    // Helper function
+    void Init();
+
 private:
     bool          m_isInit;
     unsigned char m_red;
     unsigned char m_blue;
     unsigned char m_green;
 
-    // ctors helpers
-    void Init();
-    void InitFromName(const wxString& colourName);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };

include/wx/os2/colour.h

@@ -41,7 +41,7 @@ public:
     // Implicit conversion from the colour name
     //
     wxColour(const wxString& rColourName) { InitFromName(rColourName); }
-    wxColour(const char* zColourName) { InitFromName(zColourName); }
+    wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
 
     //
     // Copy ctors and assignment operators
@@ -92,17 +92,24 @@ public:
     //
     bool operator == (const wxColour& rColour) const
     {
-        return (m_cRed   == rColour.m_cRed &&
+        return (m_isInit == rColour.m_isInit
-                m_cGreen == rColour.m_cGreen &&
+                && m_cRed   == rColour.m_cRed
-                m_cBlue  == rColour.m_cBlue
+                && m_cGreen == rColour.m_cGreen
+                && m_cBlue  == rColour.m_cBlue
                );
     }
+
     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 
-    void       InitFromName(const wxString& rCol);
     WXCOLORREF GetPixel(void) const { return m_vPixel; };
 
+    void InitFromName(const wxString& rCol);
+
 private:
+
+    // Helper function
+    void Init();
+
     bool                            m_bIsInit;
     unsigned char                   m_cRed;
     unsigned char                   m_cBlue;

include/wx/x11/colour.h

@@ -37,7 +37,7 @@ class wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour: public wxGDIObject
 {
 public:
     wxColour() { }
@@ -86,13 +86,13 @@ public:
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
 
+    void InitFromName(const wxString& colourName);
+
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-    // Helper functions
-    void InitFromName(const wxString& colourName);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)

src/common/gdicmn.cpp

@@ -331,7 +331,7 @@ void wxColourDatabase::Initialize()
         {wxT("WHEAT"), 216, 216, 191},
         {wxT("WHITE"), 255, 255, 255},
         {wxT("YELLOW"), 255, 255, 0},
-        {wxT("YELLOW GREEN"), 153, 204, 50},
+        {wxT("YELLOW GREEN"), 153, 204, 50}
     };
 
     size_t n;

src/gtk/colour.cpp

@@ -37,7 +37,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;
-        m_hasPixel = FALSE;
+        m_hasPixel = false;
     }
 
     wxColourRefData(const wxColourRefData& data)
@@ -207,10 +207,10 @@ wxColour::~wxColour()
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData)
-        return TRUE;
+        return true;
 
     if (!m_refData || !col.m_refData)
-        return FALSE;
+        return false;
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
@@ -239,7 +239,7 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 
     M_COLDATA->m_colormap = (GdkColormap*) NULL;
-    M_COLDATA->m_hasPixel = FALSE;
+    M_COLDATA->m_hasPixel = false;
 }
 
 unsigned char wxColour::Red() const

src/gtk1/colour.cpp

@@ -37,7 +37,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;
-        m_hasPixel = FALSE;
+        m_hasPixel = false;
     }
 
     wxColourRefData(const wxColourRefData& data)
@@ -207,10 +207,10 @@ wxColour::~wxColour()
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData)
-        return TRUE;
+        return true;
 
     if (!m_refData || !col.m_refData)
-        return FALSE;
+        return false;
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
@@ -239,7 +239,7 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 
     M_COLDATA->m_colormap = (GdkColormap*) NULL;
-    M_COLDATA->m_hasPixel = FALSE;
+    M_COLDATA->m_hasPixel = false;
 }
 
 unsigned char wxColour::Red() const

src/mac/carbon/colour.cpp

@@ -35,7 +35,7 @@ static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green
 
 void wxColour::Init()
 {
-    m_isInit = FALSE;
+    m_isInit = false;
     m_red =
     m_blue =
     m_green = 0;
@@ -78,15 +78,18 @@ wxColour& wxColour::operator =(const wxColour& col)
 
 void wxColour::InitFromName(const wxString& name)
 {
+    if ( wxTheColourDatabase )
+    {
         wxColour col = wxTheColourDatabase->Find(name);
         if ( col.Ok() )
         {
             *this = col;
+            return;
         }
-    else
+    }
-    {
+
+    // leave invalid
     Init();
-    }
 }
 
 wxColour::~wxColour ()
@@ -98,7 +101,7 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_red = r;
     m_green = g;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }

src/mac/colour.cpp

@@ -35,7 +35,7 @@ static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green
 
 void wxColour::Init()
 {
-    m_isInit = FALSE;
+    m_isInit = false;
     m_red =
     m_blue =
     m_green = 0;
@@ -78,15 +78,18 @@ wxColour& wxColour::operator =(const wxColour& col)
 
 void wxColour::InitFromName(const wxString& name)
 {
+    if ( wxTheColourDatabase )
+    {
         wxColour col = wxTheColourDatabase->Find(name);
         if ( col.Ok() )
         {
             *this = col;
+            return;
         }
-    else
+    }
-    {
+
+    // leave invalid
     Init();
-    }
 }
 
 wxColour::~wxColour ()
@@ -98,7 +101,7 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_red = r;
     m_green = g;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }

src/mgl/colour.cpp

@@ -32,7 +32,7 @@ void wxColour::Init()
     m_red =
     m_blue =
     m_green = 0;
-    m_isInit = FALSE;
+    m_isInit = false;
 }
 
 wxColour::wxColour(const wxColour& col)
@@ -51,15 +51,18 @@ wxColour& wxColour::operator =(const wxColour& col)
 
 void wxColour::InitFromName(const wxString& name)
 {
-    wxColour *col = wxTheColourDatabase->Find(name);
+    if ( wxTheColourDatabase )
+    {
+        wxColour col = wxTheColourDatabase->Find(name);
         if ( col.Ok() )
         {
             *this = col;
+            return;
         }
-    else
+    }
-    {
+
+    // leave invalid
     Init();
-    }
 }
 
 wxColour::~wxColour()
@@ -71,5 +74,5 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
     m_red = r;
     m_green = g;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
 }

src/motif/colour.cpp

@@ -34,16 +34,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
-wxColour::wxColour ()
+void wxColour::Init()
 {
-    m_isInit = FALSE;
+    m_isInit = false;
     m_red =
     m_blue =
     m_green = 0;
     m_pixel = -1;
 }
 
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour()
+{
+    Init();
+}
+
+wxColour::wxColour(const wxColour& col)
 {
     *this = col;
 }
@@ -60,7 +65,18 @@ wxColour& wxColour::operator =(const wxColour& col)
 
 void wxColour::InitFromName(const wxString& name)
 {
-    *this = wxTheColourDatabase->Find(name);
+    if ( wxTheColourDatabase )
+    {
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
+    }
+
+    // leave invalid
+    Init();
 }
 
 /* static */
@@ -83,21 +99,21 @@ wxColour wxColour::CreateByName(const wxString& name)
     return col;
 }
 
-wxColour::~wxColour ()
+wxColour::~wxColour()
 {
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
 {
     m_red = r;
     m_green = g;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
     m_pixel = -1;
 }
 
 // Allocate a colour, or nearest colour, using the given display.
-// If realloc is TRUE, ignore the existing pixel, otherwise just return
+// If realloc is true, ignore the existing pixel, otherwise just return
 // the existing one.
 // Returns the old or allocated pixel.
 

src/msw/colour.cpp

@@ -32,8 +32,8 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data )
     // copied from VS xrc
     unsigned long tmp = 0;
 
-    if (s.Length() != 7 || s[0u] != wxT('#') ||
+    if (s.Length() != 7 || s[0u] != wxT('#')
-        wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+        || wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
     {
         wxLogError(_("String To Colour : Incorrect colour specification : %s"),
             s.c_str() );
@@ -49,18 +49,19 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data )
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
-	s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;
+    s = wxString::Format(wxT("#%02X%02X%02X"),
+        data.Red(), data.Green(), data.Blue() );
 }
 
 IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>)
 
 wxBEGIN_PROPERTIES_TABLE(wxColour)
-	wxREADONLY_PROPERTY( Red, unsigned char , Red ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Red, unsigned char, Red,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-	wxREADONLY_PROPERTY( Green, unsigned char  , Green ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
+    wxREADONLY_PROPERTY( Green, unsigned char, Green,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-	wxREADONLY_PROPERTY( Blue, unsigned char , Blue ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Blue, unsigned char, Blue,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 
-wxCONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
 
 wxBEGIN_HANDLERS_TABLE(wxColour)
 wxEND_HANDLERS_TABLE()
@@ -72,14 +73,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 void wxColour::Init()
 {
-    m_isInit = FALSE;
+    m_isInit = false;
     m_pixel = 0;
     m_red =
     m_blue =
     m_green = 0;
 }
 
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(const wxColour& col)
 {
     *this = col;
 }
@@ -114,12 +115,12 @@ wxColour::~wxColour()
 {
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
 {
     m_red = r;
     m_green = g;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
+    m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }
 

src/os2/colour.cpp

@@ -25,11 +25,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // 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::Init
+
+wxColour::wxColour ()
+{
+    Init();
 } // end of wxColour::wxColour
 
 wxColour::wxColour (
@@ -38,22 +43,14 @@ wxColour::wxColour (
 , unsigned char                     cBlue
 )
 {
-    m_cRed    = cRed;
+    Set(cRed, cGreen, cBlue);
-    m_cGreen  = cGreen;
-    m_cBlue   = cBlue;
-    m_bIsInit = TRUE;
-    m_vPixel  = OS2RGB (m_cRed, m_cGreen, m_cBlue);
 } // end of wxColour::wxColour
 
-wxColour::wxColour (
+wxColour::wxColour(
   const wxColour&                   rCol
 )
 {
-    m_cRed    = rCol.m_cRed;
+    *this = col;
-    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 =(
@@ -72,30 +69,26 @@ void wxColour::InitFromName(
   const wxString&                   sCol
 )
 {
-    wxColour*                       pTheColour = wxTheColourDatabase->FindColour(sCol);
+    if ( wxTheColourDatabase )
+    {
+        wxColour col = wxTheColourDatabase->Find(sCol);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
+    }
+
+    // leave invalid
+    Init();
 
-    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 (
+void wxColour::Set(
   unsigned char                     cRed
 , unsigned char                     cGreen
 , unsigned char                     cBlue
@@ -104,6 +97,6 @@ void wxColour::Set (
     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

src/os2/dc.cpp

@@ -316,19 +316,19 @@ void wxDC::AddToDCCache(
 
 void wxDC::ClearCache()
 {
-    m_svBitmapCache.DeleteContents(TRUE);
+    m_svBitmapCache.DeleteContents(true);
     m_svBitmapCache.Clear();
-    m_svBitmapCache.DeleteContents(FALSE);
+    m_svBitmapCache.DeleteContents(false);
-    m_svDCCache.DeleteContents(TRUE);
+    m_svDCCache.DeleteContents(true);
     m_svDCCache.Clear();
-    m_svDCCache.DeleteContents(FALSE);
+    m_svDCCache.DeleteContents(false);
 } // end of wxDC::ClearCache
 
 // Clean up cache at app exit
 class wxDCModule : public wxModule
 {
 public:
-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }
     virtual void OnExit() { wxDC::ClearCache(); }
 
 private:
@@ -345,8 +345,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 wxDC::wxDC(void)
 {
-    wxColour                        vColor;
-
     m_pCanvas      = NULL;
 
     m_hOldBitmap   = 0;
@@ -355,16 +353,18 @@ wxDC::wxDC(void)
     m_hOldFont     = 0;
     m_hOldPalette  = 0;
 
-    m_bOwnsDC      = FALSE;
+    m_bOwnsDC      = false;
     m_hDC          = 0;
     m_hOldPS       = NULL;
     m_hPS          = NULL;
-    m_bIsPaintTime = FALSE; // True at Paint Time
+    m_bIsPaintTime = false; // True at Paint Time
 
-    vColor.InitFromName("BLACK");
+    wxColour vColor( wxT("BLACK") );
     m_pen.SetColour(vColor);
-    vColor.Set("WHITE");
+
+    vColor.Set( wxT("WHITE") );
     m_brush.SetColour(vColor);
+
 } // end of wxDC::wxDC
 
 wxDC::~wxDC(void)
@@ -459,7 +459,7 @@ void wxDC::DoSetClippingRegion(
     RECTL                           vRect;
 
     vY = OS2Y(vY,vHeight);
-    m_clipping    = TRUE;
+    m_clipping    = true;
     vRect.xLeft   = vX;
     vRect.yTop    = vY + vHeight;
     vRect.xRight  = vX + vWidth;
@@ -475,7 +475,7 @@ void wxDC::DoSetClippingRegionAsRegion(
      wxCHECK_RET(rRegion.GetHRGN(), wxT("invalid clipping region"));
      HRGN                           hRgnOld;
 
-     m_clipping = TRUE;
+     m_clipping = true;
      ::GpiSetClipRegion( m_hPS
                         ,(HRGN)rRegion.GetHRGN()
                         ,&hRgnOld
@@ -503,7 +503,7 @@ void wxDC::DestroyClippingRegion(void)
 
          ::GpiSetClipRegion(m_hPS, hRgn, &hRgnOld);
      }
-      m_clipping = FALSE;
+      m_clipping = false;
 } // end of wxDC::DestroyClippingRegion
 
 // ---------------------------------------------------------------------------
@@ -512,7 +512,7 @@ void wxDC::DestroyClippingRegion(void)
 
 bool wxDC::CanDrawBitmap() const
 {
-    return TRUE;
+    return true;
 }
 
 bool wxDC::CanGetTextExtent() const
@@ -571,7 +571,7 @@ bool wxDC::DoFloodFill(
     LONG                            lColor;
     LONG                            lOptions;
     LONG                            lHits;
-    bool                            bSuccess = FALSE;
+    bool                            bSuccess = false;
 
     vPtlPos.x = vX;             // Loads x-coordinate
     vPtlPos.y = OS2Y(vY,0);     // Loads y-coordinate
@@ -582,8 +582,9 @@ bool wxDC::DoFloodFill(
         lOptions = FF_SURFACE;
 
     if ((lHits = ::GpiFloodFill(m_hPS, lOptions, lColor)) != GPI_ERROR)
-        bSuccess = TRUE;
+        bSuccess = true;
-    return TRUE;
+
+    return true;
 } // end of wxDC::DoFloodFill
 
 bool wxDC::DoGetPixel(
@@ -1290,13 +1291,13 @@ void wxDC::DoDrawIcon(
     //
     if (rIcon.IsXpm())
     {
-        DoDrawBitmap(rIcon.GetXpmSrc(), vX, vY, TRUE);
+        DoDrawBitmap(rIcon.GetXpmSrc(), vX, vY, true);
     }
     else
     {
         wxBitmap                        vBitmap(rIcon);
 
-        DoDrawBitmap(vBitmap, vX, vY, FALSE);
+        DoDrawBitmap(vBitmap, vX, vY, false);
     }
     CalcBoundingBox(vX, vY);
     CalcBoundingBox(vX + rIcon.GetWidth(), vY + rIcon.GetHeight());
@@ -2074,7 +2075,7 @@ void wxDC::SetBackground(
         return;
     if (m_pCanvas)
     {
-        bool                        bCustomColours = TRUE;
+        bool                        bCustomColours = true;
 
         //
         // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
@@ -2082,12 +2083,12 @@ void wxDC::SetBackground(
         //
         if (m_pCanvas->IsKindOf(CLASSINFO(wxWindow)) &&
             ((m_pCanvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
-            bCustomColours = FALSE;
+            bCustomColours = false;
         if (bCustomColours)
         {
             if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
             {
-                m_pCanvas->SetTransparent(TRUE);
+                m_pCanvas->SetTransparent(true);
             }
             else
             {
@@ -2101,7 +2102,7 @@ void wxDC::SetBackground(
                 // parent?
                 // m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
                 //
-                m_pCanvas->SetTransparent(FALSE);
+                m_pCanvas->SetTransparent(false);
             }
         }
     }
@@ -2192,8 +2193,8 @@ bool wxDC::StartDoc(
   const wxString&                   rsMessage
 )
 {
-    // We might be previewing, so return TRUE to let it continue.
+    // We might be previewing, so return true to let it continue.
-    return TRUE;
+    return true;
 } // end of wxDC::StartDoc
 
 void wxDC::EndDoc()
@@ -2538,7 +2539,7 @@ bool wxDC::DoBlit(
         pMask = rBmp.GetMask();
         if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap()))
         {
-            bUseMask = FALSE;
+            bUseMask = false;
         }
     }
 
@@ -2586,7 +2587,7 @@ bool wxDC::DoBlit(
         case wxNOR:          lRop = ROP_NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
-           return FALSE;
+           return false;
     }
 
     bool                            bSuccess;
@@ -2618,7 +2619,7 @@ bool wxDC::DoBlit(
         vBmpHdr.cBitCount = 24;
 
 #if wxUSE_DC_CACHEING
-        if (TRUE)
+        if (true)
         {
             //
             // create a temp buffer bitmap and DCs to access it and the mask
@@ -2757,7 +2758,7 @@ bool wxDC::DoBlit(
                         );
         if (rc == GPI_ERROR)
         {
-            bSuccess = FALSE;
+            bSuccess = false;
             wxLogLastError(wxT("BitBlt"));
         }
 
@@ -2773,7 +2774,7 @@ bool wxDC::DoBlit(
         ::DevCloseDC(hDCBuffer);
         ::GpiDeleteBitmap(hBufBitmap);
 #endif
-        bSuccess = TRUE;
+        bSuccess = true;
     }
     else // no mask, just BitBlt() it
     {

src/os2/dcclient.cpp

@@ -142,7 +142,6 @@ wxWindowDC::wxWindowDC(
 
 void wxWindowDC::InitDC()
 {
-    wxColour                        vColor;
 
     //
     // The background mode is only used for text background and is set in
@@ -155,9 +154,10 @@ void wxWindowDC::InitDC()
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
 
-    vColor.InitFromName("BLACK");
+    wxColour vColor( wxT("BLACK") );
     m_pen.SetColour(vColor);
-    vColor.Set("WHITE");
+
+    vColor.Set( wxT("WHITE") );
     m_brush.SetColour(vColor);
     InitializePalette();
     wxFont*                         pFont = new wxFont( 12

src/os2/tooltip.cpp

@@ -56,7 +56,6 @@ void wxToolTip::Create(
 )
 {
     ULONG                           lStyle = ES_READONLY | ES_MARGIN | ES_CENTER;
-    wxColour                        vColor;
     LONG                            lColor;
     char                            zFont[128];
 
@@ -74,7 +73,7 @@ void wxToolTip::Create(
     if (!m_hWnd)
         wxLogError("Unable to create tooltip window");
 
-    vColor.InitFromName("YELLOW");
+    wxColour                        vColor( wxT("YELLOW") );
     lColor = (LONG)vColor.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR

src/x11/colour.cpp

@@ -33,7 +33,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (WXColormap *) NULL;
-        m_hasPixel = FALSE;
+        m_hasPixel = false;
     }
     wxColourRefData(const wxColourRefData& data):
         wxObjectRefData()
@@ -204,17 +204,17 @@ wxColour::~wxColour()
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
-    if (m_refData == col.m_refData) return TRUE;
+    if (m_refData == col.m_refData) return true;
 
-    if (!m_refData || !col.m_refData) return FALSE;
+    if (!m_refData || !col.m_refData) return false;
 
     XColor *own = &(((wxColourRefData*)m_refData)->m_color);
     XColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
-    if (own->red != other->red) return FALSE;
-    if (own->blue != other->blue) return FALSE;
-    if (own->green != other->green) return FALSE;
 
-    return TRUE;
+    return (own->red == other->red)
+        && (own->green == other->green)
+        && (own->blue == other->blue)
+
 }
 
 wxObjectRefData *wxColour::CreateRefData() const