Fixed old FIXME about unsigned result of sunstraction + a few changes to be able...

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

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index e207a9a4b1e6be226b50480aaf61bc20d7e74138..dafaeb189af193865214e5afccc6999da2820378 100644 (file)
--- 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,7 +33,6 @@
 
 #include "wx/paper.h"
 #include "wx/module.h"
-#include "wx/hashmap.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -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;
@@ -332,7 +330,7 @@ bool wxPrintPaperModule::OnInit()
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();
 
-    return TRUE;
+    return true;
 }
 
 void wxPrintPaperModule::OnExit()