disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()

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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 973a73312d6f566f4f8ec1e3c1328650a82f7d3b..1f26fbd102632a0bbbefc251b42e439c4c79a714 100644 (file)
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -6,20 +6,17 @@
 // 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(NO_GCC_PRAGMA)
-#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.
@@ -69,7 +66,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
-class WXDLLEXPORT wxStringToPrintPaperTypeHashMap;
+WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
+
 class WXDLLEXPORT wxPrintPaperTypeList;
 
 class WXDLLEXPORT wxPrintPaperDatabase
@@ -117,7 +115,7 @@ private:
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
-WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
+extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 
 #endif