Small usability improvements

[wxWidgets.git] / include / wx / colour.h

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 9c3cea2c90bb6559a2b2e888ec312b6ae89bf661..afe6371475551745b7588cf3d6b626e353ef4f6a 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 
 
 #include "wx/gdiobj.h"
 
 

-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;

 
 // the standard wxColour constructors;
 // this macro avoids to repeat these lines across all colour.h files, since
 
 // the standard wxColour constructors;
 // this macro avoids to repeat these lines across all colour.h files, since


@@ -27,8 +27,9 @@ class WXDLLEXPORT wxColour;
               ChannelType alpha = wxALPHA_OPAQUE )                            \
         { Set(red, green, blue, alpha); }                                     \
     wxColour( unsigned long colRGB ) { Set(colRGB); }                         \
               ChannelType alpha = wxALPHA_OPAQUE )                            \
         { Set(red, green, blue, alpha); }                                     \
     wxColour( unsigned long colRGB ) { Set(colRGB); }                         \

-    wxColour(const wxString &colourName) { Set(colourName); }                 \
-    wxColour(const wxChar *colourName) { Set(colourName); }
+    wxColour(const wxString& colourName) { Set(colourName); }                 \
+    wxColour(const char *colourName) { Set(colourName); }                     \
+    wxColour(const wchar_t *colourName) { Set(colourName); }

 
 
 // flags for wxColour -> wxString conversion (see wxColour::GetAsString)
 
 
 // flags for wxColour -> wxString conversion (see wxColour::GetAsString)


@@ -74,9 +75,6 @@ public:
         { InitRGBA(red,green,blue, alpha); }
 
     // implemented in colourcmn.cpp
         { InitRGBA(red,green,blue, alpha); }
 
     // implemented in colourcmn.cpp

-    bool Set(const wxChar *str)
-        { return FromString(str); }
-

     bool Set(const wxString &str)
         { return FromString(str); }
 
     bool Set(const wxString &str)
         { return FromString(str); }
 


@@ -84,9 +82,9 @@ public:
     {
         // we don't need to know sizeof(long) here because we assume that the three
         // least significant bytes contain the R, G and B values
     {
         // we don't need to know sizeof(long) here because we assume that the three
         // least significant bytes contain the R, G and B values

-        Set((ChannelType)colRGB,
-            (ChannelType)(colRGB >> 8),
-            (ChannelType)(colRGB >> 16));
+        Set((ChannelType)(0xFF & colRGB),
+            (ChannelType)(0xFF & (colRGB >> 8)),
+            (ChannelType)(0xFF & (colRGB >> 16)));

     }
 
 
     }
 
 


@@ -120,10 +118,15 @@ protected:
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
 
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
 

-    virtual bool FromString(const wxChar *s);
+    virtual bool FromString(const wxString& s);

 };
 
 
 };
 
 

+// wxColour <-> wxString utilities, used by wxConfig, defined in colourcmn.cpp
+WXDLLIMPEXP_CORE wxString wxToString(const wxColourBase& col);
+WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
+
+

 
 #if defined(__WXPALMOS__)
     #include "wx/generic/colour.h"
 
 #if defined(__WXPALMOS__)
     #include "wx/generic/colour.h"