Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 28bd0b0f280f918897cd61ac98b3ce2ceaee3d31..38ddc084055400555df74d195e27e9aa86270afb 100644 (file)
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -21,12 +21,7 @@ wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase

 {
 public:
     wxBitmap() {}
 {
 public:
     wxBitmap() {}


@@ -39,9 +34,6 @@ public:
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 
     wxBitmap(const wxImage& image, int depth = -1);
 #endif
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-

     bool Create(const wxIDirectFBSurfacePtr& surface);
     bool Create(int width, int height, int depth = -1);
 
     bool Create(const wxIDirectFBSurfacePtr& surface);
     bool Create(int width, int height, int depth = -1);
 


@@ -58,7 +50,8 @@ public:
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 

-    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const;
+    virtual bool SaveFile(const wxString &name, wxBitmapType type,
+                          const wxPalette *palette = (wxPalette *) NULL) const;

     virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
 
 #if wxUSE_PALETTE
     virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
 
 #if wxUSE_PALETTE


@@ -86,9 +79,8 @@ public:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 protected:
     wxIDirectFBSurfacePtr GetDirectFBSurface() const;
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
     bool CreateWithFormat(int width, int height, int dfbFormat);
 
 
     bool CreateWithFormat(int width, int height, int dfbFormat);