applying patch, fixes #10524

[wxWidgets.git] / src / palmos / dcprint.cpp

diff --git a/src/palmos/dcprint.cpp b/src/palmos/dcprint.cpp
index 585116f68453e576ca59cd8bc78ee1888e9bccb1..058a2d1fe32bec4b49f57a02a95887f0dda37f8f 100644 (file)
--- a/src/palmos/dcprint.cpp
+++ b/src/palmos/dcprint.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dcprint.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,6 +24,10 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
@@ -36,15 +36,12 @@
     #include "wx/math.h"
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 
-#include "wx/dcprint.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -103,6 +100,14 @@ void wxPrinterDC::EndPage()
 {
 }
 
+wxRect wxPrinterDC::GetPaperRect() const
+{
+    // Use page rect if we can't get paper rect.
+    wxCoord w, h;
+    GetSize(&w, &h);
+    return wxRect(0, 0, w, h);
+}
+
 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {
@@ -138,7 +143,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),
-                         int WXUNUSED(rop), bool useMask,
+                         wxRasterOperationMode WXUNUSED(rop), bool useMask,
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
     return false;