handle NULL BSTRs as empty ones per Microsoft convention

[wxWidgets.git] / src / msw / printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 2eadf2547f878eb31fb9a2b4a63bcc89df4a59ea..310db919ddb1063f9bedf768ebbc1f57d3f29b3f 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -42,7 +42,7 @@
 #endif
 
 #include "wx/msw/printwin.h"
-#include "wx/msw/printdlg.h"   // RJL used Windows dialog?s
+#include "wx/msw/printdlg.h"
 #include "wx/msw/private.h"
 
 #include <stdlib.h>
@@ -75,7 +75,7 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
                 : wxPrinterBase(data)
 {
-    m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
+    m_lpAbortProc = (WXFARPROC)wxAbortProc;
 }
 
 wxWindowsPrinter::~wxWindowsPrinter()
@@ -368,7 +368,7 @@ void wxWindowsPrintPreview::DetermineScaling()
     int logPPIPrinterX;
     int logPPIPrinterY;
 
-       wxRect paperRect;
+    wxRect paperRect;
 
     if ( printerDC.Ok() )
     {
@@ -380,7 +380,7 @@ void wxWindowsPrintPreview::DetermineScaling()
         logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
         logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
 
-               paperRect = printerDC.GetPaperRect();
+        paperRect = printerDC.GetPaperRect();
 
         if ( logPPIPrinterX == 0 ||
                 logPPIPrinterY == 0 ||
@@ -400,7 +400,7 @@ void wxWindowsPrintPreview::DetermineScaling()
         logPPIPrinterX = 600;
         logPPIPrinterY = 600;
 
-               paperRect = wxRect(0, 0, printerXRes, printerYRes);
+        paperRect = wxRect(0, 0, printerXRes, printerYRes);
         m_isOk = false;
     }
     m_pageWidth = printerXRes;