X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222ed1d678dff2f5c3c4164321dd05e8f47de487..da78f3b10cfe9447053f32ea4baddf50058eafef:/src/common/paper.cpp

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index b60ad489b5..126dcc282f 100644
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        paper.cpp
 // Purpose:     Paper size classes
-// Author:      Julian Smart 
+// Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "paper.h"
 #endif
 
@@ -33,19 +33,15 @@
 
 #include "wx/paper.h"
 #include "wx/module.h"
-#include "wx/hashmap.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
-#include <commdlg.h>
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
-
+    #include "wx/msw/wrapcdlg.h"
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
 #endif
  // End __WXMSW__
 
@@ -60,7 +56,7 @@ wxPrintPaperType::wxPrintPaperType()
 {
     m_paperId = wxPAPER_NONE;
     m_platformId = 0;
-    m_paperName = wxT("");
+    m_paperName = wxEmptyString;
     m_width = 0;
     m_height = 0;
 }
@@ -84,9 +80,8 @@ wxSize wxPrintPaperType::GetSizeDeviceUnits() const
  * Print paper database for PostScript
  */
 
-WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
 WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxPrintPaperTypeList);
 
 wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase*) NULL;
@@ -285,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
@@ -332,7 +327,7 @@ bool wxPrintPaperModule::OnInit()
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();
 
-    return TRUE;
+    return true;
 }
 
 void wxPrintPaperModule::OnExit()