From 6acba9a7194b30113636efb08e0b165f91011e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 4 Jul 2003 13:04:05 +0000 Subject: [PATCH] fixes for moving wxHTML files into their own DLL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 12 ++++++++++++ include/wx/html/helpctrl.h | 2 +- include/wx/html/helpdata.h | 10 +++++----- include/wx/html/helpfrm.h | 8 ++++---- include/wx/html/htmlcell.h | 32 ++++++++++++++++---------------- include/wx/html/htmlfilt.h | 4 ++-- include/wx/html/htmlpars.h | 14 +++++++------- include/wx/html/htmlproc.h | 2 +- include/wx/html/htmltag.h | 8 ++++---- include/wx/html/htmlwin.h | 4 ++-- include/wx/html/htmprint.h | 6 +++--- include/wx/html/winpars.h | 14 +++++++------- include/wx/htmllbox.h | 10 +++++----- include/wx/msw/helpbest.h | 2 +- 14 files changed, 70 insertions(+), 58 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index bcbb1856e6..74e04440bf 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -381,6 +381,7 @@ typedef int wxWindowID; #ifdef WXUSINGDLL #define WXUSINGDLL_BASE #define WXUSINGDLL_CORE + #define WXUSINGDLL_HTML #endif // WXUSINGDLL @@ -408,6 +409,17 @@ typedef int wxWindowID; #define WXDLLIMPEXP_DATA_CORE(type) type #endif +#ifdef WXMAKINGDLL_HTML + #define WXDLLIMPEXP_HTML WXEXPORT + #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type +#elif defined(WXUSINGDLL_HTML) + #define WXDLLIMPEXP_HTML WXIMPORT + #define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_HTML + #define WXDLLIMPEXP_DATA_HTML(type) type +#endif + // for backwards compatibility, define suffix-less versions too #define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index c9981302fa..573641ac23 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -25,7 +25,7 @@ #define wxID_HTML_HELPFRAME (wxID_HIGHEST + 1) -class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler +class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler { DECLARE_DYNAMIC_CLASS(wxHtmlHelpController) diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 0c110f0a20..21719640c7 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -26,13 +26,13 @@ #include "wx/dynarray.h" #include "wx/font.h" -class WXDLLEXPORT wxHtmlHelpData; +class WXDLLIMPEXP_HTML wxHtmlHelpData; //-------------------------------------------------------------------------------- // helper classes & structs //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlBookRecord +class WXDLLIMPEXP_HTML wxHtmlBookRecord { public: wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, @@ -98,7 +98,7 @@ struct wxHtmlContentsItem // of keyword(s) //------------------------------------------------------------------------------ -class WXDLLEXPORT wxHtmlSearchEngine : public wxObject +class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject { public: wxHtmlSearchEngine() : wxObject() {m_Keyword = NULL; } @@ -124,7 +124,7 @@ private: // class inside wxHtmlHelpData, but that's against coding standards :-( // Never construct this class yourself, obtain a copy from // wxHtmlHelpData::PrepareKeywordSearch(const wxString& key) -class WXDLLEXPORT wxHtmlSearchStatus +class WXDLLIMPEXP_HTML wxHtmlSearchStatus { public: // constructor; supply wxHtmlHelpData ptr, the keyword and (optionally) the @@ -153,7 +153,7 @@ private: DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus) }; -class WXDLLEXPORT wxHtmlHelpData : public wxObject +class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlHelpData) friend class wxHtmlSearchStatus; diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index b2b0432d8e..ed6e6f8e0e 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -34,8 +34,8 @@ #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" -class WXDLLEXPORT wxButton; -class WXDLLEXPORT wxTextCtrl; +class WXDLLIMPEXP_CORE wxButton; +class WXDLLIMPEXP_CORE wxTextCtrl; // style flags for the Help Frame @@ -68,9 +68,9 @@ struct wxHtmlHelpFrameCfg }; -class WXDLLEXPORT wxHelpControllerBase; +class WXDLLIMPEXP_CORE wxHelpControllerBase; -class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame +class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame { DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame) diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 982e42f4f9..4d476606f2 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -25,15 +25,15 @@ #include "wx/window.h" -class WXDLLEXPORT wxHtmlLinkInfo; -class WXDLLEXPORT wxHtmlCell; -class WXDLLEXPORT wxHtmlContainerCell; +class WXDLLIMPEXP_HTML wxHtmlLinkInfo; +class WXDLLIMPEXP_HTML wxHtmlCell; +class WXDLLIMPEXP_HTML wxHtmlContainerCell; // wxHtmlSelection is data holder with information about text selection. // Selection is defined by two positions (beginning and end of the selection) // and two leaf(!) cells at these positions. -class WXDLLEXPORT wxHtmlSelection +class WXDLLIMPEXP_HTML wxHtmlSelection { public: wxHtmlSelection() @@ -80,7 +80,7 @@ enum wxHtmlSelectionState // Selection state is passed to wxHtmlCell::Draw so that it can render itself // differently e.g. when inside text selection or outside it. -class WXDLLEXPORT wxHtmlRenderingState +class WXDLLIMPEXP_HTML wxHtmlRenderingState { public: wxHtmlRenderingState() : m_selState(wxHTML_SEL_OUT) {} @@ -101,7 +101,7 @@ private: // HTML rendering customization. This class is used when rendering wxHtmlCells // as a callback: -class WXDLLEXPORT wxHtmlRenderingStyle +class WXDLLIMPEXP_HTML wxHtmlRenderingStyle { public: virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0; @@ -109,7 +109,7 @@ public: }; // Standard style: -class WXDLLEXPORT wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle +class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle { public: virtual wxColour GetSelectedTextColour(const wxColour& clr); @@ -120,7 +120,7 @@ public: // Information given to cells when drawing them. Contains rendering state, // selection information and rendering style object that can be used to // customize the output. -class WXDLLEXPORT wxHtmlRenderingInfo +class WXDLLIMPEXP_HTML wxHtmlRenderingInfo { public: wxHtmlRenderingInfo() : m_selection(NULL), m_style(NULL) {} @@ -160,7 +160,7 @@ enum // --------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlCell : public wxObject +class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject { public: wxHtmlCell(); @@ -326,7 +326,7 @@ protected: // Single word in input stream. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWordCell : public wxHtmlCell +class WXDLLIMPEXP_HTML wxHtmlWordCell : public wxHtmlCell { public: wxHtmlWordCell(const wxString& word, wxDC& dc); @@ -350,7 +350,7 @@ protected: // Container contains other cells, thus forming tree structure of rendering // elements. Basic code of layout algorithm is contained in this class. -class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell +class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell { public: wxHtmlContainerCell(wxHtmlContainerCell *parent); @@ -460,7 +460,7 @@ inline wxHtmlCell* wxHtmlContainerCell::GetFirstCell() const // Color changer. // --------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell +class WXDLLIMPEXP_HTML wxHtmlColourCell : public wxHtmlCell { public: wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;} @@ -482,7 +482,7 @@ protected: // Sets actual font used for text rendering //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell +class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell { public: wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); } @@ -507,7 +507,7 @@ protected: // (buttons, input boxes etc.) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell +class WXDLLIMPEXP_HTML wxHtmlWidgetCell : public wxHtmlCell { public: // !!! wnd must have correct parent! @@ -537,7 +537,7 @@ protected: // Internal data structure. It represents hypertext link //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlLinkInfo : public wxObject +class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject { public: wxHtmlLinkInfo() : wxObject() @@ -571,7 +571,7 @@ private: // wxHtmlTerminalCellsInterator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTerminalCellsInterator +class WXDLLIMPEXP_HTML wxHtmlTerminalCellsInterator { public: wxHtmlTerminalCellsInterator(const wxHtmlCell *from, const wxHtmlCell *to) diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h index 4f49f9f8c7..f3bf253ba1 100644 --- a/include/wx/html/htmlfilt.h +++ b/include/wx/html/htmlfilt.h @@ -30,7 +30,7 @@ // kinds of files (HTPP, FTP, local, tar.gz etc..) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlFilter : public wxObject +class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject { DECLARE_ABSTRACT_CLASS(wxHtmlFilter) @@ -56,7 +56,7 @@ public: //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter +class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter { DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText) diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h index bcb7a9a030..bebe5ec47e 100644 --- a/include/wx/html/htmlpars.h +++ b/include/wx/html/htmlpars.h @@ -23,10 +23,10 @@ #include "wx/hash.h" #include "wx/fontenc.h" -class WXDLLEXPORT wxMBConv; -class WXDLLEXPORT wxHtmlParser; -class WXDLLEXPORT wxHtmlTagHandler; -class WXDLLEXPORT wxHtmlEntitiesParser; +class WXDLLIMPEXP_BASE wxMBConv; +class WXDLLIMPEXP_HTML wxHtmlParser; +class WXDLLIMPEXP_HTML wxHtmlTagHandler; +class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; class wxHtmlTextPieces; class wxHtmlParserState; @@ -43,7 +43,7 @@ enum wxHtmlURLType // the document and divide it into blocks of tags (where one block // consists of starting and ending tag and of text between these // 2 tags. -class WXDLLEXPORT wxHtmlParser : public wxObject +class WXDLLIMPEXP_HTML wxHtmlParser : public wxObject { DECLARE_ABSTRACT_CLASS(wxHtmlParser) @@ -197,7 +197,7 @@ protected: // (using it's public methods) // 2. Parser parses source between starting and ending tag // 3. Handler restores original state of the parser -class WXDLLEXPORT wxHtmlTagHandler : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTagHandler : public wxObject { DECLARE_ABSTRACT_CLASS(wxHtmlTagHandler) @@ -237,7 +237,7 @@ protected: // This class is used to parse HTML entities in strings. It can handle // both named entities and &#xxxx entries where xxxx is Unicode code. -class WXDLLEXPORT wxHtmlEntitiesParser : public wxObject +class WXDLLIMPEXP_HTML wxHtmlEntitiesParser : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser) diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h index 59cb01ed94..f0bd12235b 100644 --- a/include/wx/html/htmlproc.h +++ b/include/wx/html/htmlproc.h @@ -35,7 +35,7 @@ enum // processors before displaying it, thus allowing for on-the-fly // modifications of the markup. -class WXDLLEXPORT wxHtmlProcessor : public wxObject +class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject { DECLARE_ABSTRACT_CLASS(wxHtmlProcessor) diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 42927905cb..5df5fc3c14 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -21,8 +21,8 @@ #include "wx/object.h" -class WXDLLEXPORT wxColour; -class WXDLLEXPORT wxHtmlEntitiesParser; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; //----------------------------------------------------------------------------- // wxHtmlTagsCache @@ -31,7 +31,7 @@ class WXDLLEXPORT wxHtmlEntitiesParser; struct wxHtmlCacheItem; -class WXDLLEXPORT wxHtmlTagsCache : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTagsCache : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) @@ -58,7 +58,7 @@ public: // by wxHtmlParser. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTag : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTag : public wxObject { DECLARE_CLASS(wxHtmlTag) diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index da2e97d200..8ac2730813 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -32,7 +32,7 @@ class wxHtmlProcessor; class wxHtmlWinModule; class wxHtmlHistoryArray; class wxHtmlProcessorList; -class WXDLLEXPORT wxHtmlWinAutoScrollTimer; +class WXDLLIMPEXP_HTML wxHtmlWinAutoScrollTimer; // wxHtmlWindow flags: @@ -62,7 +62,7 @@ enum wxHtmlOpeningStatus // SetPage(text) or LoadPage(filename). // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow +class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow { DECLARE_DYNAMIC_CLASS(wxHtmlWindow) friend class wxHtmlWinModule; diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index 8ee2742637..eabe41acf4 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -33,7 +33,7 @@ // portion of DC //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlDCRenderer : public wxObject +class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject { public: wxHtmlDCRenderer(); @@ -110,7 +110,7 @@ enum { //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlPrintout : public wxPrintout +class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout { public: wxHtmlPrintout(const wxString& title = wxT("Printout")); @@ -193,7 +193,7 @@ private: // stores page&printer settings in it. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject +class WXDLLIMPEXP_HTML wxHtmlEasyPrinting : public wxObject { public: wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL); diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 196ae84d01..d1eae9c929 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -24,10 +24,10 @@ #include "wx/html/htmlcell.h" #include "wx/encconv.h" -class WXDLLEXPORT wxHtmlWindow; -class WXDLLEXPORT wxHtmlWinParser; -class WXDLLEXPORT wxHtmlWinTagHandler; -class WXDLLEXPORT wxHtmlTagsModule; +class WXDLLIMPEXP_HTML wxHtmlWindow; +class WXDLLIMPEXP_HTML wxHtmlWinParser; +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_HTML wxHtmlTagsModule; //-------------------------------------------------------------------------------- // wxHtmlWinParser @@ -36,7 +36,7 @@ class WXDLLEXPORT wxHtmlTagsModule; // wxHtmlWindow. It uses special wxHtmlWinTagHandler. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser +class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser { friend class wxHtmlWindow; @@ -197,7 +197,7 @@ private: // the wxHtmlWinParser object //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinTagHandler : public wxHtmlTagHandler +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler { DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler) @@ -225,7 +225,7 @@ protected: // (See documentation for details) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTagsModule : public wxModule +class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule { DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule) diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h index 666717632b..5098935c17 100644 --- a/include/wx/htmllbox.h +++ b/include/wx/htmllbox.h @@ -14,16 +14,16 @@ #include "wx/vlbox.h" // base class -class WXDLLEXPORT wxHtmlCell; -class WXDLLEXPORT wxHtmlWinParser; -class WXDLLEXPORT wxHtmlListBoxCache; -class WXDLLEXPORT wxHtmlListBoxStyle; +class WXDLLIMPEXP_HTML wxHtmlCell; +class WXDLLIMPEXP_HTML wxHtmlWinParser; +class WXDLLIMPEXP_HTML wxHtmlListBoxCache; +class WXDLLIMPEXP_HTML wxHtmlListBoxStyle; // ---------------------------------------------------------------------------- // wxHtmlListBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlListBox : public wxVListBox +class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox { public: // constructors and such diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index 0345d504b5..0169e06262 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -20,7 +20,7 @@ #include "wx/helpbase.h" -class WXDLLEXPORT wxBestHelpController: public wxHelpControllerBase +class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase { public: wxBestHelpController()