fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS

[wxWidgets.git] / src / common / colourcmn.cpp

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 4c7d7c088f5669113e43cbb544844f678b39e4df..a20851c7674cccca3c355a3acb2e14772204464f 100644 (file)
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -21,10 +21,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-

 
 // ============================================================================
 // wxString <-> wxColour conversions
 
 // ============================================================================
 // wxString <-> wxColour conversions


@@ -38,21 +38,27 @@ bool wxColourBase::FromString(const wxChar *str)
     if ( wxStrncmp(str, wxT("RGB"), 3) == 0 ||
          wxStrncmp(str, wxT("rgb"), 3) == 0 )
     {
     if ( wxStrncmp(str, wxT("RGB"), 3) == 0 ||
          wxStrncmp(str, wxT("rgb"), 3) == 0 )
     {

-        // RGB specification CSS-like
+        // CSS-like RGB specification
+        // according to http://www.w3.org/TR/REC-CSS2/syndata.html#color-units
+        // values outside 0-255 range are allowed but should be clipped

         int red, green, blue;
         if (wxSscanf(&str[3], wxT("(%d, %d, %d)"), &red, &green, &blue) != 3)
             return false;
 
         int red, green, blue;
         if (wxSscanf(&str[3], wxT("(%d, %d, %d)"), &red, &green, &blue) != 3)
             return false;
 

-        Set((unsigned char)red, (unsigned char)green, (unsigned char)blue);
+        Set((unsigned char)wxClip(red,0,255),
+            (unsigned char)wxClip(green,0,255),
+            (unsigned char)wxClip(blue,0,255));

     }
     else if ( str[0] == wxT('#') && wxStrlen(str) == 7 )
     {
         // hexadecimal prefixed with # (HTML syntax)
         unsigned long tmp;
     }
     else if ( str[0] == wxT('#') && wxStrlen(str) == 7 )
     {
         // 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;
 
             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 ?
     {
     }
     else if (wxTheColourDatabase) // a colour name ?
     {


@@ -101,7 +107,17 @@ wxString wxColourBase::GetAsString(long flags) const
     return colName;
 }
 
     return colName;
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+
+// static

 wxColour wxColourBase::CreateByName(const wxString& name)
 {
     return wxColour(name);
 }
 wxColour wxColourBase::CreateByName(const wxString& name)
 {
     return wxColour(name);
 }

+
+void wxColourBase::InitFromName(const wxString& col)
+{
+    Set(col);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6