adding support for wxCB_SORT

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

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index 457e790c02e025cf55647c2c69e3b48064b80706..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__
 


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

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

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