move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

[wxWidgets.git] / src / common / paper.cpp

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index dafaeb189af193865214e5afccc6999da2820378..126dcc282f05fe6d7738f171933d90cf338c0dba 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -38,13 +38,10 @@
 #include <string.h>
 
 #ifdef __WXMSW__
 #include <string.h>
 
 #ifdef __WXMSW__

-#include "wx/msw/wrapwin.h"
-#include <commdlg.h>
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
-
+    #include "wx/msw/wrapcdlg.h"
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif

 #endif
  // End __WXMSW__
 
 #endif
  // End __WXMSW__
 


@@ -59,7 +56,7 @@ wxPrintPaperType::wxPrintPaperType()
 {
     m_paperId = wxPAPER_NONE;
     m_platformId = 0;
 {
     m_paperId = wxPAPER_NONE;
     m_platformId = 0;

-    m_paperName = wxT("");
+    m_paperName = wxEmptyString;

     m_width = 0;
     m_height = 0;
 }
     m_width = 0;
     m_height = 0;
 }


@@ -283,7 +280,7 @@ wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId)
     if (type)
         return type->GetSize();
     else
     if (type)
         return type->GetSize();
     else

-        return wxSize(0, 0);
+        return wxSize(0,0);

 }
 
 // Get the paper size
 }
 
 // Get the paper size