X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e548f6b13a27eee6f2740d922cab636f0b305e0..f71b0c2d56b03b7823e661aacd05cf1a791e5c2f:/include/wx/paper.h?ds=sidebyside diff --git a/include/wx/paper.h b/include/wx/paper.h index 6e5a8983c8..5b42a80bed 100644 --- a/include/wx/paper.h +++ b/include/wx/paper.h @@ -12,10 +12,6 @@ #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" @@ -34,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(); @@ -72,9 +68,9 @@ private: WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap); -class WXDLLEXPORT wxPrintPaperTypeList; +class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList; -class WXDLLEXPORT wxPrintPaperDatabase +class WXDLLIMPEXP_CORE wxPrintPaperDatabase { public: wxPrintPaperDatabase(); @@ -119,7 +115,7 @@ private: // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase) }; -WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase; +extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase; #endif