X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4f10951f806a7b6cf7e65317a21421e2f3a6..74b1f0b45e0f0bc7e25c5f32bb495e3e4bcd3392:/src/msw/colour.cpp

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index eebf6ed159..9a9a13f98c 100644
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -1,26 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/msw/colour.cpp
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
+#endif
+
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/msw/private.h"
 
 #include <string.h>
@@ -29,111 +30,57 @@
 
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
-	// copied from VS xrc
-	unsigned long tmp = 0;
-
-    if (s.Length() != 7 || s[0u] != wxT('#') ||
-        wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+    if ( !data.Set(s) )
     {
-		wxLogError(_("String To Colour : Incorrect colour specification : %s"),
-                   s.c_str() );
+        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)));
-	}
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
-	s = wxString::Format("#%02X%02X%02X", data.Red() , data.Green() , data.Blue() ) ;
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);
 }
 
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>) 
+wxTO_STRING_IMP( wxColour )
+wxFROM_STRING_IMP( wxColour )
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour ))
 
-WX_BEGIN_PROPERTIES_TABLE(wxColour)
-	WX_READONLY_PROPERTY( Red, unsigned char , Red ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-	WX_READONLY_PROPERTY( Green, unsigned char  , Green ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
-	WX_READONLY_PROPERTY( Blue, unsigned char , Blue ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-WX_END_PROPERTIES_TABLE()
+wxBEGIN_PROPERTIES_TABLE(wxColour)
+    wxREADONLY_PROPERTY( Red, unsigned char, Red, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Green, unsigned char, Green, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
 
-WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+wxDIRECT_CONSTRUCTOR_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)
-{
-  m_red = r;
-  m_green = g;
-  m_blue = b;
-  m_isInit = TRUE;
-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
-}
-
-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;
-}
-
-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;
-}
-
-void wxColour::InitFromName(const wxString& 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);
-}
-
-wxColour::~wxColour()
+void wxColour::Init()
 {
+    m_isInit = false;
+    m_pixel = 0;
+    m_alpha =
+    m_red =
+    m_blue =
+    m_green = 0;
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
+                        unsigned char a)
 {
-  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_alpha = a;
+    m_isInit = true;
+    m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }