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

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

diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h
index dc08fc341035bbb6c649fe84042bf7d1d2d44f98..a9a11d413674d8bc5abb9e73be44a2df7c6927ed 100644 (file)
--- a/include/wx/dfb/dc.h
+++ b/include/wx/dfb/dc.h
@@ -13,23 +13,28 @@
 
 #include "wx/defs.h"
 #include "wx/region.h"
 
 #include "wx/defs.h"
 #include "wx/region.h"

+#include "wx/dc.h"

 #include "wx/dfb/dfbptr.h"
 
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 
 //-----------------------------------------------------------------------------
 #include "wx/dfb/dfbptr.h"
 
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 
 //-----------------------------------------------------------------------------

-// wxDC
+// wxDFBDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxDFBDCImpl : public wxDCImpl

 {
 public:
 {
 public:

-    wxDC();
+    // ctors
+    wxDFBDCImpl(wxDC *owner) : wxDCImpl(owner) { m_surface = NULL; }
+    wxDFBDCImpl(wxDC *owner, const wxIDirectFBSurfacePtr& surface)
+        : wxDCImpl(owner)
+    {
+        DFBInit(surface);
+    }

 
 

-    // Ctor.
-    wxDC(const wxIDirectFBSurfacePtr& surface);
+    bool IsOk() const { return m_surface != NULL; }

 
 

-public:

     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 


@@ -50,7 +55,7 @@ public:
     virtual void SetPalette(const wxPalette& palette);
 #endif
 
     virtual void SetPalette(const wxPalette& palette);
 #endif
 

-    virtual void SetLogicalFunction(int function) { }
+    virtual void SetLogicalFunction(int function);

 
     virtual void DestroyClippingRegion();
 
 
     virtual void DestroyClippingRegion();
 


@@ -80,7 +85,7 @@ protected:
     wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
     wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
     wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
     wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
     wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
     wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }

-    
+

     // initializes the DC from a surface, must be called if default ctor
     // was used
     void DFBInit(const wxIDirectFBSurfacePtr& surface);
     // initializes the DC from a surface, must be called if default ctor
     // was used
     void DFBInit(const wxIDirectFBSurfacePtr& surface);


@@ -156,9 +161,9 @@ protected:
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;
 
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;
 

-    friend class WXDLLIMPEXP_CORE wxOverlayImpl; // for Init
+    friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init

 
 

-    DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_ABSTRACT_CLASS(wxDFBDCImpl)

 };
 
 #endif // _WX_DFB_DC_H_
 };
 
 #endif // _WX_DFB_DC_H_