applying patch, fixes #10524

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

diff --git a/src/palmos/dcprint.cpp b/src/palmos/dcprint.cpp
index 6462bbeef52443de375e7245605461abeaee7155..058a2d1fe32bec4b49f57a02a95887f0dda37f8f 100644 (file)
--- a/src/palmos/dcprint.cpp
+++ b/src/palmos/dcprint.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/dcprint.cpp
 // Purpose:     wxPrinterDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/dcprint.cpp
 // Purpose:     wxPrinterDC class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,23 +24,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if wxUSE_PRINTING_ARCHITECTURE
-

 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 

-#include "wx/dcprint.h"
-#include "math.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // 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)
 {
 // 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),
                          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;
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
     return false;