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.

include/wx/generic/accel.h

@@ -42,7 +42,7 @@ protected:
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 };
 
 #endif // _WX_GENERIC_ACCEL_H_

include/wx/generic/animate.h

@@ -58,7 +58,7 @@ public:
     static void CleanUpHandlers();
     static void InitStandardHandlers();
 
-    DECLARE_DYNAMIC_CLASS(wxAnimation)
+    wxDECLARE_DYNAMIC_CLASS(wxAnimation);
 };
 
 
@@ -170,8 +170,8 @@ protected:
 
 private:
     typedef wxAnimationCtrlBase base_type;
-    DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GENERIC_ANIMATEH__

include/wx/generic/bmpcbox.h

@@ -128,9 +128,9 @@ private:
 
     void Init();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox);
 };
 
 #endif // _WX_GENERIC_BMPCBOX_H_

include/wx/generic/buttonbar.h

@@ -114,8 +114,8 @@ private:
     int m_labelMargin;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxButtonToolBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxButtonToolBar);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

include/wx/generic/calctrlg.h

@@ -308,8 +308,8 @@ private:
     // the year control
     bool m_userChangedYear;
 
-    DECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGenericCalendarCtrl);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGenericCalendarCtrl);
 };
 

include/wx/generic/choicdgg.h

@@ -228,8 +228,8 @@ protected:
     void DoChoice();
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -291,7 +291,7 @@ protected:
     wxArrayInt m_selections;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog);
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/clrpickerg.h

@@ -75,7 +75,7 @@ protected:
     static wxColourData ms_data;
 
 private:
-   DECLARE_DYNAMIC_CLASS(wxGenericColourButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericColourButton);
 };
 
 

include/wx/generic/collpaneg.h

@@ -103,8 +103,8 @@ private:
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
-    DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_

include/wx/generic/colour.h

@@ -65,7 +65,7 @@ private:
     unsigned char m_alpha;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // _WX_GENERIC_COLOUR_H_

include/wx/generic/colrdlgg.h

@@ -109,8 +109,8 @@ protected:
 
     //  static bool colourDialogCancelled;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericColourDialog);
 };
 
 #endif // _WX_COLORDLGG_H_

include/wx/generic/combo.h

@@ -120,9 +120,9 @@ protected:
 private:
     void Init();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_DYNAMIC_CLASS(wxGenericComboCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericComboCtrl);
 };
 
 
@@ -154,7 +154,7 @@ public:
 protected:
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxComboCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxComboCtrl);
 };
 
 #endif // _WX_COMBOCONTROL_H_

include/wx/generic/dataview.h

@@ -298,9 +298,9 @@ private:
     WX_FORWARD_TO_SCROLL_HELPER()
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl);
     wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 

include/wx/generic/datectrl.h

@@ -88,7 +88,7 @@ private:
     wxComboCtrl* m_combo;
     wxCalendarComboPopup* m_popup;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxDatePickerCtrlGeneric);
 };
 

include/wx/generic/dcpsg.h

@@ -35,7 +35,7 @@ public:
     wxPostScriptDC(const wxPrintData& printData);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
+    wxDECLARE_DYNAMIC_CLASS(wxPostScriptDC);
 };
 
 class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl
@@ -149,7 +149,7 @@ protected:
     double            m_pageHeight;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl);
 };
 
 #endif

include/wx/generic/dirctrlg.h

@@ -206,8 +206,8 @@ private:
     wxDirFilterListCtrl* m_filterListCtrl;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericDirCtrl);
     wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
 };
 
@@ -255,8 +255,8 @@ public:
 protected:
     wxGenericDirCtrl*    m_dirCtrl;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxDirFilterListCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxDirFilterListCtrl);
     wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);
 };
 

include/wx/generic/dirdlgg.h

@@ -81,8 +81,8 @@ protected:
     wxGenericDirCtrl* m_dirCtrl;
     wxTextCtrl*       m_input;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericDirDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericDirDialog);
 };
 
 #endif // _WX_DIRDLGG_H_

include/wx/generic/dragimgg.h

@@ -251,7 +251,7 @@ protected:
     bool            m_fullScreen;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericDragImage);
     wxDECLARE_NO_COPY_CLASS(wxGenericDragImage);
 };
 

include/wx/generic/dvrenderer.h

@@ -60,7 +60,7 @@ private:
 
     wxDC *m_dc;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer);
 };
 
 #endif // _WX_GENERIC_DVRENDERER_H_

include/wx/generic/dvrenderers.h

@@ -37,7 +37,7 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer);
 };
 
 
@@ -70,7 +70,7 @@ protected:
     wxString   m_text;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -97,7 +97,7 @@ private:
     wxBitmap m_bitmap;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
 };
 
 // ---------------------------------------------------------
@@ -129,7 +129,7 @@ private:
     bool    m_toggle;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
 };
 
 // ---------------------------------------------------------
@@ -157,7 +157,7 @@ private:
     int         m_value;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
 };
 
 // ---------------------------------------------------------
@@ -188,7 +188,7 @@ private:
     wxDataViewIconText   m_value;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
 };
 
 #endif // _WX_GENERIC_DVRENDERERS_H_

include/wx/generic/fdrepdlg.h

@@ -62,9 +62,9 @@ protected:
                *m_textRepl;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGenericFindReplaceDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFindReplaceDialog);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GENERIC_FDREPDLG_H_

include/wx/generic/filectrlg.h

@@ -177,8 +177,8 @@ protected:
     wxFileData::fileListFieldType m_sort_field;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFileListCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxFileListCtrl);
+    wxDECLARE_EVENT_TABLE();
 };
 
 class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,
@@ -294,8 +294,8 @@ private:
     bool    m_ignoreChanges;
     bool    m_noSelChgEvent; // suppress selection changed events.
 
-    DECLARE_DYNAMIC_CLASS( wxGenericFileCtrl )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFileCtrl);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_FILECTRL

include/wx/generic/filedlgg.h

@@ -121,8 +121,8 @@ private:
     wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId,
                                      const wxString& tip, wxSizer *sizer );
 
-    DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFileDialog);
+    wxDECLARE_EVENT_TABLE();
 
     // these variables are preserved between wxGenericFileDialog calls
     static long ms_lastViewStyle;     // list or report?
@@ -148,11 +148,11 @@ public:
                                defaultDir, defaultFile, wildCard,
                                style,
                                pos, size)
-     {
-     }
+    {
+    }
 
 private:
-     DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
 };
 
 #endif // wxHAS_GENERIC_FILEDIALOG

include/wx/generic/filepickerg.h

@@ -156,7 +156,7 @@ protected:
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFileButton);
 };
 
 
@@ -211,7 +211,7 @@ protected:
         { m_path = wxStaticCast(p, wxDirDialog)->GetPath(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGenericDirButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericDirButton);
 };
 
 // old wxEVT_COMMAND_* constants

include/wx/generic/fontdlgg.h

@@ -91,8 +91,8 @@ private:
     bool       m_useEvents;
 
     //  static bool fontDialogCancelled;
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFontDialog);
 };
 
 #endif // _WX_GENERIC_FONTDLGG_H

include/wx/generic/fontpickerg.h

@@ -74,7 +74,7 @@ protected:
     wxFontData m_data;
 
 private:
-   DECLARE_DYNAMIC_CLASS(wxGenericFontButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFontButton);
 };
 
 

include/wx/generic/grid.h

@@ -776,7 +776,7 @@ private:
     wxGrid * m_view;
     wxGridCellAttrProvider *m_attrProvider;
 
-    DECLARE_ABSTRACT_CLASS(wxGridTableBase)
+    wxDECLARE_ABSTRACT_CLASS(wxGridTableBase);
     wxDECLARE_NO_COPY_CLASS(wxGridTableBase);
 };
 
@@ -885,7 +885,7 @@ private:
     wxArrayString     m_rowLabels;
     wxArrayString     m_colLabels;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY( wxGridStringTable )
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGridStringTable);
 };
 
 
@@ -2348,8 +2348,8 @@ private:
     wxGridFixedIndicesSet *m_setFixedRows,
                           *m_setFixedCols;
 
-    DECLARE_DYNAMIC_CLASS( wxGrid )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGrid);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGrid);
 };
 
@@ -2458,7 +2458,7 @@ private:
         m_selecting = sel;
     }
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEvent);
 };
 
 class WXDLLIMPEXP_ADV wxGridSizeEvent : public wxNotifyEvent,
@@ -2514,7 +2514,7 @@ private:
         m_y = y;
     }
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridSizeEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridSizeEvent);
 };
 
 
@@ -2579,7 +2579,7 @@ protected:
     wxGridCellCoords  m_bottomRight;
     bool              m_selecting;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridRangeSelectEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridRangeSelectEvent);
 };
 
 
@@ -2611,7 +2611,7 @@ private:
     int m_col;
     wxControl* m_ctrl;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEditorCreatedEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGridEditorCreatedEvent);
 };
 
 

include/wx/generic/grideditors.h

@@ -41,8 +41,8 @@ private:
     // a combobox within a set focus event.
     bool                m_inSetFocus;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGridCellEditorEvtHandler);
     wxDECLARE_NO_COPY_CLASS(wxGridCellEditorEvtHandler);
 };
 

include/wx/generic/headerctrlg.h

@@ -173,7 +173,7 @@ private:
     wxArrayInt m_colIndices;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
 };
 

include/wx/generic/helpext.h

@@ -97,7 +97,7 @@ private:
     // Is the viewer a variant of netscape?
     bool             m_BrowserIsNetscape;
 
-    DECLARE_CLASS(wxExtHelpController)
+    wxDECLARE_CLASS(wxExtHelpController);
 };
 
 #endif // wxUSE_HELP

include/wx/generic/icon.h

@@ -56,7 +56,7 @@ public:
     void CopyFromBitmap(const wxBitmap& bmp);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxIcon);
 };
 
 #endif // _WX_GENERIC_ICON_H_

include/wx/generic/imaglist.h

@@ -52,7 +52,7 @@ private:
     int     m_width;
     int     m_height;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList);
 };
 
 #ifndef wxHAS_NATIVE_IMAGELIST
@@ -64,7 +64,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList
 {
-    DECLARE_DYNAMIC_CLASS(wxImageList)
+    wxDECLARE_DYNAMIC_CLASS(wxImageList);
 
 public:
     wxImageList() {}

include/wx/generic/infobar.h

@@ -131,7 +131,7 @@ private:
                  m_hideEffect;
     int m_effectDuration;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric);
 };
 

include/wx/generic/laywin.h

@@ -97,7 +97,7 @@ protected:
     wxLayoutAlignment       m_alignment;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryLayoutInfoEvent);
 };
 
 typedef void (wxEvtHandler::*wxQueryLayoutInfoEventFunction)(wxQueryLayoutInfoEvent&);
@@ -137,7 +137,7 @@ protected:
     wxRect                  m_rect;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalculateLayoutEvent);
 };
 
 typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEvent&);
@@ -195,8 +195,8 @@ private:
     wxSize                      m_defaultSize;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSashLayoutWindow);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_SASH

include/wx/generic/listctrl.h

@@ -242,8 +242,8 @@ private:
 
     WX_FORWARD_TO_SCROLL_HELPER()
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericListCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericListCtrl);
 };
 
 #if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!(defined(__WXMAC__) && wxOSX_USE_CARBON) || defined(__WXUNIVERSAL__ ))
@@ -254,7 +254,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxListCtrl: public wxGenericListCtrl
 {
-    DECLARE_DYNAMIC_CLASS(wxListCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
 
 public:
     wxListCtrl() {}

include/wx/generic/mask.h

@@ -46,7 +46,7 @@ private:
 
     wxBitmap m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 };
 
 #endif // _WX_GENERIC_MASKG_H_

include/wx/generic/mdig.h

@@ -124,8 +124,8 @@ private:
     // and we forwarded the event to this child (as we do with menu events)
     wxMDIChildFrameBase *m_childHandler;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericMDIParentFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericMDIParentFrame);
 };
 
 // ----------------------------------------------------------------------------
@@ -202,8 +202,8 @@ private:
     void OnMenuHighlight(wxMenuEvent& event);
     void OnClose(wxCloseEvent& event);
 
-    DECLARE_DYNAMIC_CLASS(wxGenericMDIChildFrame)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxGenericMDIChildFrame);
+    wxDECLARE_EVENT_TABLE();
 
     friend class wxGenericMDIClientWindow;
 };
@@ -243,7 +243,7 @@ private:
     // the notebook containing all MDI children as its pages
     wxNotebook *m_notebook;
 
-    DECLARE_DYNAMIC_CLASS(wxGenericMDIClientWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericMDIClientWindow);
 };
 
 // ----------------------------------------------------------------------------

include/wx/generic/msgdlgg.h

@@ -48,8 +48,8 @@ private:
     wxPoint m_pos;
     bool m_created;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericMessageDialog);
 };
 
 #endif // _WX_GENERIC_MSGDLGG_H_

include/wx/generic/notebook.h

@@ -148,8 +148,8 @@ protected:
 
   wxTabView*   m_tabView;
 
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS(wxNotebook);
+  wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_NOTEBOOK_H_

include/wx/generic/numdlgg.h

@@ -69,8 +69,8 @@ protected:
     long m_value, m_min, m_max;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxNumberEntryDialog);
     wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);
 };
 

include/wx/generic/paletteg.h

@@ -44,7 +44,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxPalette);
 };
 
 #endif // __WX_PALETTEG_H__

include/wx/generic/printps.h

@@ -31,7 +31,7 @@ public:
     virtual bool Setup(wxWindow *parent) wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxPostScriptPrinter);
 };
 
 // ----------------------------------------------------------------------------
@@ -58,7 +58,7 @@ private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
-    DECLARE_CLASS(wxPostScriptPrintPreview)
+    wxDECLARE_CLASS(wxPostScriptPrintPreview);
 };
 
 #endif

include/wx/generic/private/grid.h

@@ -285,7 +285,7 @@ private:
 
     wxVector<wxGridHeaderColumn> m_columns;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridHeaderCtrl);
 };
 
@@ -315,7 +315,7 @@ protected:
 
     wxGrid *m_owner;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridSubwindow);
 };
 
@@ -333,7 +333,7 @@ private:
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridRowLabelWindow);
 };
 
@@ -352,7 +352,7 @@ private:
     void OnMouseEvent( wxMouseEvent& event );
     void OnMouseWheel( wxMouseEvent& event );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridColLabelWindow);
 };
 
@@ -370,7 +370,7 @@ private:
     void OnMouseWheel( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow);
 };
 
@@ -399,7 +399,7 @@ private:
     void OnEraseBackground( wxEraseEvent& );
     void OnFocus( wxFocusEvent& );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGridWindow);
 };
 

include/wx/generic/private/listctrl.h

@@ -375,7 +375,7 @@ private:
     // it wasn't vetoed, i.e. if we should proceed
     bool SendListEvent(wxEventType type, const wxPoint& pos);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 //-----------------------------------------------------------------------------
@@ -458,7 +458,7 @@ private:
     size_t              m_itemEdited;
     bool                m_aboutToFinish;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 //-----------------------------------------------------------------------------
@@ -860,7 +860,7 @@ private:
     wxListTextCtrlWrapper *m_textctrlWrapper;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     friend class wxGenericListCtrl;
     friend class wxListCtrlMaxWidthCalculator;

include/wx/generic/prntdlgg.h

@@ -128,7 +128,7 @@ private:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData)
+    wxDECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData);
 };
 
 // ----------------------------------------------------------------------------
@@ -177,8 +177,8 @@ protected:
     void Init(wxWindow *parent);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericPrintDialog);
 };
 
 class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog
@@ -213,8 +213,8 @@ public:
     wxPrintData*        m_targetData;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGenericPrintSetupDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxGenericPrintSetupDialog);
 };
 #endif
     // wxUSE_POSTSCRIPT
@@ -246,8 +246,8 @@ public:
     wxPageSetupDialogData m_pageData;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog);
 };
 
 #endif

include/wx/generic/progdlgg.h

@@ -222,7 +222,7 @@ private:
     wxEventLoop *m_tempEventLoop;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGenericProgressDialog);
 };
 

include/wx/generic/propdlg.h

@@ -158,8 +158,8 @@ protected:
     int             m_sheetInnerBorder;
     int             m_selectedPage;
 
-    DECLARE_DYNAMIC_CLASS(wxPropertySheetDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxPropertySheetDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_BOOKCTRL

include/wx/generic/richmsgdlgg.h

@@ -40,7 +40,7 @@ protected:
 private:
     void OnPaneChanged(wxCollapsiblePaneEvent& event);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     wxDECLARE_NO_COPY_CLASS(wxGenericRichMessageDialog);
 };

include/wx/generic/sashwin.h

@@ -181,8 +181,8 @@ private:
     wxCursor*   m_currentCursor;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSashWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSashWindow);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSashWindow);
 };
 
@@ -232,7 +232,7 @@ private:
     wxSashDragStatus    m_dragStatus;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSashEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSashEvent);
 };
 
 typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);

include/wx/generic/spinctlg.h

@@ -167,7 +167,7 @@ private:
     // Implement pure virtual function inherited from wxCompositeWindow.
     virtual wxWindowList GetCompositeWindowParts() const;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #else // !wxUSE_SPINBTN
@@ -341,7 +341,7 @@ private:
 
     int m_base;
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl);
 };
 
 #endif // wxHAS_NATIVE_SPINCTRL
@@ -423,7 +423,7 @@ private:
 
     wxString m_format;
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble);
 };
 
 #endif // _WX_GENERIC_SPINCTRL_H_

include/wx/generic/splash.h

@@ -65,8 +65,8 @@ protected:
     int                     m_milliseconds;
     wxTimer                 m_timer;
 
-    DECLARE_DYNAMIC_CLASS(wxSplashScreen)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSplashScreen);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSplashScreen);
 };
 
@@ -88,7 +88,7 @@ public:
 protected:
     wxBitmap    m_bitmap;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSplashScreenWindow);
 };
 

include/wx/generic/splitter.h

@@ -301,8 +301,8 @@ protected:
     bool        m_isHot:1;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSplitterWindow);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);
 };
 
@@ -386,7 +386,7 @@ private:
         } pt;               // position of double click for DCLICK event
     } m_data;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSplitterEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSplitterEvent);
 };
 
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);

include/wx/generic/srchctlg.h

@@ -268,9 +268,9 @@ private:
 #endif // wxUSE_MENUS
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxSearchCtrl);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_SEARCHCTRL

include/wx/generic/statbmpg.h

@@ -68,7 +68,7 @@ private:
 
     wxBitmap m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap);
 };
 
 

include/wx/generic/statline.h

@@ -18,7 +18,7 @@ class wxStaticBox;
 
 class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 
 public:
     // constructors and pseudo-constructors

include/wx/generic/stattextg.h

@@ -83,7 +83,7 @@ private:
     class wxMarkupText *m_markupText;
 #endif // wxUSE_MARKUP
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText);
 };
 
 #endif // _WX_GENERIC_STATTEXTG_H_

include/wx/generic/statusbr.h

@@ -109,8 +109,8 @@ private:
     // Update m_lastClientSize and m_widthsAbs from the current size.
     void DoUpdateFieldWidths();
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric);
 };
 
 #endif // wxUSE_STATUSBAR

include/wx/generic/tabg.h

@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxTabView;
 
 class WXDLLIMPEXP_CORE wxTabControl: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxTabControl)
+    wxDECLARE_DYNAMIC_CLASS(wxTabControl);
 public:
     wxTabControl(wxTabView *v = NULL);
     virtual ~wxTabControl(void);
@@ -95,7 +95,7 @@ WX_DECLARE_LIST(wxTabLayer, wxTabLayerList);
 
 class WXDLLIMPEXP_CORE wxTabView: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxTabView)
+    wxDECLARE_DYNAMIC_CLASS(wxTabView);
 public:
   wxTabView(long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
   virtual ~wxTabView();
@@ -267,7 +267,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxTabbedDialog : public wxDialog
 {
-    DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxTabbedDialog);
 
 public:
     wxTabbedDialog(wxWindow *parent,
@@ -290,7 +290,7 @@ protected:
     wxTabView*   m_tabView;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*
@@ -299,7 +299,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxTabbedPanel : public wxPanel
 {
-    DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
+    wxDECLARE_DYNAMIC_CLASS(wxTabbedPanel);
 
 public:
     wxTabbedPanel(wxWindow *parent,
@@ -320,7 +320,7 @@ protected:
     wxTabView*   m_tabView;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
@@ -328,7 +328,7 @@ WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
 
 class WXDLLIMPEXP_CORE wxPanelTabView : public wxTabView
 {
-    DECLARE_DYNAMIC_CLASS(wxPanelTabView)
+    wxDECLARE_DYNAMIC_CLASS(wxPanelTabView);
 
 public:
     wxPanelTabView(wxPanel *pan, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);

include/wx/generic/textdlgg.h

@@ -84,8 +84,8 @@ protected:
     long        m_dialogStyle;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextEntryDialog);
     wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog);
 };
 
@@ -116,7 +116,7 @@ public:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog);
     wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog);
 };
 

include/wx/generic/treectlg.h

@@ -355,8 +355,8 @@ private:
     // operation.
     void ResetFindState();
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl);
     wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
 };
 
@@ -368,7 +368,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 
 public:
     wxTreeCtrl() {}

include/wx/generic/wizard.h

@@ -161,8 +161,8 @@ protected:
 
     friend class wxWizardSizer;
 
-    DECLARE_DYNAMIC_CLASS(wxWizard)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxWizard);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxWizard);
 };