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

[wxWidgets.git] / include / wx / mac / carbon / dcprint.h

diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h
index b5641d86248da054168792fca1d8bacd836ba331..1e64559a2d6a572c3db5978603b90e86f8a71040 100644 (file)
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.h
+// Name:        wx/mac/carbon/dcprint.h

 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:


@@ -13,32 +13,37 @@
 #define _WX_DCPRINT_H_
 
 #include "wx/dc.h"
 #define _WX_DCPRINT_H_
 
 #include "wx/dc.h"

+#include "wx/dcgraph.h"

 #include "wx/cmndata.h"
 
 class wxNativePrinterDC ;
 
 #include "wx/cmndata.h"
 
 class wxNativePrinterDC ;
 

-class WXDLLEXPORT wxPrinterDC: public wxDC
+class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxGCDCImpl

 {
 {

- public:
+public:

 #if wxUSE_PRINTING_ARCHITECTURE
 #if wxUSE_PRINTING_ARCHITECTURE

-  DECLARE_CLASS(wxPrinterDC)

 
 

-  // Create a printer DC
-  wxPrinterDC(const wxPrintData& printdata );
-  ~wxPrinterDC();
+    wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata );
+    virtual ~wxPrinterDCImpl();

 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;

+
+    wxRect GetPaperRect();
+

     wxPrintData& GetPrintData() { return m_printData; }
     wxPrintData& GetPrintData() { return m_printData; }

-#if wxMAC_USE_CORE_GRAPHICS
-    void MacSetCGContext( void * cg ) ;
-#endif    
- protected:
+    virtual wxSize GetPPI() const;
+    
+protected:

     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetSize( int *width, int *height ) const;

-    wxPrintData   m_printData ;
+    
+    wxPrintData        m_printData ;

     wxNativePrinterDC* m_nativePrinterDC ;
     wxNativePrinterDC* m_nativePrinterDC ;

+    
+private:
+    DECLARE_CLASS(wxPrinterDC)

 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };