X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b713f8919c649822292f04bb7095291585d96550..9ba4b498e306119b4aa0361e45165e4d639815e3:/src/msw/dcprint.cpp

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8636a4447c..91f5c1806f 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -48,10 +48,7 @@
 #include "wx/msw/printdlg.h"
 #include "wx/math.h"
 
-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
-#endif
-
+#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif
@@ -278,7 +275,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
-    return ( deviceName != wxEmptyString );
+    return ( !deviceName.empty() );
 }
 
 // Gets an HDC for the specified printer configuration
@@ -404,7 +401,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
     if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
             !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )
     {
-        // no support for StretchDIBits() or an error occured if we got here
+        // no support for StretchDIBits() or an error occurred if we got here
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);