diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl index def2c4a833..e9ff9816c4 100644 --- a/contrib/build/xrc/xrc.bkl +++ b/contrib/build/xrc/xrc.bkl @@ -98,12 +98,14 @@ - WXMAKINGDLL + WXUSINGDLL + WXMAKINGDLL_XRC $(SRCDIR)/expat/xmlparse $(SRCDIR)/expat/xmltok $(XRC_SRC) - core html + core + base diff --git a/contrib/include/wx/xrc/xh_bmp.h b/contrib/include/wx/xrc/xh_bmp.h index eda67ffd50..5800b14e37 100644 --- a/contrib/include/wx/xrc/xh_bmp.h +++ b/contrib/include/wx/xrc/xh_bmp.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler) public: @@ -27,7 +27,7 @@ public: virtual bool CanHandle(wxXmlNode *node); }; -class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxIconXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_bmpbt.h b/contrib/include/wx/xrc/xh_bmpbt.h index 3be9eb5e0e..0ddc5ca786 100644 --- a/contrib/include/wx/xrc/xh_bmpbt.h +++ b/contrib/include/wx/xrc/xh_bmpbt.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_bttn.h b/contrib/include/wx/xrc/xh_bttn.h index 1245202b7e..b080091215 100644 --- a/contrib/include/wx/xrc/xh_bttn.h +++ b/contrib/include/wx/xrc/xh_bttn.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_cald.h b/contrib/include/wx/xrc/xh_cald.h index e77aff06bb..b43cf484ad 100644 --- a/contrib/include/wx/xrc/xh_cald.h +++ b/contrib/include/wx/xrc/xh_cald.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_chckb.h b/contrib/include/wx/xrc/xh_chckb.h index e3a2bc3358..4d6b7198c8 100644 --- a/contrib/include/wx/xrc/xh_chckb.h +++ b/contrib/include/wx/xrc/xh_chckb.h @@ -20,7 +20,7 @@ #if wxUSE_CHECKBOX -class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_chckl.h b/contrib/include/wx/xrc/xh_chckl.h index e9a6cc76c9..f662f31c69 100644 --- a/contrib/include/wx/xrc/xh_chckl.h +++ b/contrib/include/wx/xrc/xh_chckl.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_choic.h b/contrib/include/wx/xrc/xh_choic.h index e30460546c..e36f19f118 100644 --- a/contrib/include/wx/xrc/xh_choic.h +++ b/contrib/include/wx/xrc/xh_choic.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_combo.h b/contrib/include/wx/xrc/xh_combo.h index ddc1c29eb7..848a59c3ca 100644 --- a/contrib/include/wx/xrc/xh_combo.h +++ b/contrib/include/wx/xrc/xh_combo.h @@ -19,7 +19,7 @@ #if wxUSE_COMBOBOX -class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_dlg.h b/contrib/include/wx/xrc/xh_dlg.h index 9ba7c76d7a..5a68a442ca 100644 --- a/contrib/include/wx/xrc/xh_dlg.h +++ b/contrib/include/wx/xrc/xh_dlg.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_frame.h b/contrib/include/wx/xrc/xh_frame.h index e37681e0a7..c6e1795219 100644 --- a/contrib/include/wx/xrc/xh_frame.h +++ b/contrib/include/wx/xrc/xh_frame.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_gauge.h b/contrib/include/wx/xrc/xh_gauge.h index 18e9354f99..b9c0f669c4 100644 --- a/contrib/include/wx/xrc/xh_gauge.h +++ b/contrib/include/wx/xrc/xh_gauge.h @@ -22,7 +22,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler) enum diff --git a/contrib/include/wx/xrc/xh_gdctl.h b/contrib/include/wx/xrc/xh_gdctl.h index 0893b0ad6d..ffdad072a4 100644 --- a/contrib/include/wx/xrc/xh_gdctl.h +++ b/contrib/include/wx/xrc/xh_gdctl.h @@ -19,7 +19,7 @@ #if wxUSE_DIRDLG -class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_html.h b/contrib/include/wx/xrc/xh_html.h index 12db270888..ac49faa083 100644 --- a/contrib/include/wx/xrc/xh_html.h +++ b/contrib/include/wx/xrc/xh_html.h @@ -21,7 +21,7 @@ #if wxUSE_HTML -class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_listb.h b/contrib/include/wx/xrc/xh_listb.h index 890266b2f3..86f65f4c63 100644 --- a/contrib/include/wx/xrc/xh_listb.h +++ b/contrib/include/wx/xrc/xh_listb.h @@ -19,7 +19,7 @@ #if wxUSE_LISTBOX -class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_listc.h b/contrib/include/wx/xrc/xh_listc.h index 8d32d77f01..151dc9c6c9 100644 --- a/contrib/include/wx/xrc/xh_listc.h +++ b/contrib/include/wx/xrc/xh_listc.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_menu.h b/contrib/include/wx/xrc/xh_menu.h index 1e516bf460..52274fb81b 100644 --- a/contrib/include/wx/xrc/xh_menu.h +++ b/contrib/include/wx/xrc/xh_menu.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler) public: @@ -29,7 +29,7 @@ private: bool m_insideMenu; }; -class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_notbk.h b/contrib/include/wx/xrc/xh_notbk.h index 14e909568b..2c2bf35fd5 100644 --- a/contrib/include/wx/xrc/xh_notbk.h +++ b/contrib/include/wx/xrc/xh_notbk.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxNotebook; -class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_panel.h b/contrib/include/wx/xrc/xh_panel.h index dfe8bd0653..ebfc6de0b6 100644 --- a/contrib/include/wx/xrc/xh_panel.h +++ b/contrib/include/wx/xrc/xh_panel.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_radbt.h b/contrib/include/wx/xrc/xh_radbt.h index 8a6fd4b1a9..ffa4185a19 100644 --- a/contrib/include/wx/xrc/xh_radbt.h +++ b/contrib/include/wx/xrc/xh_radbt.h @@ -20,7 +20,7 @@ #if wxUSE_RADIOBOX -class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_radbx.h b/contrib/include/wx/xrc/xh_radbx.h index bd0e8152cb..72915ffe67 100644 --- a/contrib/include/wx/xrc/xh_radbx.h +++ b/contrib/include/wx/xrc/xh_radbx.h @@ -19,7 +19,7 @@ #if wxUSE_RADIOBOX -class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_scrol.h b/contrib/include/wx/xrc/xh_scrol.h index a13e56ad0b..ef1d3861d8 100644 --- a/contrib/include/wx/xrc/xh_scrol.h +++ b/contrib/include/wx/xrc/xh_scrol.h @@ -20,7 +20,7 @@ -class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler) enum diff --git a/contrib/include/wx/xrc/xh_scwin.h b/contrib/include/wx/xrc/xh_scwin.h index 7f9da82d6e..6aa9139d1f 100644 --- a/contrib/include/wx/xrc/xh_scwin.h +++ b/contrib/include/wx/xrc/xh_scwin.h @@ -20,7 +20,7 @@ -class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_sizer.h b/contrib/include/wx/xrc/xh_sizer.h index eb5e05c048..59fb16f268 100644 --- a/contrib/include/wx/xrc/xh_sizer.h +++ b/contrib/include/wx/xrc/xh_sizer.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxSizer; -class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_slidr.h b/contrib/include/wx/xrc/xh_slidr.h index ce2e582e22..8e425b4294 100644 --- a/contrib/include/wx/xrc/xh_slidr.h +++ b/contrib/include/wx/xrc/xh_slidr.h @@ -20,7 +20,7 @@ #if wxUSE_SLIDER -class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler) enum diff --git a/contrib/include/wx/xrc/xh_spin.h b/contrib/include/wx/xrc/xh_spin.h index 7448302b7d..ab9590a68b 100644 --- a/contrib/include/wx/xrc/xh_spin.h +++ b/contrib/include/wx/xrc/xh_spin.h @@ -19,7 +19,7 @@ #include "wx/defs.h" #if wxUSE_SPINBTN -class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler) enum @@ -37,7 +37,7 @@ public: #endif #if wxUSE_SPINCTRL -class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler) enum diff --git a/contrib/include/wx/xrc/xh_split.h b/contrib/include/wx/xrc/xh_split.h index 51c38b8c69..cf58e43ceb 100644 --- a/contrib/include/wx/xrc/xh_split.h +++ b/contrib/include/wx/xrc/xh_split.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_stbmp.h b/contrib/include/wx/xrc/xh_stbmp.h index a9097141ef..db26c4033b 100644 --- a/contrib/include/wx/xrc/xh_stbmp.h +++ b/contrib/include/wx/xrc/xh_stbmp.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_stbox.h b/contrib/include/wx/xrc/xh_stbox.h index a5ed46c8b7..bca3ec8fd9 100644 --- a/contrib/include/wx/xrc/xh_stbox.h +++ b/contrib/include/wx/xrc/xh_stbox.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_stlin.h b/contrib/include/wx/xrc/xh_stlin.h index 7e0ec0d8f0..72767b35eb 100644 --- a/contrib/include/wx/xrc/xh_stlin.h +++ b/contrib/include/wx/xrc/xh_stlin.h @@ -19,7 +19,7 @@ #if wxUSE_STATLINE -class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_sttxt.h b/contrib/include/wx/xrc/xh_sttxt.h index fccad8ac70..7c576b1d99 100644 --- a/contrib/include/wx/xrc/xh_sttxt.h +++ b/contrib/include/wx/xrc/xh_sttxt.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_text.h b/contrib/include/wx/xrc/xh_text.h index e9bfbf5251..b9d3021f68 100644 --- a/contrib/include/wx/xrc/xh_text.h +++ b/contrib/include/wx/xrc/xh_text.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_toolb.h b/contrib/include/wx/xrc/xh_toolb.h index 6d71a41a29..c54b781061 100644 --- a/contrib/include/wx/xrc/xh_toolb.h +++ b/contrib/include/wx/xrc/xh_toolb.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxToolBar; -class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_tree.h b/contrib/include/wx/xrc/xh_tree.h index d75ff3dfa6..43a85f93a6 100644 --- a/contrib/include/wx/xrc/xh_tree.h +++ b/contrib/include/wx/xrc/xh_tree.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_unkwn.h b/contrib/include/wx/xrc/xh_unkwn.h index d1b2cf5e0a..354ea45bf0 100644 --- a/contrib/include/wx/xrc/xh_unkwn.h +++ b/contrib/include/wx/xrc/xh_unkwn.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler) public: diff --git a/contrib/include/wx/xrc/xh_wizrd.h b/contrib/include/wx/xrc/xh_wizrd.h index fbf81d0e2f..574e735b89 100644 --- a/contrib/include/wx/xrc/xh_wizrd.h +++ b/contrib/include/wx/xrc/xh_wizrd.h @@ -21,7 +21,7 @@ #include "wx/wizard.h" -class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler) public: diff --git a/contrib/include/wx/xrc/xml.h b/contrib/include/wx/xrc/xml.h index c3122942e4..c65d1364ff 100644 --- a/contrib/include/wx/xrc/xml.h +++ b/contrib/include/wx/xrc/xml.h @@ -20,16 +20,18 @@ #include "wx/object.h" #include "wx/list.h" -#ifdef WXXMLISDLL -#define WXXMLDLLEXPORT WXDLLEXPORT -#else -#define WXXMLDLLEXPORT +#ifdef WXMAKINGDLL_XRC + #define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_XRC WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_XRC #endif -class WXXMLDLLEXPORT wxXmlNode; -class WXXMLDLLEXPORT wxXmlProperty; -class WXXMLDLLEXPORT wxXmlDocument; -class WXXMLDLLEXPORT wxXmlIOHandler; +class WXDLLIMPEXP_XRC wxXmlNode; +class WXDLLIMPEXP_XRC wxXmlProperty; +class WXDLLIMPEXP_XRC wxXmlDocument; +class WXDLLIMPEXP_XRC wxXmlIOHandler; class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxOutputStream; @@ -58,7 +60,7 @@ enum wxXmlNodeType // Example: in "src" is property with value // "hello.gif" and "id" is prop. with value "3". -class WXXMLDLLEXPORT wxXmlProperty +class WXDLLIMPEXP_XRC wxXmlProperty { public: wxXmlProperty() : m_next(NULL) {} @@ -91,7 +93,7 @@ private: // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load // (default is UTF-8). -class WXXMLDLLEXPORT wxXmlNode +class WXDLLIMPEXP_XRC wxXmlNode { public: wxXmlNode() : m_properties(NULL), m_parent(NULL), @@ -161,7 +163,7 @@ private: // This class holds XML data/document as parsed by XML parser. -class WXXMLDLLEXPORT wxXmlDocument : public wxObject +class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject { public: wxXmlDocument(); diff --git a/contrib/include/wx/xrc/xmlres.h b/contrib/include/wx/xrc/xmlres.h index 952dc616e1..ae2179808e 100644 --- a/contrib/include/wx/xrc/xmlres.h +++ b/contrib/include/wx/xrc/xmlres.h @@ -36,9 +36,9 @@ class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxToolBar; -class WXXMLDLLEXPORT wxXmlResourceHandler; -class WXXMLDLLEXPORT wxXmlSubclassFactory; -class WXXMLDLLEXPORT wxXmlSubclassFactoriesList; +class WXDLLIMPEXP_XRC wxXmlResourceHandler; +class WXDLLIMPEXP_XRC wxXmlSubclassFactory; +class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList; class wxXmlResourceModule; @@ -46,14 +46,14 @@ class wxXmlResourceModule; // encoded in root node of XRC file as "version" property). // // Rules for increasing version number: -// - change it only if you made incompatible change to the format. Addition of new -// attribute to control handler is _not_ incompatible change, because older -// versions of the library may ignore it. +// - change it only if you made incompatible change to the format. Addition +// of new attribute to control handler is _not_ incompatible change, because +// older versions of the library may ignore it. // - if you change version number, follow these steps: // - set major, minor and release numbers to respective version numbers of // the wxWindows library (see wx/version.h) -// - reset revision to 0 unless the first three are same as before, in which -// case you should increase revision by one +// - reset revision to 0 unless the first three are same as before, +// in which case you should increase revision by one #define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MINOR 3 #define WX_XMLRES_CURRENT_VERSION_RELEASE 0 @@ -66,7 +66,7 @@ class wxXmlResourceModule; WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \ WX_XMLRES_CURRENT_VERSION_REVISION) -class WXXMLDLLEXPORT wxXmlResourceDataRecord +class WXDLLIMPEXP_XRC wxXmlResourceDataRecord { public: wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} @@ -78,11 +78,9 @@ public: }; -#ifdef WXXMLISDLL -WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); -#else -WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); -#endif +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, + wxXmlResourceDataRecords, + WXDLLIMPEXP_XRC); enum wxXmlResourceFlags { @@ -93,7 +91,7 @@ enum wxXmlResourceFlags // This class holds XML resources from one or more .xml files // (or derived forms, either binary or zipped -- see manual for // details). -class WXXMLDLLEXPORT wxXmlResource : public wxObject +class WXDLLIMPEXP_XRC wxXmlResource : public wxObject { public: // Constructor. @@ -125,10 +123,10 @@ public: void InitAllHandlers(); // Initialize only a specific handler (or custom handler). Convention says - // that handler name is equal to the control's name plus 'XmlHandler', for example - // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler - // (xmlres) can create include file that contains initialization code for - // all controls used within the resource. + // that handler name is equal to the control's name plus 'XmlHandler', for + // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource + // compiler (xmlres) can create include file that contains initialization + // code for all controls used within the resource. void AddHandler(wxXmlResourceHandler *handler); // Add a new handler at the begining of the handler list @@ -300,7 +298,7 @@ private: // wxXmlResourceHandler is an abstract base class for resource handlers // capable of creating a control from an XML node. -class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject +class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject { DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler) public: @@ -460,10 +458,11 @@ void wxXmlInitResourceModule(); // register your subclasses via wxWindows' RTTI mechanism. This class is useful // only for language bindings developer who need a way to implement subclassing // in wxWindows ports that don't support wxRTTI (e.g. wxPython). -class WXXMLDLLEXPORT wxXmlSubclassFactory +class WXDLLIMPEXP_XRC wxXmlSubclassFactory { public: - // Try to create instance of given class and return it, return NULL on failure: + // Try to create instance of given class and return it, return NULL on + // failure: virtual wxObject *Create(const wxString& className) = 0; virtual ~wxXmlSubclassFactory() {} }; diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h index eda67ffd50..5800b14e37 100644 --- a/include/wx/xrc/xh_bmp.h +++ b/include/wx/xrc/xh_bmp.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxBitmapXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler) public: @@ -27,7 +27,7 @@ public: virtual bool CanHandle(wxXmlNode *node); }; -class WXXMLDLLEXPORT wxIconXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxIconXmlHandler) public: diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h index 3be9eb5e0e..0ddc5ca786 100644 --- a/include/wx/xrc/xh_bmpbt.h +++ b/include/wx/xrc/xh_bmpbt.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxBitmapButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler) public: diff --git a/include/wx/xrc/xh_bttn.h b/include/wx/xrc/xh_bttn.h index 1245202b7e..b080091215 100644 --- a/include/wx/xrc/xh_bttn.h +++ b/include/wx/xrc/xh_bttn.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler) public: diff --git a/include/wx/xrc/xh_cald.h b/include/wx/xrc/xh_cald.h index e77aff06bb..b43cf484ad 100644 --- a/include/wx/xrc/xh_cald.h +++ b/include/wx/xrc/xh_cald.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxCalendarCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler) public: diff --git a/include/wx/xrc/xh_chckb.h b/include/wx/xrc/xh_chckb.h index e3a2bc3358..4d6b7198c8 100644 --- a/include/wx/xrc/xh_chckb.h +++ b/include/wx/xrc/xh_chckb.h @@ -20,7 +20,7 @@ #if wxUSE_CHECKBOX -class WXXMLDLLEXPORT wxCheckBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler) public: diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h index e9a6cc76c9..f662f31c69 100644 --- a/include/wx/xrc/xh_chckl.h +++ b/include/wx/xrc/xh_chckl.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxCheckListXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxCheckListXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxCheckListXmlHandler) public: diff --git a/include/wx/xrc/xh_choic.h b/include/wx/xrc/xh_choic.h index e30460546c..e36f19f118 100644 --- a/include/wx/xrc/xh_choic.h +++ b/include/wx/xrc/xh_choic.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxChoiceXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler) public: diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h index ddc1c29eb7..848a59c3ca 100644 --- a/include/wx/xrc/xh_combo.h +++ b/include/wx/xrc/xh_combo.h @@ -19,7 +19,7 @@ #if wxUSE_COMBOBOX -class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler) public: diff --git a/include/wx/xrc/xh_dlg.h b/include/wx/xrc/xh_dlg.h index 9ba7c76d7a..5a68a442ca 100644 --- a/include/wx/xrc/xh_dlg.h +++ b/include/wx/xrc/xh_dlg.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxDialogXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler) public: diff --git a/include/wx/xrc/xh_frame.h b/include/wx/xrc/xh_frame.h index e37681e0a7..c6e1795219 100644 --- a/include/wx/xrc/xh_frame.h +++ b/include/wx/xrc/xh_frame.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxFrameXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler) public: diff --git a/include/wx/xrc/xh_gauge.h b/include/wx/xrc/xh_gauge.h index 18e9354f99..b9c0f669c4 100644 --- a/include/wx/xrc/xh_gauge.h +++ b/include/wx/xrc/xh_gauge.h @@ -22,7 +22,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxGaugeXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler) enum diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h index 0893b0ad6d..ffdad072a4 100644 --- a/include/wx/xrc/xh_gdctl.h +++ b/include/wx/xrc/xh_gdctl.h @@ -19,7 +19,7 @@ #if wxUSE_DIRDLG -class WXXMLDLLEXPORT wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler) public: diff --git a/include/wx/xrc/xh_html.h b/include/wx/xrc/xh_html.h index 12db270888..ac49faa083 100644 --- a/include/wx/xrc/xh_html.h +++ b/include/wx/xrc/xh_html.h @@ -21,7 +21,7 @@ #if wxUSE_HTML -class WXXMLDLLEXPORT wxHtmlWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler) public: diff --git a/include/wx/xrc/xh_listb.h b/include/wx/xrc/xh_listb.h index 890266b2f3..86f65f4c63 100644 --- a/include/wx/xrc/xh_listb.h +++ b/include/wx/xrc/xh_listb.h @@ -19,7 +19,7 @@ #if wxUSE_LISTBOX -class WXXMLDLLEXPORT wxListBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler) public: diff --git a/include/wx/xrc/xh_listc.h b/include/wx/xrc/xh_listc.h index 8d32d77f01..151dc9c6c9 100644 --- a/include/wx/xrc/xh_listc.h +++ b/include/wx/xrc/xh_listc.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxListCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler) public: diff --git a/include/wx/xrc/xh_menu.h b/include/wx/xrc/xh_menu.h index 1e516bf460..52274fb81b 100644 --- a/include/wx/xrc/xh_menu.h +++ b/include/wx/xrc/xh_menu.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxMenuXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler) public: @@ -29,7 +29,7 @@ private: bool m_insideMenu; }; -class WXXMLDLLEXPORT wxMenuBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler) public: diff --git a/include/wx/xrc/xh_notbk.h b/include/wx/xrc/xh_notbk.h index 14e909568b..2c2bf35fd5 100644 --- a/include/wx/xrc/xh_notbk.h +++ b/include/wx/xrc/xh_notbk.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxNotebook; -class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler) public: diff --git a/include/wx/xrc/xh_panel.h b/include/wx/xrc/xh_panel.h index dfe8bd0653..ebfc6de0b6 100644 --- a/include/wx/xrc/xh_panel.h +++ b/include/wx/xrc/xh_panel.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxPanelXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler) public: diff --git a/include/wx/xrc/xh_radbt.h b/include/wx/xrc/xh_radbt.h index 8a6fd4b1a9..ffa4185a19 100644 --- a/include/wx/xrc/xh_radbt.h +++ b/include/wx/xrc/xh_radbt.h @@ -20,7 +20,7 @@ #if wxUSE_RADIOBOX -class WXXMLDLLEXPORT wxRadioButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler) public: diff --git a/include/wx/xrc/xh_radbx.h b/include/wx/xrc/xh_radbx.h index bd0e8152cb..72915ffe67 100644 --- a/include/wx/xrc/xh_radbx.h +++ b/include/wx/xrc/xh_radbx.h @@ -19,7 +19,7 @@ #if wxUSE_RADIOBOX -class WXXMLDLLEXPORT wxRadioBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler) public: diff --git a/include/wx/xrc/xh_scrol.h b/include/wx/xrc/xh_scrol.h index a13e56ad0b..ef1d3861d8 100644 --- a/include/wx/xrc/xh_scrol.h +++ b/include/wx/xrc/xh_scrol.h @@ -20,7 +20,7 @@ -class WXXMLDLLEXPORT wxScrollBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler) enum diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h index 7f9da82d6e..6aa9139d1f 100644 --- a/include/wx/xrc/xh_scwin.h +++ b/include/wx/xrc/xh_scwin.h @@ -20,7 +20,7 @@ -class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler) public: diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h index eb5e05c048..59fb16f268 100644 --- a/include/wx/xrc/xh_sizer.h +++ b/include/wx/xrc/xh_sizer.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxSizer; -class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler) public: diff --git a/include/wx/xrc/xh_slidr.h b/include/wx/xrc/xh_slidr.h index ce2e582e22..8e425b4294 100644 --- a/include/wx/xrc/xh_slidr.h +++ b/include/wx/xrc/xh_slidr.h @@ -20,7 +20,7 @@ #if wxUSE_SLIDER -class WXXMLDLLEXPORT wxSliderXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler) enum diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h index 7448302b7d..ab9590a68b 100644 --- a/include/wx/xrc/xh_spin.h +++ b/include/wx/xrc/xh_spin.h @@ -19,7 +19,7 @@ #include "wx/defs.h" #if wxUSE_SPINBTN -class WXXMLDLLEXPORT wxSpinButtonXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler) enum @@ -37,7 +37,7 @@ public: #endif #if wxUSE_SPINCTRL -class WXXMLDLLEXPORT wxSpinCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler) enum diff --git a/include/wx/xrc/xh_split.h b/include/wx/xrc/xh_split.h index 51c38b8c69..cf58e43ceb 100644 --- a/include/wx/xrc/xh_split.h +++ b/include/wx/xrc/xh_split.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler) public: diff --git a/include/wx/xrc/xh_stbmp.h b/include/wx/xrc/xh_stbmp.h index a9097141ef..db26c4033b 100644 --- a/include/wx/xrc/xh_stbmp.h +++ b/include/wx/xrc/xh_stbmp.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticBitmapXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler) public: diff --git a/include/wx/xrc/xh_stbox.h b/include/wx/xrc/xh_stbox.h index a5ed46c8b7..bca3ec8fd9 100644 --- a/include/wx/xrc/xh_stbox.h +++ b/include/wx/xrc/xh_stbox.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler) public: diff --git a/include/wx/xrc/xh_stlin.h b/include/wx/xrc/xh_stlin.h index 7e0ec0d8f0..72767b35eb 100644 --- a/include/wx/xrc/xh_stlin.h +++ b/include/wx/xrc/xh_stlin.h @@ -19,7 +19,7 @@ #if wxUSE_STATLINE -class WXXMLDLLEXPORT wxStaticLineXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler) public: diff --git a/include/wx/xrc/xh_sttxt.h b/include/wx/xrc/xh_sttxt.h index fccad8ac70..7c576b1d99 100644 --- a/include/wx/xrc/xh_sttxt.h +++ b/include/wx/xrc/xh_sttxt.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxStaticTextXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler) public: diff --git a/include/wx/xrc/xh_text.h b/include/wx/xrc/xh_text.h index e9bfbf5251..b9d3021f68 100644 --- a/include/wx/xrc/xh_text.h +++ b/include/wx/xrc/xh_text.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler) public: diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h index 6d71a41a29..c54b781061 100644 --- a/include/wx/xrc/xh_toolb.h +++ b/include/wx/xrc/xh_toolb.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxToolBar; -class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) public: diff --git a/include/wx/xrc/xh_tree.h b/include/wx/xrc/xh_tree.h index d75ff3dfa6..43a85f93a6 100644 --- a/include/wx/xrc/xh_tree.h +++ b/include/wx/xrc/xh_tree.h @@ -17,7 +17,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxTreeCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler) public: diff --git a/include/wx/xrc/xh_unkwn.h b/include/wx/xrc/xh_unkwn.h index d1b2cf5e0a..354ea45bf0 100644 --- a/include/wx/xrc/xh_unkwn.h +++ b/include/wx/xrc/xh_unkwn.h @@ -18,7 +18,7 @@ #include "wx/xrc/xmlres.h" -class WXXMLDLLEXPORT wxUnknownWidgetXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler) public: diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h index fbf81d0e2f..574e735b89 100644 --- a/include/wx/xrc/xh_wizrd.h +++ b/include/wx/xrc/xh_wizrd.h @@ -21,7 +21,7 @@ #include "wx/wizard.h" -class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler) public: diff --git a/include/wx/xrc/xml.h b/include/wx/xrc/xml.h index c3122942e4..c65d1364ff 100644 --- a/include/wx/xrc/xml.h +++ b/include/wx/xrc/xml.h @@ -20,16 +20,18 @@ #include "wx/object.h" #include "wx/list.h" -#ifdef WXXMLISDLL -#define WXXMLDLLEXPORT WXDLLEXPORT -#else -#define WXXMLDLLEXPORT +#ifdef WXMAKINGDLL_XRC + #define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_XRC WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_XRC #endif -class WXXMLDLLEXPORT wxXmlNode; -class WXXMLDLLEXPORT wxXmlProperty; -class WXXMLDLLEXPORT wxXmlDocument; -class WXXMLDLLEXPORT wxXmlIOHandler; +class WXDLLIMPEXP_XRC wxXmlNode; +class WXDLLIMPEXP_XRC wxXmlProperty; +class WXDLLIMPEXP_XRC wxXmlDocument; +class WXDLLIMPEXP_XRC wxXmlIOHandler; class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxOutputStream; @@ -58,7 +60,7 @@ enum wxXmlNodeType // Example: in "src" is property with value // "hello.gif" and "id" is prop. with value "3". -class WXXMLDLLEXPORT wxXmlProperty +class WXDLLIMPEXP_XRC wxXmlProperty { public: wxXmlProperty() : m_next(NULL) {} @@ -91,7 +93,7 @@ private: // If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load // (default is UTF-8). -class WXXMLDLLEXPORT wxXmlNode +class WXDLLIMPEXP_XRC wxXmlNode { public: wxXmlNode() : m_properties(NULL), m_parent(NULL), @@ -161,7 +163,7 @@ private: // This class holds XML data/document as parsed by XML parser. -class WXXMLDLLEXPORT wxXmlDocument : public wxObject +class WXDLLIMPEXP_XRC wxXmlDocument : public wxObject { public: wxXmlDocument(); diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 952dc616e1..ae2179808e 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -36,9 +36,9 @@ class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxToolBar; -class WXXMLDLLEXPORT wxXmlResourceHandler; -class WXXMLDLLEXPORT wxXmlSubclassFactory; -class WXXMLDLLEXPORT wxXmlSubclassFactoriesList; +class WXDLLIMPEXP_XRC wxXmlResourceHandler; +class WXDLLIMPEXP_XRC wxXmlSubclassFactory; +class WXDLLIMPEXP_XRC wxXmlSubclassFactoriesList; class wxXmlResourceModule; @@ -46,14 +46,14 @@ class wxXmlResourceModule; // encoded in root node of XRC file as "version" property). // // Rules for increasing version number: -// - change it only if you made incompatible change to the format. Addition of new -// attribute to control handler is _not_ incompatible change, because older -// versions of the library may ignore it. +// - change it only if you made incompatible change to the format. Addition +// of new attribute to control handler is _not_ incompatible change, because +// older versions of the library may ignore it. // - if you change version number, follow these steps: // - set major, minor and release numbers to respective version numbers of // the wxWindows library (see wx/version.h) -// - reset revision to 0 unless the first three are same as before, in which -// case you should increase revision by one +// - reset revision to 0 unless the first three are same as before, +// in which case you should increase revision by one #define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MINOR 3 #define WX_XMLRES_CURRENT_VERSION_RELEASE 0 @@ -66,7 +66,7 @@ class wxXmlResourceModule; WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \ WX_XMLRES_CURRENT_VERSION_REVISION) -class WXXMLDLLEXPORT wxXmlResourceDataRecord +class WXDLLIMPEXP_XRC wxXmlResourceDataRecord { public: wxXmlResourceDataRecord() : Doc(NULL), Time(wxDateTime::Now()) {} @@ -78,11 +78,9 @@ public: }; -#ifdef WXXMLISDLL -WX_DECLARE_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); -#else -WX_DECLARE_OBJARRAY(wxXmlResourceDataRecord, wxXmlResourceDataRecords); -#endif +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxXmlResourceDataRecord, + wxXmlResourceDataRecords, + WXDLLIMPEXP_XRC); enum wxXmlResourceFlags { @@ -93,7 +91,7 @@ enum wxXmlResourceFlags // This class holds XML resources from one or more .xml files // (or derived forms, either binary or zipped -- see manual for // details). -class WXXMLDLLEXPORT wxXmlResource : public wxObject +class WXDLLIMPEXP_XRC wxXmlResource : public wxObject { public: // Constructor. @@ -125,10 +123,10 @@ public: void InitAllHandlers(); // Initialize only a specific handler (or custom handler). Convention says - // that handler name is equal to the control's name plus 'XmlHandler', for example - // wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource compiler - // (xmlres) can create include file that contains initialization code for - // all controls used within the resource. + // that handler name is equal to the control's name plus 'XmlHandler', for + // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource + // compiler (xmlres) can create include file that contains initialization + // code for all controls used within the resource. void AddHandler(wxXmlResourceHandler *handler); // Add a new handler at the begining of the handler list @@ -300,7 +298,7 @@ private: // wxXmlResourceHandler is an abstract base class for resource handlers // capable of creating a control from an XML node. -class WXXMLDLLEXPORT wxXmlResourceHandler : public wxObject +class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject { DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler) public: @@ -460,10 +458,11 @@ void wxXmlInitResourceModule(); // register your subclasses via wxWindows' RTTI mechanism. This class is useful // only for language bindings developer who need a way to implement subclassing // in wxWindows ports that don't support wxRTTI (e.g. wxPython). -class WXXMLDLLEXPORT wxXmlSubclassFactory +class WXDLLIMPEXP_XRC wxXmlSubclassFactory { public: - // Try to create instance of given class and return it, return NULL on failure: + // Try to create instance of given class and return it, return NULL on + // failure: virtual wxObject *Create(const wxString& className) = 0; virtual ~wxXmlSubclassFactory() {} };