Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / include / wx / paper.h

diff --git a/include/wx/paper.h b/include/wx/paper.h
index d6703eb299cdb6fc99d3e3deb8b4e002f8a36c39..86fdafcc900fb2262bf75f462f5927b8470853bc 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -6,13 +6,13 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 

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

 #pragma interface "paper.h"
 #endif
 
 #pragma interface "paper.h"
 #endif
 


@@ -20,6 +20,7 @@
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"

+#include "wx/hashmap.h"

 
 /*
  * Paper type: see defs.h for wxPaperSize enum.
 
 /*
  * Paper type: see defs.h for wxPaperSize enum.


@@ -69,7 +70,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 

-class WXDLLEXPORT wxStringToPrintPaperTypeHashMap;
+WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
+

 class WXDLLEXPORT wxPrintPaperTypeList;
 
 class WXDLLEXPORT wxPrintPaperDatabase
 class WXDLLEXPORT wxPrintPaperTypeList;
 
 class WXDLLEXPORT wxPrintPaperDatabase


@@ -117,7 +119,7 @@ private:
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 

-WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
+extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase;

 
 
 #endif
 
 
 #endif