WinCE fixes from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index 1f99c2a34832a2313f6a5cc6aea128434fb66e23..cfb75a682607f5da8727cde61b4f764616255168 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -27,8 +27,6 @@
 
 #if wxUSE_EXTENDED_RTTI
 
-/*
-
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
        // copied from VS xrc
@@ -51,84 +49,65 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data )
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
-       s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
+       s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;
 }
 
-WX_CUSTOM_TYPE_INFO(wxColour)
-
-*/
-
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) 
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>) 
 
-WX_BEGIN_PROPERTIES_TABLE(wxColour)
-       WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       WX_READONLY_PROPERTY( Green, unsigned char  , Green , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
-       WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-WX_END_PROPERTIES_TABLE()
+wxBEGIN_PROPERTIES_TABLE(wxColour)
+       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( Blue, unsigned char , Blue ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
 
-WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+wxCONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
 
-WX_BEGIN_HANDLERS_TABLE(wxColour)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxColour)
+wxEND_HANDLERS_TABLE()
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #endif
 
 // Colour
 
-wxColour::wxColour ()
-{
-  m_isInit = FALSE;
-  m_pixel = 0;
-  m_red = m_blue = m_green = 0;
-}
-
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Init()
 {
-  m_red = r;
-  m_green = g;
-  m_blue = b;
-  m_isInit = TRUE;
-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
+    m_isInit = FALSE;
+    m_pixel = 0;
+    m_red =
+    m_blue =
+    m_green = 0;
 }
 
 wxColour::wxColour (const wxColour& col)
 {
-  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 = col;
 }
 
-wxColour& wxColour::operator =(const wxColour& col)
+wxColour& wxColour::operator=(const wxColour& col)
 {
-  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_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;
 }
 
-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)
 {
-  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(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
     }
-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
+
+    // leave invalid
+    Init();
 }
 
 wxColour::~wxColour()
@@ -137,9 +116,10 @@ wxColour::~wxColour()
 
 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_pixel = PALETTERGB (m_red, m_green, m_blue);
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_isInit = TRUE;
+    m_pixel = PALETTERGB (m_red, m_green, m_blue);
 }
+