avoid wxColour::Set(long) confusion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-18 03:27:51 +00:00 · 2006-05-18 03:27:51 +00:00 · 044077236a
commit 044077236a
parent a01ed326cc
1 changed files with 4 additions and 2 deletions
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@ -54,10 +54,12 @@ bool wxColourBase::FromString(const wxChar *str)
    {
        // hexadecimal prefixed with # (HTML syntax)
        unsigned long tmp;
-        if (wxSscanf(&str[1], wxT("%lX"), &tmp) != 1)
+        if (wxSscanf(&str[1], wxT("%lx"), &tmp) != 1)
            return false;

-        Set(tmp);   // set from packed long
+        Set((unsigned char)(tmp >> 16),
+            (unsigned char)(tmp >> 8),
+            (unsigned char)tmp);
    }
    else if (wxTheColourDatabase) // a colour name ?
    {