X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/622ea7838dd5ab898c7124f980edb62c390fb292..c0d6c58bd0d7d6b7dae707b2a78c7f917f98da77:/include/wx/html/htmlwin.h diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index c0cb02a3fc..027064aefb 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -56,14 +56,8 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject int m_Pos; }; -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL WXDLLEXPORT - // ?? Don't know why - but Allen Van Sickel reported it to fix problems with DLL -WX_DECLARE_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray); - -#undef WXDLLEXPORTLOCAL -#define WXDLLEXPORTLOCAL +WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray); class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow @@ -107,7 +101,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow // after(!) calling SetRelatedFrame, this sets statusbar slot where messages // will be displayed. Default is -1 = no messages. - void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes); + void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes); // sets fonts to be used when displaying HTML page. // *_italic_mode can be either wxSLANT or wxITALIC