fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index b66b9b3608a2185198424a5dbae3fdd72febbde2..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,7 +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 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)


@@ -120,6 +122,11 @@ protected:
 };
 
 
 };
 
 

+// 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"