X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/498b94a6e0b67c07ab9269dffdc353dcd639826e..6f8c67e71020cb3b7779b1267dda8702423e7c42:/src/msw/dcprint.cpp diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 4de8e69a93..5c90a1f9e5 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -45,12 +45,10 @@ #include "wx/dcprint.h" #include "wx/printdlg.h" -#include "math.h" - -#if wxUSE_COMMON_DIALOGS - #include -#endif +#include "wx/msw/printdlg.h" +#include "wx/math.h" +#include "wx/msw/wrapcdlg.h" #ifndef __WIN32__ #include #endif @@ -181,7 +179,7 @@ bool wxPrinterDC::StartDoc(const wxString& message) wxString filename(m_printData.GetFilename()); - if (filename.IsEmpty()) + if (filename.empty()) docinfo.lpszOutput = NULL; else docinfo.lpszOutput = (const wxChar *) filename; @@ -277,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