Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index d6703eb299cdb6fc99d3e3deb8b4e002f8a36c39..1d65049146e07cdb7e2d10635d8e037bf75dba0b 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -1,25 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        paper.h
+// Name:        wx/paper.h
 // Purpose:     Paper database types and classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PAPERH__
 #define _WX_PAPERH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "paper.h"
-#endif
-
 #include "wx/defs.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.
@@ -33,7 +30,7 @@
 #define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h)
 #endif
 
-class WXDLLEXPORT wxPrintPaperType: public wxObject
+class WXDLLIMPEXP_CORE wxPrintPaperType: public wxObject
 {
 public:
     wxPrintPaperType();
@@ -69,10 +66,11 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
-class WXDLLEXPORT wxStringToPrintPaperTypeHashMap;
-class WXDLLEXPORT wxPrintPaperTypeList;
+WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
+
+class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList;
 
-class WXDLLEXPORT wxPrintPaperDatabase
+class WXDLLIMPEXP_CORE wxPrintPaperDatabase
 {
 public:
     wxPrintPaperDatabase();
@@ -117,7 +115,7 @@ private:
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
-WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
+extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 
 #endif