fix for [ 1020924 ] wx.Display.IsPrimary is wrong

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 0c3b02d5ad5b43126ca64956f0176b363585af53..c39ddbfc8e5aeb42c029fa9c0a741001cf3cee0f 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dcprint.h"
 #endif
 
     #pragma interface "dcprint.h"
 #endif
 


@@ -21,21 +21,17 @@
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 

-class WXDLLEXPORT wxPrinterDC: public wxDC
+class WXDLLEXPORT wxPrinterDC : public wxDC

 {
 public:
 {
 public:

-DECLARE_CLASS(wxPrinterDC)
-

     // Create a printer DC (obsolete function: use wxPrintData version now)
     // 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);
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = true, int orientation = wxPORTRAIT);

 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     wxPrinterDC(WXHDC theDC);
 
 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     wxPrinterDC(WXHDC theDC);
 

-    ~wxPrinterDC(void);
-

     // override some base class virtuals
     virtual bool StartDoc(const wxString& message);
     virtual void EndDoc();
     // override some base class virtuals
     virtual bool StartDoc(const wxString& message);
     virtual void EndDoc();


@@ -44,13 +40,19 @@ DECLARE_CLASS(wxPrinterDC)
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-                              bool useMask = FALSE);
+                              bool useMask = false);

     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        int rop = wxCOPY, bool useMask = FALSE);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+
+    // init the dc
+    void Init();

 
     wxPrintData m_printData;
 
     wxPrintData m_printData;

+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPrinterDC)

 };
 
 // Gets an HDC for the default printer configuration
 };
 
 // Gets an HDC for the default printer configuration