Use wx-prefixed macros throughout the repository.

Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE occurrences to use the wx-prefixed version of the macros.
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
--- a/include/wx/xrc/xh_animatctrl.h
+++ b/include/wx/xrc/xh_animatctrl.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxAnimationCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler);

 public:
    wxAnimationCtrlXmlHandler();
--- a/include/wx/xrc/xh_bmp.h
+++ b/include/wx/xrc/xh_bmp.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler);

 public:
    wxBitmapXmlHandler();
@@ -26,7 +26,7 @@ public:

 class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxIconXmlHandler);

 public:
    wxIconXmlHandler();
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler);

 public:
    wxBitmapButtonXmlHandler();
--- a/include/wx/xrc/xh_bmpcbox.h
+++ b/include/wx/xrc/xh_bmpcbox.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_ADV wxBitmapComboBox;

 class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler);

 public:
    wxBitmapComboBoxXmlHandler();
--- a/include/wx/xrc/xh_bttn.h
+++ b/include/wx/xrc/xh_bttn.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxButtonXmlHandler);

 public:
    wxButtonXmlHandler();
--- a/include/wx/xrc/xh_cald.h
+++ b/include/wx/xrc/xh_cald.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler);

 public:
    wxCalendarCtrlXmlHandler();
--- a/include/wx/xrc/xh_chckb.h
+++ b/include/wx/xrc/xh_chckb.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler);

 public:
    wxCheckBoxXmlHandler();
--- a/include/wx/xrc/xh_chckl.h
+++ b/include/wx/xrc/xh_chckl.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler);

 public:
    wxCheckListBoxXmlHandler();
--- a/include/wx/xrc/xh_choic.h
+++ b/include/wx/xrc/xh_choic.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler);

 public:
    wxChoiceXmlHandler();
--- a/include/wx/xrc/xh_choicbk.h
+++ b/include/wx/xrc/xh_choicbk.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoicebook;

 class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler);

 public:
    wxChoicebookXmlHandler();
--- a/include/wx/xrc/xh_clrpicker.h
+++ b/include/wx/xrc/xh_clrpicker.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler);

 public:
    wxColourPickerCtrlXmlHandler();
--- a/include/wx/xrc/xh_collpane.h
+++ b/include/wx/xrc/xh_collpane.h
@@ -27,7 +27,7 @@ private:
    bool m_isInside;
    wxCollapsiblePane *m_collpane;

-    DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_COLLPANE
--- a/include/wx/xrc/xh_combo.h
+++ b/include/wx/xrc/xh_combo.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler);

 public:
    wxComboBoxXmlHandler();
--- a/include/wx/xrc/xh_comboctrl.h
+++ b/include/wx/xrc/xh_comboctrl.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler);

 public:
    wxComboCtrlXmlHandler();
--- a/include/wx/xrc/xh_datectrl.h
+++ b/include/wx/xrc/xh_datectrl.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler);

 public:
    wxDateCtrlXmlHandler();
--- a/include/wx/xrc/xh_dirpicker.h
+++ b/include/wx/xrc/xh_dirpicker.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxDirPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler);

 public:
    wxDirPickerCtrlXmlHandler();
--- a/include/wx/xrc/xh_dlg.h
+++ b/include/wx/xrc/xh_dlg.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxDialogXmlHandler);

 public:
    wxDialogXmlHandler();
--- a/include/wx/xrc/xh_editlbox.h
+++ b/include/wx/xrc/xh_editlbox.h
@@ -30,7 +30,7 @@ private:
    bool m_insideBox;
    wxArrayString m_items;

-    DECLARE_DYNAMIC_CLASS(wxEditableListBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxEditableListBoxXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_EDITABLELISTBOX
--- a/include/wx/xrc/xh_filectrl.h
+++ b/include/wx/xrc/xh_filectrl.h
@@ -22,7 +22,7 @@ public:
    virtual bool CanHandle(wxXmlNode *node);

 private:
-    DECLARE_DYNAMIC_CLASS(wxFileCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxFileCtrlXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_FILECTRL
--- a/include/wx/xrc/xh_filepicker.h
+++ b/include/wx/xrc/xh_filepicker.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxFilePickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler);

 public:
    wxFilePickerCtrlXmlHandler();
--- a/include/wx/xrc/xh_fontpicker.h
+++ b/include/wx/xrc/xh_fontpicker.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler);

 public:
    wxFontPickerCtrlXmlHandler();
--- a/include/wx/xrc/xh_frame.h
+++ b/include/wx/xrc/xh_frame.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxFrameXmlHandler);

 public:
    wxFrameXmlHandler();
--- a/include/wx/xrc/xh_gauge.h
+++ b/include/wx/xrc/xh_gauge.h
@@ -21,7 +21,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_GAUGE
--- a/include/wx/xrc/xh_gdctl.h
+++ b/include/wx/xrc/xh_gdctl.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler);

 public:
    wxGenericDirCtrlXmlHandler();
--- a/include/wx/xrc/xh_grid.h
+++ b/include/wx/xrc/xh_grid.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxGridXmlHandler);

 public:
    wxGridXmlHandler();
--- a/include/wx/xrc/xh_html.h
+++ b/include/wx/xrc/xh_html.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler);

 public:
    wxHtmlWindowXmlHandler();
--- a/include/wx/xrc/xh_htmllbox.h
+++ b/include/wx/xrc/xh_htmllbox.h
@@ -25,7 +25,7 @@ private:
    bool m_insideBox;
    wxArrayString strList;

-    DECLARE_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_HTML
--- a/include/wx/xrc/xh_hyperlink.h
+++ b/include/wx/xrc/xh_hyperlink.h
@@ -18,7 +18,7 @@
 class WXDLLIMPEXP_XRC wxHyperlinkCtrlXmlHandler : public wxXmlResourceHandler
 {
    // Register with wxWindows' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler);

 public:
    // Constructor.
--- a/include/wx/xrc/xh_listb.h
+++ b/include/wx/xrc/xh_listb.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler);

 public:
    wxListBoxXmlHandler();
--- a/include/wx/xrc/xh_listbk.h
+++ b/include/wx/xrc/xh_listbk.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxListbook;

 class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxListbookXmlHandler);

 public:
    wxListbookXmlHandler();
--- a/include/wx/xrc/xh_listc.h
+++ b/include/wx/xrc/xh_listc.h
@@ -37,7 +37,7 @@ private:
    // which is wxIMAGE_LIST_NORMAL or small if it is wxIMAGE_LIST_SMALL)
    long GetImageIndex(wxListCtrl *listctrl, int which);

-    DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_LISTCTRL
--- a/include/wx/xrc/xh_mdi.h
+++ b/include/wx/xrc/xh_mdi.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;

 class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxMdiXmlHandler);

 public:
    wxMdiXmlHandler();
--- a/include/wx/xrc/xh_menu.h
+++ b/include/wx/xrc/xh_menu.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuXmlHandler);

 public:
    wxMenuXmlHandler();
@@ -29,7 +29,7 @@ private:

 class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler);

 public:
    wxMenuBarXmlHandler();
--- a/include/wx/xrc/xh_notbk.h
+++ b/include/wx/xrc/xh_notbk.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxNotebook;

 class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler);

 public:
    wxNotebookXmlHandler();
--- a/include/wx/xrc/xh_odcombo.h
+++ b/include/wx/xrc/xh_odcombo.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler);

 public:
    wxOwnerDrawnComboBoxXmlHandler();
--- a/include/wx/xrc/xh_panel.h
+++ b/include/wx/xrc/xh_panel.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxPanelXmlHandler);

 public:
    wxPanelXmlHandler();
--- a/include/wx/xrc/xh_propdlg.h
+++ b/include/wx/xrc/xh_propdlg.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_ADV wxPropertySheetDialog;

 class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler);

 public:
    wxPropertySheetDialogXmlHandler();
--- a/include/wx/xrc/xh_radbt.h
+++ b/include/wx/xrc/xh_radbt.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler);

 public:
    wxRadioButtonXmlHandler();
--- a/include/wx/xrc/xh_radbx.h
+++ b/include/wx/xrc/xh_radbx.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler);

 public:
    wxRadioBoxXmlHandler();
--- a/include/wx/xrc/xh_richtext.h
+++ b/include/wx/xrc/xh_richtext.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_RICHTEXT wxRichTextCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler);

 public:
    wxRichTextCtrlXmlHandler();
--- a/include/wx/xrc/xh_scrol.h
+++ b/include/wx/xrc/xh_scrol.h
@@ -21,7 +21,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_SCROLLBAR
--- a/include/wx/xrc/xh_scwin.h
+++ b/include/wx/xrc/xh_scwin.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler);

 public:
    wxScrolledWindowXmlHandler();
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -19,7 +19,7 @@

 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSizerXmlHandler);

 public:
    wxSizerXmlHandler();
@@ -65,7 +65,7 @@ private:
 class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
    : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler);

 public:
    wxStdDialogButtonSizerXmlHandler();
--- a/include/wx/xrc/xh_slidr.h
+++ b/include/wx/xrc/xh_slidr.h
@@ -21,7 +21,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSliderXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_SLIDER
--- a/include/wx/xrc/xh_spin.h
+++ b/include/wx/xrc/xh_spin.h
@@ -23,7 +23,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler);
 };

 #endif // wxUSE_SPINBTN
@@ -38,7 +38,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler);
 };

 #endif // wxUSE_SPINCTRL
--- a/include/wx/xrc/xh_split.h
+++ b/include/wx/xrc/xh_split.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler);

 public:
    wxSplitterWindowXmlHandler();
--- a/include/wx/xrc/xh_srchctrl.h
+++ b/include/wx/xrc/xh_srchctrl.h
@@ -22,7 +22,7 @@ public:
    virtual wxObject *DoCreateResource();
    virtual bool CanHandle(wxXmlNode *node);

-    DECLARE_DYNAMIC_CLASS(wxSearchCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxSearchCtrlXmlHandler);
 };

 #endif // wxUSE_XRC && wxUSE_SEARCHCTRL
--- a/include/wx/xrc/xh_statbar.h
+++ b/include/wx/xrc/xh_statbar.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxStatusBarXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStatusBarXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStatusBarXmlHandler);

 public:
    wxStatusBarXmlHandler();
--- a/include/wx/xrc/xh_stbmp.h
+++ b/include/wx/xrc/xh_stbmp.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler);

 public:
    wxStaticBitmapXmlHandler();
--- a/include/wx/xrc/xh_stbox.h
+++ b/include/wx/xrc/xh_stbox.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler);

 public:
    wxStaticBoxXmlHandler();
--- a/include/wx/xrc/xh_stlin.h
+++ b/include/wx/xrc/xh_stlin.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler);

 public:
    wxStaticLineXmlHandler();
--- a/include/wx/xrc/xh_sttxt.h
+++ b/include/wx/xrc/xh_sttxt.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler);

 public:
    wxStaticTextXmlHandler();
--- a/include/wx/xrc/xh_text.h
+++ b/include/wx/xrc/xh_text.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler);

 public:
    wxTextCtrlXmlHandler();
--- a/include/wx/xrc/xh_tglbtn.h
+++ b/include/wx/xrc/xh_tglbtn.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxToggleButtonXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler);

 public:
    wxToggleButtonXmlHandler();
--- a/include/wx/xrc/xh_toolb.h
+++ b/include/wx/xrc/xh_toolb.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;

 class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler);

 public:
    wxToolBarXmlHandler();
--- a/include/wx/xrc/xh_tree.h
+++ b/include/wx/xrc/xh_tree.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler);

 public:
    wxTreeCtrlXmlHandler();
--- a/include/wx/xrc/xh_treebk.h
+++ b/include/wx/xrc/xh_treebk.h
@@ -30,7 +30,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
 // it cannot be greater than the previous page depth plus one
 class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler);

 public:
    wxTreebookXmlHandler();
--- a/include/wx/xrc/xh_unkwn.h
+++ b/include/wx/xrc/xh_unkwn.h
@@ -16,7 +16,7 @@

 class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler);

 public:
    wxUnknownWidgetXmlHandler();
--- a/include/wx/xrc/xh_wizrd.h
+++ b/include/wx/xrc/xh_wizrd.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;

 class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxWizardXmlHandler);

 public:
    wxWizardXmlHandler();
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -416,12 +416,12 @@ private:
 // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
 // wxWidgets event tables.
 // Example:
-//    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+//    wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
 //       EVT_MENU(XRCID("about"), MyFrame::OnAbout)
 //       EVT_MENU(XRCID("new"), MyFrame::OnNew)
 //       EVT_MENU(XRCID("open"), MyFrame::OnOpen)
-//    END_EVENT_TABLE()
+//    wxEND_EVENT_TABLE()

 #define XRCID(str_id) \
    wxXmlResource::DoGetXRCID(str_id)