more warning fixes about empty if statement in helper classes in release build

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

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 807fbfd68c97f2fbc68fa4fab5a5f3ddcf481e0c..78204d1843c62c982d63fb3236f7e271ddceaabd 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -20,11 +20,12 @@
 // this macro avoids to repeat these lines across all colour.h files, since
 // Set() is a virtual function and thus cannot be called by wxColourBase
 // constructors
-#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                                              \
-    wxColour( unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = 255 ) \
-        { Set(red, green, blue, alpha); }                                                             \
-    wxColour( unsigned long colRGB ) { Set(colRGB); }                                                 \
-    wxColour(const wxString &colourName) { Set(colourName); }                                         \
+#define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                      \
+    wxColour( unsigned char red, unsigned char green, unsigned char blue,     \
+              unsigned char 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); }
 
 
@@ -126,6 +127,8 @@ public:
 #include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/generic/colour.h"
+#elif defined(__WXDFB__)
+#include "wx/generic/colour.h"
 #elif defined(__WXX11__)
 #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)