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/gtk/animate.h

@@ -66,7 +66,7 @@ private:
     void UnRef();
 
     typedef wxAnimationBase base_type;
-    DECLARE_DYNAMIC_CLASS(wxAnimation)
+    wxDECLARE_DYNAMIC_CLASS(wxAnimation);
 };
 
 
@@ -146,8 +146,8 @@ private:
 
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GTKANIMATEH__

include/wx/gtk/app.h

@@ -87,7 +87,7 @@ private:
     HildonProgram *m_hildonProgram;
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
 
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 };
 
 #endif // _WX_GTK_APP_H_

include/wx/gtk/bitmap.h

@@ -55,7 +55,7 @@ private:
     GdkPixmap* m_bitmap;
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 };
 
 //-----------------------------------------------------------------------------
@@ -177,7 +177,7 @@ public:
     void PurgeOtherRepresentations(Representation keep);
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 #endif // _WX_GTK_BITMAP_H_

include/wx/gtk/bmpbuttn.h

@@ -40,7 +40,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // _WX_GTK_BMPBUTTON_H_

include/wx/gtk/bmpcbox.h

@@ -140,7 +140,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox);
 };
 
 #endif // _WX_GTK_BMPCBOX_H_

include/wx/gtk/brush.h

@@ -47,7 +47,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_GTK_BRUSH_H_

include/wx/gtk/button.h

@@ -67,7 +67,7 @@ private:
     // Return the GtkLabel used by this button.
     GtkLabel *GTKGetLabel() const;
 
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 #endif // _WX_GTK_BUTTON_H_

include/wx/gtk/calctrl.h

@@ -62,7 +62,7 @@ private:
     // the control while a handler for day-selected is running.
     wxDateTime m_selectedDate;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl);
     wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl);
 };
 

include/wx/gtk/checkbox.h

@@ -61,7 +61,7 @@ private:
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
 
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
 
 #endif // _WX_GTKCHECKBOX_H_

include/wx/gtk/checklst.h

@@ -42,7 +42,7 @@ public:
     void DoCreateCheckList();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif   // _WX_GTKCHECKLIST_H_

include/wx/gtk/choice.h

@@ -111,7 +111,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 

include/wx/gtk/clipbrd.h

@@ -129,7 +129,7 @@ public:
 private:
     GtkWidget         *m_targetsWidgetAsync;  // for getting list of supported formats
 
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // _WX_GTK_CLIPBOARD_H_

include/wx/gtk/clrpicker.h

@@ -57,7 +57,7 @@ public:     // used by the GTK callback only
     wxWindow *m_topParent;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColourButton)
+    wxDECLARE_DYNAMIC_CLASS(wxColourButton);
 };
 
 #endif // _WX_GTK_CLRPICKER_H_

include/wx/gtk/collpane.h

@@ -72,8 +72,8 @@ private:
     virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE;
     GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxCollapsiblePane);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_COLLAPSABLE_PANEL_H_GTK_

include/wx/gtk/colordlg.h

@@ -42,7 +42,7 @@ protected:
 
     wxColourData m_data;
 
-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
 };
 
 #endif

include/wx/gtk/colour.h

@@ -53,7 +53,7 @@ protected:
 
     virtual bool FromString(const wxString& str) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // _WX_GTK_COLOUR_H_

include/wx/gtk/combobox.h

@@ -155,8 +155,8 @@ private:
 
     void Init();
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GTK_COMBOBOX_H_

include/wx/gtk/control.h

@@ -87,7 +87,7 @@ protected:
     wxPoint GTKGetEntryMargins(GtkEntry* entry) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
+    wxDECLARE_DYNAMIC_CLASS(wxControl);
 };
 
 #endif // _WX_GTK_CONTROL_H_

include/wx/gtk/cursor.h

@@ -52,7 +52,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif // _WX_GTK_CURSOR_H_

include/wx/gtk/dataview.h

@@ -222,7 +222,7 @@ private:
     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();
 
-    DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl);
     wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
 };
 

include/wx/gtk/dc.h

@@ -141,7 +141,7 @@ public:
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
     virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
 
-    DECLARE_ABSTRACT_CLASS(wxGTKDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxGTKDCImpl);
 };
 
 // this must be defined when wxDC::Blit() honours the DC origin and needed to

include/wx/gtk/dcclient.h

@@ -127,7 +127,7 @@ private:
     void DrawingSetup(GdkGC*& gc, bool& originChanged);
     GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const;
 
-    DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxWindowDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -142,7 +142,7 @@ public:
 
     virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
 
-    DECLARE_ABSTRACT_CLASS(wxClientDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxClientDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ public:
     wxPaintDCImpl( wxDC *owner );
     wxPaintDCImpl( wxDC *owner, wxWindow *win );
 
-    DECLARE_ABSTRACT_CLASS(wxPaintDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxPaintDCImpl);
 };
 
 #endif // _WX_GTKDCCLIENT_H_

include/wx/gtk/dcmemory.h

@@ -51,7 +51,7 @@ private:
 
     void Init();
 
-    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMemoryDCImpl);
 };
 
 #endif

include/wx/gtk/dcscreen.h

@@ -27,7 +27,7 @@ public:
 private:
     void Init();
 
-    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_GTKDCSCREEN_H_

include/wx/gtk/dialog.h

@@ -46,7 +46,7 @@ private:
     bool m_modalShowing;
     wxGUIEventLoop *m_modalLoop;
 
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
 };
 
 #endif // _WX_GTKDIALOG_H_

include/wx/gtk/dirdlg.h

@@ -57,7 +57,7 @@ protected:
 private:
     wxString m_selectedDirectory;
 
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 
 #endif // __GTKDIRDLGH__

include/wx/gtk/dvrenderer.h

@@ -104,7 +104,7 @@ protected:
     bool m_usingDefaultAttrs;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer);
 };
 
 #endif // _WX_GTK_DVRENDERER_H_

include/wx/gtk/dvrenderers.h

@@ -60,7 +60,7 @@ protected:
     bool GetTextValue(wxString& str) const;
 
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -80,7 +80,7 @@ public:
     bool GetValue( wxVariant &value ) const;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
 };
 
 // ---------------------------------------------------------
@@ -100,7 +100,7 @@ public:
     bool GetValue( wxVariant &value ) const;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
 };
 
 // ---------------------------------------------------------
@@ -164,7 +164,7 @@ private:
     // them forward to m_text_renderer if our RenderText() is called
     GTKRenderParams* m_renderParams;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer);
 };
 
 // ---------------------------------------------------------
@@ -201,7 +201,7 @@ private:
 #endif // !wxUSE_UNICODE
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
 };
 
 // ---------------------------------------------------------
@@ -234,7 +234,7 @@ private:
     // we use the base class m_renderer for the text and this one for the icon
     GtkCellRenderer *m_rendererIcon;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
 };
 
 // -------------------------------------

include/wx/gtk/filectrl.h

@@ -135,7 +135,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
+    wxDECLARE_DYNAMIC_CLASS(wxGtkFileCtrl);
 };
 
 #endif // wxUSE_FILECTRL

include/wx/gtk/filedlg.h

@@ -76,8 +76,8 @@ private:
 
     wxGtkFileChooser    m_fc;
 
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GTKFILEDLG_H_

include/wx/gtk/filehistory.h

@@ -18,7 +18,7 @@ public:
 
     virtual void AddFileToHistory(const wxString& file) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxFileHistory)
+    wxDECLARE_DYNAMIC_CLASS(wxFileHistory);
 };
 
 #endif // _WX_GTK_FILEHISTORY_H_

include/wx/gtk/filepicker.h

@@ -105,7 +105,7 @@ private:
     // common part of all ctors
     void Init() { m_dialog = NULL; }
 
-    DECLARE_DYNAMIC_CLASS(wxFileButton)
+    wxDECLARE_DYNAMIC_CLASS(wxFileButton);
 };
 
 
@@ -183,7 +183,7 @@ private:
         m_bIgnoreNextChange = false;
     }
 
-    DECLARE_DYNAMIC_CLASS(wxDirButton)
+    wxDECLARE_DYNAMIC_CLASS(wxDirButton);
 };
 
 #undef FILEDIRBTN_OVERRIDES

include/wx/gtk/font.h

@@ -120,7 +120,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_GTK_FONT_H_

include/wx/gtk/fontdlg.h

@@ -29,7 +29,7 @@ protected:
     // create the GTK dialog
     virtual bool DoCreate(wxWindow *parent) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFontDialog);
 };
 
 #endif

include/wx/gtk/fontpicker.h

@@ -71,7 +71,7 @@ private:
     // satisfy the wxFontPickerWidgetBase interface.
     wxColour m_selectedColour;
 
-    DECLARE_DYNAMIC_CLASS(wxFontButton)
+    wxDECLARE_DYNAMIC_CLASS(wxFontButton);
 };
 
 #endif // _WX_GTK_FONTPICKER_H_

include/wx/gtk/frame.h

@@ -74,7 +74,7 @@ private:
 
     long m_fsSaveFlag;
 
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif // _WX_GTK_FRAME_H_

include/wx/gtk/gauge.h

@@ -73,7 +73,7 @@ protected:
 private:
     void Init() { m_rangeMax = m_gaugePos = 0; }
 
-    DECLARE_DYNAMIC_CLASS(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
 };
 
 #endif

include/wx/gtk/glcanvas.h

@@ -104,7 +104,7 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 private:
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_

include/wx/gtk/hyperlink.h

@@ -66,7 +66,7 @@ protected:
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl);
 };
 
 #endif // _WX_GTKHYPERLINKCTRL_H_

include/wx/gtk/listbox.h

@@ -129,7 +129,7 @@ protected:
 private:
     void Init(); //common construction
 
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
 };
 
 #endif // _WX_GTK_LISTBOX_H_

include/wx/gtk/mdi.h

@@ -72,7 +72,7 @@ private:
     friend class wxMDIChildFrame;
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 //-----------------------------------------------------------------------------
@@ -127,8 +127,8 @@ private:
 
     GtkNotebook *GTKGetNotebook() const;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
 };
 
 //-----------------------------------------------------------------------------
@@ -147,7 +147,7 @@ public:
 private:
     virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
 
 #endif // _WX_GTK_MDI_H_

include/wx/gtk/menu.h

@@ -55,7 +55,7 @@ private:
 
     GtkWidget* m_menubar;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 //-----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ private:
     void GtkAppend(wxMenuItem* item, int pos = -1);
 
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 #endif

include/wx/gtk/menuitem.h

@@ -55,7 +55,7 @@ private:
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     GtkWidget *m_menuItem;  // GtkMenuItem
 
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif // _WX_GTKMENUITEM_H_

include/wx/gtk/minifram.h

@@ -18,7 +18,7 @@
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
     wxMiniFrame() {}

include/wx/gtk/msgdlg.h

@@ -45,7 +45,7 @@ private:
     // changing the message between constructing the dialog and showing it
     void GTKCreateMsgDialog();
 
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
 };
 
 #endif // _WX_GTK_MSGDLG_H_

include/wx/gtk/notebook.h

@@ -137,8 +137,8 @@ private:
     void Init();
     virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxNotebook)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxNotebook);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_GTKNOTEBOOK_H_

include/wx/gtk/pen.h

@@ -57,7 +57,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif // _WX_GTK_PEN_H_

include/wx/gtk/popupwin.h

@@ -42,9 +42,9 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
 
 #ifdef __WXUNIVERSAL__
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
 };
 
 #endif // _WX_GTK_POPUPWIN_H_

include/wx/gtk/print.h

@@ -107,7 +107,7 @@ private:
     bool                 m_showDialog;
     wxDC                *m_dc;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPrintDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPrintDialog);
 };
 
 //----------------------------------------------------------------------------
@@ -142,7 +142,7 @@ private:
     wxPageSetupDialogData    m_pageDialogData;
     wxWindow                *m_parent;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPageSetupDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPageSetupDialog);
 };
 
 //----------------------------------------------------------------------------
@@ -170,7 +170,7 @@ private:
     GtkPrintContext *m_gpc;
     wxDC            *m_dc;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPrinter);
     wxDECLARE_NO_COPY_CLASS(wxGtkPrinter);
 };
 
@@ -210,7 +210,7 @@ private:
     GtkPrintOperation   *m_job;
     GtkPrintContext     *m_context;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPrintNativeData)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPrintNativeData);
 };
 
 //-----------------------------------------------------------------------------
@@ -314,7 +314,7 @@ private:
     double                  m_PS2DEV;
     double                  m_DEV2PS;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl);
 };
 
@@ -346,7 +346,7 @@ private:
     // resolution to use in DPI
     int m_resolution;
 
-    DECLARE_CLASS(wxGtkPrintPreview)
+    wxDECLARE_CLASS(wxGtkPrintPreview);
 };
 
 #endif // wxUSE_GTKPRINT

include/wx/gtk/radiobox.h

@@ -147,7 +147,7 @@ protected:
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };
 
 #endif // _WX_GTK_RADIOBOX_H_

include/wx/gtk/radiobut.h

@@ -55,7 +55,7 @@ protected:
 private:
     typedef wxControl base_type;
 
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
 };
 
 #endif // _WX_GTK_RADIOBUT_H_

include/wx/gtk/region.h

@@ -87,7 +87,7 @@ protected:
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 // ----------------------------------------------------------------------------
@@ -130,7 +130,7 @@ private:
     int m_numRects;
     int m_current;
 
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 

include/wx/gtk/scrolbar.h

@@ -48,7 +48,7 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 #endif // _WX_GTK_SCROLLBAR_H_

include/wx/gtk/slider.h

@@ -78,7 +78,7 @@ protected:
     // set the slider value unconditionally
     void GTKSetValue(int value);
 
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 };
 
 #endif // _WX_GTK_SLIDER_H_

include/wx/gtk/spinbutt.h

@@ -59,7 +59,7 @@ protected:
 private:
     typedef wxSpinButtonBase base_type;
 
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 };
 
 #endif // _WX_GTK_SPINBUTT_H_

include/wx/gtk/spinctrl.h

@@ -81,7 +81,7 @@ protected:
 
     friend class wxSpinCtrlEventDisabler;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 //-----------------------------------------------------------------------------
@@ -143,7 +143,7 @@ private:
 
     int m_base;
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl);
 };
 
 //-----------------------------------------------------------------------------
@@ -199,7 +199,7 @@ public:
     virtual int GetBase() const wxOVERRIDE { return 10; }
     virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble);
 };
 
 #endif // _WX_GTK_SPINCTRL_H_

include/wx/gtk/statbmp.h

@@ -52,7 +52,7 @@ public:
 private:
     wxBitmap   m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 };
 
 #endif // __GTKSTATICBITMAPH__

include/wx/gtk/statbox.h

@@ -51,7 +51,7 @@ protected:
 
     void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 };
 
 #endif // _WX_GTKSTATICBOX_H_

include/wx/gtk/statline.h

@@ -39,7 +39,7 @@ public:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // wxUSE_STATLINE

include/wx/gtk/stattext.h

@@ -62,7 +62,7 @@ private:
     void GTKDoSetLabel(GTKLabelSetter setter, const wxString& label);
 
 
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticText);
 };
 
 #endif

include/wx/gtk/taskbar.h

@@ -26,8 +26,8 @@ public:
 private:
     Private* m_priv;
 
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
-    DECLARE_NO_COPY_CLASS(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxTaskBarIcon);
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIcon);
 };
 
 #endif // _WX_GTK_TASKBARICON_H_

include/wx/gtk/textctrl.h

@@ -221,8 +221,8 @@ private:
     // For wxTE_AUTO_URL
     void OnUrlMouseEvent(wxMouseEvent&);
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 #endif // _WX_GTK_TEXTCTRL_H_

include/wx/gtk/tglbtn.h

@@ -71,7 +71,7 @@ private:
     // Return the GtkLabel used by this toggle button.
     GtkLabel *GTKGetLabel() const;
 
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
 };
 
 //-----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ public:
 private:
     typedef wxToggleButtonBase base_type;
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
 };
 
 #endif // _WX_GTK_TOGGLEBUTTON_H_

include/wx/gtk/toolbar.h

@@ -95,7 +95,7 @@ private:
     GtkToolbar* m_toolbar;
     GtkTooltips* m_tooltips;
 
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
 };
 
 #endif

include/wx/gtk/tooltip.h

@@ -49,7 +49,7 @@ private:
     wxString     m_text;
     wxWindow    *m_window;
 
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
+    wxDECLARE_ABSTRACT_CLASS(wxToolTip);
 };
 
 #endif // _WX_GTKTOOLTIP_H_

include/wx/gtk/window.h

@@ -469,7 +469,7 @@ public:
     void GTKSizeRevalidate();
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowGTK);
     wxDECLARE_NO_COPY_CLASS(wxWindowGTK);
 };