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

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index e2431b9e5380902531e641625127620cf483f3a3..4153de3a39148e61507face9147f2ba151a89c49 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,10 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/gdiobj.h"

 #include "wx/gdicmn.h"  // for wxBitmapType
 #include "wx/colour.h"
 
 #include "wx/gdicmn.h"  // for wxBitmapType
 #include "wx/colour.h"
 


@@ -30,6 +27,15 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 

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

 // ----------------------------------------------------------------------------
 // wxMask represents the transparent area of the bitmap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMask represents the transparent area of the bitmap
 // ----------------------------------------------------------------------------


@@ -84,26 +90,21 @@ protected:
 class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
 {
 public:
 class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
 {
 public:

-    wxBitmapHandlerBase()
-        : m_name()
-        , m_extension()
-        , m_type(wxBITMAP_TYPE_INVALID)
-    { }
-
+    wxBitmapHandlerBase() { m_type = wxBITMAP_TYPE_INVALID; }

     virtual ~wxBitmapHandlerBase() { }
 
     virtual ~wxBitmapHandlerBase() { }
 

-    virtual bool Create(wxBitmap *bitmap, void *data, long flags,
-                          int width, int height, int depth = 1) = 0;
+    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
+                        int width, int height, int depth = 1);

     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,

-                          int desiredWidth, int desiredHeight) = 0;
+                          int desiredWidth, int desiredHeight);

     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,

-                          int type, const wxPalette *palette = NULL) = 0;
+                          int type, const wxPalette *palette = NULL);

 
     void SetName(const wxString& name)      { m_name = name; }
     void SetExtension(const wxString& ext)  { m_extension = ext; }
     void SetType(wxBitmapType type)         { m_type = type; }
 
     void SetName(const wxString& name)      { m_name = name; }
     void SetExtension(const wxString& ext)  { m_extension = ext; }
     void SetType(wxBitmapType type)         { m_type = type; }

-    wxString GetName() const                { return m_name; }
-    wxString GetExtension() const           { return m_extension; }
+    const wxString& GetName() const         { return m_name; }
+    const wxString& GetExtension() const    { return m_extension; }

     wxBitmapType GetType() const            { return m_type; }
 
 private:
     wxBitmapType GetType() const            { return m_type; }
 
 private:


@@ -111,7 +112,6 @@ private:
     wxString      m_extension;
     wxBitmapType  m_type;
 
     wxString      m_extension;
     wxBitmapType  m_type;
 

-private:

     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 


@@ -124,19 +124,17 @@ public:
     wxBitmap();
     wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap();
     wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);

-    wxBitmap(const char **bits);
-    wxBitmap(char **bits);
+    wxBitmap(const char* const* bits);

     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);

-    bool operator == (const wxBitmap& bmp) const;
-    bool operator != (const wxBitmap& bmp) const;

 
     bool Create(int width, int height, int depth = -1);
 
     static void InitStandardHandlers();
     */
 
 
     bool Create(int width, int height, int depth = -1);
 
     static void InitStandardHandlers();
     */
 

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

 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;