// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "colour.h"
#endif
#endif
#include "wx/gdicmn.h"
+#include "wx/msw/private.h"
#include <string.h>
-#include <windows.h>
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
-
-// Colour
+#if wxUSE_EXTENDED_RTTI
-wxColour::wxColour (void)
+template<> void wxStringReadValue(const wxString &s , wxColour &data )
{
- m_isInit = FALSE;
- m_pixel = 0;
- m_red = m_blue = m_green = 0;
-}
+ // copied from VS xrc
+ unsigned long tmp = 0;
-wxColour::wxColour (const unsigned char r, const unsigned char g, const unsigned char b)
-{
- m_red = r;
- m_green = g;
- m_blue = b;
- m_isInit = TRUE;
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
+ if (s.Length() != 7 || s[0u] != wxT('#')
+ || wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+ {
+ wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+ s.c_str() );
+ data = wxNullColour;
+ }
+ else
+ {
+ data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
+ (unsigned char) ((tmp & 0x00FF00) >> 8),
+ (unsigned char) ((tmp & 0x0000FF)));
+ }
}
-wxColour::wxColour (const wxColour& col)
+template<> void wxStringWriteValue(wxString &s , const wxColour &data )
{
- 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;
+ s = wxString::Format(wxT("#%02X%02X%02X"),
+ data.Red(), data.Green(), data.Blue() );
}
-wxColour& wxColour::operator =(const wxColour& col)
+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( 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()
+
+wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
+
+wxBEGIN_HANDLERS_TABLE(wxColour)
+wxEND_HANDLERS_TABLE()
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#endif
+
+// Colour
+
+void wxColour::Init()
{
- 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_isInit = false;
+ m_pixel = 0;
+ m_red =
+ m_blue =
+ m_green = 0;
}
-wxColour::wxColour (const wxString& col)
+wxColour::wxColour(const wxColour& col)
{
- 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
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
- }
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
+ *this = col;
}
-wxColour::~wxColour (void)
+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;
}
-wxColour& wxColour::operator = (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);
- return (*this);
+
+ // leave invalid
+ Init();
}
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+wxColour::~wxColour()
{
- m_red = r;
- m_green = g;
- m_blue = b;
- m_isInit = TRUE;
- m_pixel = PALETTERGB (m_red, m_green, m_blue);
}
-// Obsolete
-#if WXWIN_COMPATIBILITY
-void wxColour::Get (unsigned char *r, unsigned char *g, unsigned char *b) const
+void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
{
- *r = m_red;
- *g = m_green;
- *b = m_blue;
+ m_red = r;
+ m_green = g;
+ m_blue = b;
+ m_isInit = true;
+ m_pixel = PALETTERGB(m_red, m_green, m_blue);
}
-#endif