prevent crash if panel/kicker is killed, bug 1872724

[wxWidgets.git] / include / wx / os2 / dcprint.h

diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h
index fef20ef34760aea0185cc94e89f6257ec4c98300..558f6454c9d58dea3603bfa727dc3c5e999aca3b 100644 (file)
--- a/include/wx/os2/dcprint.h
+++ b/include/wx/os2/dcprint.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.h
+// Name:        wx/os2/dcprint.h

 // Purpose:     wxPrinterDC class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxPrinterDC class
 // Author:      David Webster
 // Modified by:


@@ -16,26 +16,24 @@
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"

+#include "wx/os2/dc.h"

 
 

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

 {
  public:
 {
  public:

-    // Create a printer DC [obsolete]
-    wxPrinterDC( const wxString& rsDriver
-                ,const wxString& rsDevice
-                ,const wxString& rsOutput
-                ,bool            bInteractive = TRUE
-                ,int             nOrientation = wxPORTRAIT
-               );
+    // Create a printer DC

 
     // Create from print data
 
     // Create from print data

-    wxPrinterDC(const wxPrintData& rData);
-    wxPrinterDC(WXHDC hTheDC);
+    wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& rData );
+    wxPrinterDCImpl( wxPrinterDC *owner, WXHDC hTheDC);

 
 

-    bool StartDoc(const wxString& rsMessage);
-    void EndDoc(void);
-    void StartPage(void);
-    void EndPage(void);
+    // override some base class virtuals
+    virtual bool StartDoc(const wxString& rsMessage);
+    virtual void EndDoc(void);
+    virtual void StartPage(void);
+    virtual void EndPage(void);
+
+    virtual wxRect GetPaperRect();

 
 protected:
     virtual void DoDrawBitmap( const wxBitmap& rBmp
 
 protected:
     virtual void DoDrawBitmap( const wxBitmap& rBmp


@@ -52,8 +50,8 @@ protected:
                         ,wxCoord vYsrc
                         ,int     nRop = wxCOPY
                         ,bool    bUseMask = FALSE
                         ,wxCoord vYsrc
                         ,int     nRop = wxCOPY
                         ,bool    bUseMask = FALSE

-                        ,wxCoord xsrcMask = -1
-                        ,wxCoord ysrcMask = -1
+                        ,wxCoord vXsrcMask = -1
+                        ,wxCoord vYsrcMask = -1

                        );
 
     // init the dc
                        );
 
     // init the dc


@@ -61,11 +59,12 @@ protected:
 
     wxPrintData                     m_printData;
 private:
 
     wxPrintData                     m_printData;
 private:

-    DECLARE_CLASS(wxPrinterDC)
+    DECLARE_CLASS(wxPrinterDCImpl)
+    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)

 }; // end of CLASS wxPrinterDC
 
 // Gets an HDC for the specified printer configuration
 }; // end of CLASS wxPrinterDC
 
 // Gets an HDC for the specified printer configuration

-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& rData);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData);

 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 
 #endif // wxUSE_PRINTING_ARCHITECTURE