X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e548f6b13a27eee6f2740d922cab636f0b305e0..068b764a5a7cc2929b1fd8ea5643f43b5cbc8762:/src/common/paper.cpp?ds=sidebyside diff --git a/src/common/paper.cpp b/src/common/paper.cpp index dafaeb189a..126dcc282f 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -38,13 +38,10 @@ #include #ifdef __WXMSW__ -#include "wx/msw/wrapwin.h" -#include - -#ifndef __WIN32__ -#include -#endif - + #include "wx/msw/wrapcdlg.h" + #ifndef __WIN32__ + #include + #endif #endif // End __WXMSW__ @@ -59,7 +56,7 @@ wxPrintPaperType::wxPrintPaperType() { m_paperId = wxPAPER_NONE; m_platformId = 0; - m_paperName = wxT(""); + m_paperName = wxEmptyString; m_width = 0; m_height = 0; } @@ -283,7 +280,7 @@ wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId) if (type) return type->GetSize(); else - return wxSize(0, 0); + return wxSize(0,0); } // Get the paper size