/Wp64 warnings fixes (mostly simply use wxUIntToPtr/wxPtrToUInt() instead of C casts)

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index af6adf93bea471e1fcb1e9e45bf5a60b4e40ae6b..9a9a13f98cb15c5aa380039ec223acd0f9edd505 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -13,41 +13,34 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/msw/private.h"

 #include "wx/colour.h"
 
 #include "wx/colour.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
+#include "wx/msw/private.h"
+

 #include <string.h>
 
 #if wxUSE_EXTENDED_RTTI
 
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
 #include <string.h>
 
 #if wxUSE_EXTENDED_RTTI
 
 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() );
         data = wxNullColour;
     }
     {
         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 )
 {
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {

-    s = wxString::Format(wxT("#%02X%02X%02X"),
-        data.Red(), data.Green(), data.Blue() );
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);

 }
 
 wxTO_STRING_IMP( wxColour )
 }
 
 wxTO_STRING_IMP( wxColour )


@@ -61,7 +54,7 @@ wxBEGIN_PROPERTIES_TABLE(wxColour)
     wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 
     wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 

-wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
+wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )

 
 wxBEGIN_HANDLERS_TABLE(wxColour)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxColour)
 wxEND_HANDLERS_TABLE()


@@ -75,36 +68,19 @@ void wxColour::Init()
 {
     m_isInit = false;
     m_pixel = 0;
 {
     m_isInit = false;
     m_pixel = 0;

+    m_alpha =

     m_red =
     m_blue =
     m_green = 0;
 }
 
     m_red =
     m_blue =
     m_green = 0;
 }
 

-void wxColour::InitFromName(const wxString& name)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
-}
-
-wxColour::~wxColour()
-{
-}
-
-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_red = r;
     m_green = g;
     m_blue = b;

+    m_alpha = a;

     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }
     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }