Merge in from trunk r64802 - r68625

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

diff --git a/src/palmos/printpalm.cpp b/src/palmos/printpalm.cpp
index 22779980fc8a3191556b38698ef3cf16e24ac10e..722ac5085d566e96f6475aab32d17e66579fb78a 100644 (file)
--- a/src/palmos/printpalm.cpp
+++ b/src/palmos/printpalm.cpp
@@ -24,8 +24,6 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 // Don't use the Windows printer if we're in wxUniv mode and using
 // the PostScript architecture
 #if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
@@ -38,12 +36,12 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/palmos/printpalm.h"
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
-#include "wx/log.h"
 #include "wx/palmos/private.h"
 
 // ---------------------------------------------------------------------------
@@ -81,7 +79,7 @@ bool wxPalmPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 
 wxDC* wxPalmPrinter::PrintDialog(wxWindow *parent)
 {
-    wxDC* dc = (wxDC*) NULL;
+    wxDC* dc = NULL;
 
     return dc;
 }
@@ -120,6 +118,7 @@ bool wxPalmPrintPreview::Print(bool interactive)
 
 void wxPalmPrintPreview::DetermineScaling()
 {
+    // TODO
 }
 
 #endif