fix bug compiling with DMC Borland gcc (macos); reverting part of 1.09 to 1.10

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

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index e207a9a4b1e6be226b50480aaf61bc20d7e74138..0a81aa5c0c85d96b809126162e5b849ed6c1e656 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "paper.h"
 #endif
 
 #pragma implementation "paper.h"
 #endif
 


@@ -86,7 +86,7 @@ wxSize wxPrintPaperType::GetSizeDeviceUnits() const
 
 WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
 WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
 
 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;
 WX_DEFINE_LIST(wxPrintPaperTypeList);
 
 wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase*) NULL;