1. fixes to wxDC deleting logic (should fix ~wxPrinterDC leak), some code

reorganized/removed
2. applied (slightly modified) wxEnhMetaFileSimpleDataObject patch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/dcprint.h

@@ -21,11 +21,9 @@
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
-class WXDLLEXPORT wxPrinterDC: public wxDC
+class WXDLLEXPORT wxPrinterDC : public wxDC
 {
 public:
-DECLARE_CLASS(wxPrinterDC)
-
     // Create a printer DC (obsolete function: use wxPrintData version now)
     wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
 
@@ -34,8 +32,6 @@ DECLARE_CLASS(wxPrinterDC)
 
     wxPrinterDC(WXHDC theDC);
 
-    ~wxPrinterDC(void);
-
     // override some base class virtuals
     virtual bool StartDoc(const wxString& message);
     virtual void EndDoc();
@@ -50,7 +46,13 @@ protected:
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
                         int rop = wxCOPY, bool useMask = FALSE);
 
+    // init the dc
+    void Init();
+
     wxPrintData m_printData;
+
+private:
+    DECLARE_CLASS(wxPrinterDC)
 };
 
 // Gets an HDC for the default printer configuration