X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..68f64b40bfdffd1fc4967dc422a7d89b42545d82:/src/msw/colour.cpp?ds=sidebyside

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index b48c44724f..15da19612c 100644
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -12,52 +12,19 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/colour.h"
-
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
-#include "wx/gdicmn.h"
-#include "wx/msw/private.h"
-
-#include <string.h>
-
-#if wxUSE_EXTENDED_RTTI
-
-template<> void wxStringReadValue(const wxString &s , wxColour &data )
-{
-    if ( !data.Set(s) )
-    {
-        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
-            s.c_str() );
-        data = wxNullColour;
-    }
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxColour &data )
-{
-    s = data.GetAsString(wxC2S_HTML_SYNTAX);
-}
-
-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 ))
+#include "wx/colour.h"
 
-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()
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
 
-wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
+#include "wx/msw/private.h"
 
-wxBEGIN_HANDLERS_TABLE(wxColour)
-wxEND_HANDLERS_TABLE()
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
+#include <string.h>
 
 // Colour
 
@@ -65,20 +32,19 @@ void wxColour::Init()
 {
     m_isInit = false;
     m_pixel = 0;
+    m_alpha =
     m_red =
     m_blue =
     m_green = 0;
 }
 
-wxColour::~wxColour()
-{
-}
-
-void wxColour::InitWith(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_alpha = a;
     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }