added wxStringStream classes

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

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index b60ad489b545b81d74194c50abd6bbb778d7b9ff..8aeb3adac22fe3c7e0fa65ceedd5be67d2c6cb24 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "paper.h"
 #endif
 
@@ -33,13 +33,12 @@
 
 #include "wx/paper.h"
 #include "wx/module.h"
-#include "wx/hashmap.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
 #include <commdlg.h>
 
 #ifndef __WIN32__
@@ -84,9 +83,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;