test whether pointer is non-NULL before using it, not after, in wxAnimation::Load...

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

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

+class WXDLLEXPORT wxColour;
+

 // the standard wxColour constructors;
 // 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
 // the standard wxColour constructors;
 // 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


@@ -35,11 +37,18 @@
 #define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax
 
 
 #define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax
 
 

-class WXDLLEXPORT wxColour;
-

 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 

+// ----------------------------------------------------------------------------
+// wxVariant support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+#include "wx/variant.h"
+DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
+#endif
+

 //-----------------------------------------------------------------------------
 // wxColourBase: this class has no data members, just some functions to avoid
 //               code redundancy in all native wxColour implementations
 //-----------------------------------------------------------------------------
 // wxColourBase: this class has no data members, just some functions to avoid
 //               code redundancy in all native wxColour implementations


@@ -85,7 +94,8 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

 
     virtual ChannelType Red() const = 0;
     virtual ChannelType Green() const = 0;
 
     virtual ChannelType Red() const = 0;
     virtual ChannelType Green() const = 0;