diff --git a/build/bakefiles/wxpresets/sample/minimal.cpp b/build/bakefiles/wxpresets/sample/minimal.cpp
index 7be6e05727..eaac7b66a0 100644
--- a/build/bakefiles/wxpresets/sample/minimal.cpp
+++ b/build/bakefiles/wxpresets/sample/minimal.cpp
@@ -64,7 +64,7 @@ public:
 
 private:
     // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -90,17 +90,17 @@ enum
 // the event tables connect the wxWindows events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index e2c3b3c46a..9e369fd6c7 100644
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -32,7 +32,7 @@
 #   include "bombs.xpm"
 #endif
 
-IMPLEMENT_APP(BombsApp)
+wxIMPLEMENT_APP(BombsApp);
 
 #ifdef __WXWINCE__
     STDAPI_(__int64) CeGetRandomSeed();
@@ -54,7 +54,7 @@ bool BombsApp::OnInit()
     return true;
 }
 
-BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(BombsFrame, wxFrame)
     EVT_MENU(wxID_NEW,           BombsFrame::OnNewGame)
     EVT_MENU(bombsID_EASY,       BombsFrame::OnEasyGame)
     EVT_MENU(bombsID_MEDIUM,     BombsFrame::OnMediumGame)
@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
     EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner)
     EVT_MENU(wxID_EXIT,          BombsFrame::OnExit)
     EVT_MENU(wxID_ABOUT,         BombsFrame::OnAbout)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 BombsFrame::BombsFrame(BombsGame *game)
     : wxFrame(NULL, wxID_ANY, wxT("wxBombs"), wxDefaultPosition,
@@ -216,11 +216,11 @@ void BombsFrame::OnEasyCorner(wxCommandEvent& WXUNUSED(event))
     NewGame(m_lastLevel, true);
 }
 
-BEGIN_EVENT_TABLE(BombsCanvas, wxPanel)
+wxBEGIN_EVENT_TABLE(BombsCanvas, wxPanel)
     EVT_PAINT(BombsCanvas::OnPaint)
     EVT_MOUSE_EVENTS(BombsCanvas::OnMouseEvent)
     EVT_CHAR(BombsCanvas::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
     : wxPanel(parent, wxID_ANY)
diff --git a/demos/bombs/bombs.h b/demos/bombs/bombs.h
index c0ff2d2a72..10b4a0e219 100644
--- a/demos/bombs/bombs.h
+++ b/demos/bombs/bombs.h
@@ -30,7 +30,7 @@ private :
 
 };
 
-DECLARE_APP(BombsApp)
+wxDECLARE_APP(BombsApp);
 
 class BombsCanvas;
 
@@ -62,7 +62,7 @@ private:
     // Subwindows for reference within the program.
     BombsCanvas *m_canvas;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // App specific menu identifiers
@@ -106,7 +106,7 @@ private:
     int m_cellWidth;
     int m_cellHeight;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /* The following sizes should probably be redefined */
diff --git a/demos/forty/canvas.cpp b/demos/forty/canvas.cpp
index 95de6ba6bf..066e94c529 100644
--- a/demos/forty/canvas.cpp
+++ b/demos/forty/canvas.cpp
@@ -28,9 +28,9 @@
 #include "playerdg.h"
 #include "canvas.h"
 
-BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
+wxBEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(FortyCanvas::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
              wxScrolledWindow(parent, wxID_ANY, pos, size, 0),
diff --git a/demos/forty/canvas.h b/demos/forty/canvas.h
index 05ff8ad710..42a85dcb9a 100644
--- a/demos/forty/canvas.h
+++ b/demos/forty/canvas.h
@@ -39,7 +39,7 @@ public:
     void LayoutGame();
     void ShowPlayerDialog();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
 private:
     wxFont* m_font;
diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index fb91563bd5..9f3a41e789 100644
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -34,7 +34,7 @@
 
 #include "wx/stockitem.h"
 
-BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(FortyFrame, wxFrame)
     EVT_MENU(wxID_NEW, FortyFrame::NewGame)
     EVT_MENU(wxID_EXIT, FortyFrame::Exit)
     EVT_MENU(wxID_ABOUT, FortyFrame::About)
@@ -46,10 +46,10 @@ BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
     EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand)
     EVT_MENU(LARGE_CARDS, FortyFrame::ToggleCardSize)
     EVT_CLOSE(FortyFrame::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Create a new application object
-IMPLEMENT_APP (FortyApp)
+wxIMPLEMENT_APP(FortyApp);
 
 wxColour* FortyApp::m_backgroundColour = 0;
 wxColour* FortyApp::m_textColour = 0;
diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index ee9c132358..9d5665c128 100644
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -31,7 +31,7 @@ private:
     wxString m_helpFile;
 };
 
-DECLARE_APP(FortyApp)
+wxDECLARE_APP(FortyApp);
 
 class FortyCanvas;
 class FortyFrame: public wxFrame
@@ -56,7 +56,7 @@ public:
 
     FortyCanvas* GetCanvas() { return m_canvas; }
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
 private:
     enum MenuCommands {
diff --git a/demos/forty/playerdg.cpp b/demos/forty/playerdg.cpp
index 330e84eef4..7dba5e279c 100644
--- a/demos/forty/playerdg.cpp
+++ b/demos/forty/playerdg.cpp
@@ -24,13 +24,13 @@
 
 const int ID_LISTBOX = 101;
 
-BEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
     EVT_SIZE(PlayerSelectionDialog::OnSize)
     EVT_BUTTON(wxID_OK, PlayerSelectionDialog::ButtonCallback)
     EVT_BUTTON(wxID_CANCEL, PlayerSelectionDialog::ButtonCallback)
     EVT_LISTBOX(ID_LISTBOX, PlayerSelectionDialog::SelectCallback)
     EVT_CLOSE(PlayerSelectionDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 PlayerSelectionDialog::PlayerSelectionDialog(
                             wxWindow* parent,
diff --git a/demos/forty/playerdg.h b/demos/forty/playerdg.h
index 57c1616134..59836ae141 100644
--- a/demos/forty/playerdg.h
+++ b/demos/forty/playerdg.h
@@ -23,7 +23,7 @@ public:
     void SelectCallback(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
 protected:
     friend void SelectCallback(wxListBox&, wxCommandEvent&);
diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp
index 4653343b25..32ed7a766d 100644
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -125,9 +125,9 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 }
 #endif
 
-BEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
     EVT_CLOSE(ScoreDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
     wxDialog(parent, wxID_ANY, _("Scores"),
diff --git a/demos/forty/scoredg.h b/demos/forty/scoredg.h
index 2e7ebc8365..b5f5011712 100644
--- a/demos/forty/scoredg.h
+++ b/demos/forty/scoredg.h
@@ -27,7 +27,7 @@ private:
     ScoreFile* m_scoreFile;
     wxButton* m_OK;
 
-DECLARE_EVENT_TABLE()
+	wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/demos/fractal/fractal.cpp b/demos/fractal/fractal.cpp
index 58d8dab77b..28c232c93b 100644
--- a/demos/fractal/fractal.cpp
+++ b/demos/fractal/fractal.cpp
@@ -57,7 +57,7 @@ public:
     bool OnInit();
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // Define a new frame type
 class MyFrame: public wxFrame
@@ -68,7 +68,7 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
     void OnExit(wxCommandEvent& event);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // Define a new canvas which can receive some events
@@ -85,7 +85,7 @@ private:
     wxBrush WaterBrush;
     int Sealevel;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // `Main program' equivalent, creating windows and returning main app frame
@@ -112,10 +112,10 @@ bool MyApp::OnInit()
   return true;
 }
 
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_CLOSE(MyFrame::OnCloseWindow)
   EVT_MENU(wxID_EXIT, MyFrame::OnExit)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
@@ -140,9 +140,9 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     destroyed = true;
 }
 
-BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
+wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow)
   EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxFrame *frame):
diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index daa8e72c6b..c7ebc51458 100644
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -57,9 +57,9 @@ enum
 // --------------------------------------------------------------------------
 
 // Event tables
-BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
     EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 // ==========================================================================
diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index 6cc7a58720..eb46ebf7d1 100644
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -34,7 +34,7 @@ public:
 
 private:
     // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     int         m_value;
     wxListBox  *m_list;
diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index df47436d1a..c9b0353752 100644
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -922,7 +922,7 @@ bool Life::NextTic()
 
 class LifeModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(LifeModule)
+    wxDECLARE_DYNAMIC_CLASS(LifeModule);
 
 public:
     LifeModule() {};
@@ -930,7 +930,7 @@ public:
     void OnExit();
 };
 
-IMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule);
 
 bool LifeModule::OnInit()
 {
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 8453c12ede..b5f91e92b3 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -97,7 +97,7 @@ enum
 // --------------------------------------------------------------------------
 
 // Event tables
-BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(LifeFrame, wxFrame)
     EVT_MENU            (wxID_NEW,     LifeFrame::OnMenu)
 #if wxUSE_FILEDLG
     EVT_MENU            (wxID_OPEN,    LifeFrame::OnOpen)
@@ -122,13 +122,13 @@ BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
     EVT_COMMAND_SCROLL  (ID_SLIDER,    LifeFrame::OnSlider)
     EVT_TIMER           (ID_TIMER,     LifeFrame::OnTimer)
     EVT_CLOSE           (              LifeFrame::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(LifeNavigator, wxMiniFrame)
+wxBEGIN_EVENT_TABLE(LifeNavigator, wxMiniFrame)
     EVT_CLOSE           (             LifeNavigator::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
+wxBEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
     EVT_PAINT           (             LifeCanvas::OnPaint)
     EVT_SCROLLWIN       (             LifeCanvas::OnScroll)
     EVT_SIZE            (             LifeCanvas::OnSize)
@@ -137,11 +137,11 @@ BEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
     EVT_LEFT_UP         (             LifeCanvas::OnMouse)
     EVT_LEFT_DCLICK     (             LifeCanvas::OnMouse)
     EVT_ERASE_BACKGROUND(             LifeCanvas::OnEraseBackground)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 // Create a new application object
-IMPLEMENT_APP(LifeApp)
+wxIMPLEMENT_APP(LifeApp);
 
 
 // ==========================================================================
diff --git a/demos/life/life.h b/demos/life/life.h
index fd9b1bb0b5..9c51873414 100644
--- a/demos/life/life.h
+++ b/demos/life/life.h
@@ -41,7 +41,7 @@ public:
 
 private:
     // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     // draw a cell (parametrized by DC)
     void DrawCell(wxInt32 i, wxInt32 j, wxDC &dc);
@@ -93,7 +93,7 @@ public:
 
 private:
     // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     // event handlers
     void OnClose(wxCloseEvent& event);
@@ -117,7 +117,7 @@ public:
 
 private:
     // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     // event handlers
     void OnMenu(wxCommandEvent& event);
diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 7b96c70411..9c6d4bc3db 100644
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -96,7 +96,7 @@ void            FindMax(int *max_thing, int thing);
     STDAPI_(__int64) CeGetRandomSeed();
 #endif
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 MainWindow *TheMainWindow = NULL;
 
@@ -108,11 +108,11 @@ void MainWindow::CreateFonts()
     m_italicFont = wxTheFontList->FindOrCreateFont(pointSize, wxSWISS, wxITALIC, wxNORMAL);
 }
 
-BEGIN_EVENT_TABLE(MainWindow, wxFrame)
+wxBEGIN_EVENT_TABLE(MainWindow, wxFrame)
     EVT_CLOSE(MainWindow::OnCloseWindow)
     EVT_CHAR(MainWindow::OnChar)
     EVT_MENU(wxID_ANY, MainWindow::OnPopup)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
      const wxPoint& pos, const wxSize& size, long style):
@@ -581,11 +581,11 @@ void MainWindow::OnChar(wxKeyEvent& event)
     canvas->OnChar(event);
 }
 
-BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
+wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow)
     EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
     EVT_CHAR(MyCanvas::OnChar)
     EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxFrame *frame):
diff --git a/demos/poem/wxpoem.h b/demos/poem/wxpoem.h
index f0ab60c6f1..7837f63c8f 100644
--- a/demos/poem/wxpoem.h
+++ b/demos/poem/wxpoem.h
@@ -25,7 +25,7 @@ public:
     int OnExit();
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 // Define a new canvas which can receive some events
 class MyCanvas: public wxWindow
@@ -41,7 +41,7 @@ public:
 private:
     wxMenu *m_popupMenu;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // Define a new frame
@@ -94,7 +94,7 @@ private:
     // Icons
     wxIcon *m_corners[4];
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // Menu items
diff --git a/distrib/autopackage/sample/minimal.cpp b/distrib/autopackage/sample/minimal.cpp
index 7be6e05727..eaac7b66a0 100644
--- a/distrib/autopackage/sample/minimal.cpp
+++ b/distrib/autopackage/sample/minimal.cpp
@@ -64,7 +64,7 @@ public:
 
 private:
     // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -90,17 +90,17 @@ enum
 // the event tables connect the wxWindows events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/docs/doxygen/overviews/app.h b/docs/doxygen/overviews/app.h
index 9a269f4e25..6d8da730d1 100644
--- a/docs/doxygen/overviews/app.h
+++ b/docs/doxygen/overviews/app.h
@@ -41,7 +41,7 @@ public:
     virtual bool OnInit();
 };
 
-IMPLEMENT_APP(DerivedApp)
+wxIMPLEMENT_APP(DerivedApp);
 
 bool DerivedApp::OnInit()
 {
@@ -53,14 +53,14 @@ bool DerivedApp::OnInit()
 }
 @endcode
 
-Note the use of IMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
+Note the use of wxIMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
 create an instance of the application object at the appropriate point in
 wxWidgets initialization. Previous versions of wxWidgets used to rely on the
 creation of a global application object, but this is no longer recommended,
 because required global initialization may not have been performed at
 application object construction time.
 
-You can also use DECLARE_APP(appClass) in a header file to declare the wxGetApp
+You can also use wxDECLARE_APP(appClass) in a header file to declare the wxGetApp
 function which returns a reference to the application object. Otherwise you can
 only use the global @c wxTheApp pointer which is of type @c wxApp*.
 
diff --git a/docs/doxygen/overviews/customwidgets.h b/docs/doxygen/overviews/customwidgets.h
index 087d4e6334..be4f250d82 100644
--- a/docs/doxygen/overviews/customwidgets.h
+++ b/docs/doxygen/overviews/customwidgets.h
@@ -108,8 +108,8 @@ protected:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(MySpecialWidget)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(MySpecialWidget);
+    wxDECLARE_EVENT_TABLE();
 };
 @endcode
 
diff --git a/docs/doxygen/overviews/debugging.h b/docs/doxygen/overviews/debugging.h
index 32a0013b83..7abb682830 100644
--- a/docs/doxygen/overviews/debugging.h
+++ b/docs/doxygen/overviews/debugging.h
@@ -38,9 +38,9 @@ be running on are unusually constrained (notice that when asserts are disabled
 their condition is not even evaluated so the only run-time cost is a single
 condition check and the extra space taken by the asserts in the code).
 
-This automatic deactivation of debugging code is done by IMPLEMENT_APP() macro
-so if you don't use you may need to explicitly call wxDISABLE_DEBUG_SUPPORT()
-yourself.
+This automatic deactivation of debugging code is done by wxIMPLEMENT_APP()
+macro so if you don't use you may need to explicitly call
+wxDISABLE_DEBUG_SUPPORT() yourself.
 
 Also notice that it is possible to build your own application with a different
 value of wxDEBUG_LEVEL than the one which was used for wxWidgets itself. E.g.
diff --git a/docs/doxygen/overviews/docview.h b/docs/doxygen/overviews/docview.h
index cfd3e9fd1d..f213de1095 100644
--- a/docs/doxygen/overviews/docview.h
+++ b/docs/doxygen/overviews/docview.h
@@ -114,9 +114,9 @@ wxDocument class, you need to derive a new class and override at least the
 member functions SaveObject and LoadObject. SaveObject and LoadObject will be
 called by the framework when the document needs to be saved or loaded.
 
-Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
-allow the framework to create document objects on demand. When you create a
-wxDocTemplate object on application initialization, you should pass
+Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order
+to allow the framework to create document objects on demand. When you create
+a wxDocTemplate object on application initialization, you should pass
 CLASSINFO(YourDocumentClass) to the wxDocTemplate constructor so that it knows
 how to create an instance of this class.
 
@@ -139,8 +139,8 @@ To use the abstract wxView class, you need to derive a new class and override
 at least the member functions OnCreate, OnDraw, OnUpdate and OnClose. You will
 probably want to respond to menu commands from the frame containing the view.
 
-Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
-allow the framework to create view objects on demand. When you create a
+Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order
+to allow the framework to create view objects on demand. When you create a
 wxDocTemplate object on application initialization, you should pass
 CLASSINFO(YourViewClass) to the wxDocTemplate constructor so that it knows how
 to create an instance of this class.
@@ -295,10 +295,10 @@ In order to respond to a file load command from one of these identifiers, you
 need to handle them using an event handler, for example:
 
 @code
-BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
     EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {
diff --git a/docs/doxygen/overviews/roughguide.h b/docs/doxygen/overviews/roughguide.h
index a9d5067d80..c1904d0800 100644
--- a/docs/doxygen/overviews/roughguide.h
+++ b/docs/doxygen/overviews/roughguide.h
@@ -40,8 +40,8 @@ same code to draw to several different devices. You can draw using the member
 functions of wxDC, such as wxDC::DrawLine and wxDC::DrawText. Control colour on
 a window (wxColour) with brushes (wxBrush) and pens (wxPen).
 
-To intercept events, you add a DECLARE_EVENT_TABLE macro to the window class
-declaration, and put a BEGIN_EVENT_TABLE ... END_EVENT_TABLE block in the
+To intercept events, you add a wxDECLARE_EVENT_TABLE macro to the window class
+declaration, and put a wxBEGIN_EVENT_TABLE ... wxEND_EVENT_TABLE block in the
 implementation file. Between these macros, you add event macros which map the
 event (such as a mouse click) to a member function. These might override
 predefined event handlers such as for wxKeyEvent and wxMouseEvent.
diff --git a/docs/doxygen/overviews/runtimeclass.h b/docs/doxygen/overviews/runtimeclass.h
index 9050ac9b6e..f8450a13d8 100644
--- a/docs/doxygen/overviews/runtimeclass.h
+++ b/docs/doxygen/overviews/runtimeclass.h
@@ -30,8 +30,8 @@ all the others. This macro is limited to wxWidgets classes only and only works
 with pointers (unlike the real dynamic_cast which also accepts references).
 
 Each class that you wish to be known to the type system should have a macro
-such as DECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
-IMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
+such as wxDECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
+wxIMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
 are entirely optional; use them if you wish to check object types, or create
 instances of classes using the class name. However, it is good to get into the
 habit of adding these macros for all classes.
@@ -39,13 +39,13 @@ habit of adding these macros for all classes.
 Variations on these macros are used for multiple inheritance, and abstract
 classes that cannot be instantiated dynamically or otherwise.
 
-DECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the class,
-initialized by IMPLEMENT_DYNAMIC_CLASS. When initialized, the wxClassInfo
-object inserts itself into a linked list (accessed through wxClassInfo::first
-and wxClassInfo::next pointers). The linked list is fully created by the time
-all global initialisation is done.
+wxDECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the
+class, initialized by wxIMPLEMENT_DYNAMIC_CLASS. When initialized, the
+wxClassInfo object inserts itself into a linked list (accessed through
+wxClassInfo::first and wxClassInfo::next pointers). The linked list is fully
+created by the time all global initialisation is done.
 
-IMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
+wxIMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
 wxClassInfo member, but defines a global function capable of creating a dynamic
 object of the class in question. A pointer to this function is stored in
 wxClassInfo, and is used when an object should be created dynamically.
@@ -63,9 +63,9 @@ wxClassInfo object instead, then you can simply call wxClassInfo::CreateObject.
 
 @section overview_rtti_classinfo wxClassInfo
 
-This class stores meta-information about classes. An application may use macros
-such as DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS to record runtime
-information about a class, including:
+This class stores meta-information about classes. An application may use
+macros such as wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS to
+record runtime information about a class, including:
 
 @li Its position in the inheritance hierarchy.
 @li The base class name(s) (up to two base classes are permitted).
@@ -89,7 +89,7 @@ In a header file frame.h:
 @code
 class wxFrame : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 
 private:
     wxString m_title;
@@ -102,7 +102,7 @@ public:
 In a C++ file frame.cpp:
 
 @code
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow);
 
 wxFrame::wxFrame()
 {
diff --git a/docs/doxygen/overviews/xrc.h b/docs/doxygen/overviews/xrc.h
index 900ace352c..8f2fd55506 100644
--- a/docs/doxygen/overviews/xrc.h
+++ b/docs/doxygen/overviews/xrc.h
@@ -401,12 +401,12 @@ public:
     {
         Close();
     }
-    DECLARE_EVENT_TABLE();
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
+wxBEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
     EVT_BUTTON(XRCID("B"), TestWnd::OnBPressed)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 @endcode
 
 It is also possible to access the wxSizerItem of a sizer that is part of a
@@ -451,7 +451,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 
     // Register with wxWidgets' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(MyControlXmlHandler)
+    wxDECLARE_DYNAMIC_CLASS(MyControlXmlHandler);
 };
 @endcode
 
@@ -459,7 +459,7 @@ The implementation of your custom XML handler will typically look as:
 
 @code
 // Register with wxWidgets' dynamic class subsystem.
-IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler);
 
 MyControlXmlHandler::MyControlXmlHandler()
 {
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 8786732bad..e8c6d66e1a 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -2554,7 +2554,7 @@ The subclass must satisfy a number of requirements:
 
  -# It must be derived from the class specified in @c class attribute.
  -# It must be visible in wxWidget's pseudo-RTTI mechanism, i.e. there must be
-    a DECLARE_DYNAMIC_CLASS() entry for it.
+    a wxDECLARE_DYNAMIC_CLASS() entry for it.
  -# It must support two-phase creation. In particular, this means that it has
     to have default constructor.
  -# It cannot provide custom Create() method and must be constructible using
diff --git a/include/wx/animate.h b/include/wx/animate.h
index 6243fb4568..77ec3bf4f0 100644
--- a/include/wx/animate.h
+++ b/include/wx/animate.h
@@ -50,7 +50,7 @@ public:
                       wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
 
 protected:
-    DECLARE_ABSTRACT_CLASS(wxAnimationBase)
+    wxDECLARE_ABSTRACT_CLASS(wxAnimationBase);
 };
 
 
@@ -106,7 +106,7 @@ protected:
     virtual void DisplayStaticImage() = 0;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
+    wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase);
 };
 
 
diff --git a/include/wx/app.h b/include/wx/app.h
index af86beb0d2..bbd97308ca 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -862,7 +862,7 @@ public:
     wxIMPLEMENT_WX_THEME_SUPPORT            \
     wxIMPLEMENT_APP_NO_THEMES(appname)
 
-// Same as IMPLEMENT_APP(), but for console applications.
+// Same as wxIMPLEMENT_APP(), but for console applications.
 #define wxIMPLEMENT_APP_CONSOLE(appname)    \
     wxIMPLEMENT_WXWIN_MAIN_CONSOLE          \
     wxIMPLEMENT_APP_NO_MAIN(appname)
diff --git a/include/wx/archive.h b/include/wx/archive.h
index 860fb7e7ac..1d0b45e2fb 100644
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -73,7 +73,7 @@ protected:
 private:
     wxArchiveNotifier *m_notifier;
 
-    DECLARE_ABSTRACT_CLASS(wxArchiveEntry)
+    wxDECLARE_ABSTRACT_CLASS(wxArchiveEntry);
 };
 
 
@@ -370,7 +370,7 @@ private:
     static wxArchiveClassFactory *sm_first;
     wxArchiveClassFactory *m_next;
 
-    DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
+    wxDECLARE_ABSTRACT_CLASS(wxArchiveClassFactory);
 };
 
 #endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index ab7d1ee45b..35707e5494 100644
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -236,7 +236,7 @@ private:
     // art resources cache (so that CreateXXX is not called that often):
     static wxArtProviderCache *sm_cache;
 
-    DECLARE_ABSTRACT_CLASS(wxArtProvider)
+    wxDECLARE_ABSTRACT_CLASS(wxArtProvider);
 };
 
 
diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 52e2525215..34d3082624 100644
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -105,7 +105,7 @@ private:
     int m_toolId;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent);
 };
 
 
@@ -692,8 +692,8 @@ private:
     // Common part of OnLeaveWindow() and OnCaptureLost().
     void DoResetMouseState();
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxAuiToolBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxAuiToolBar);
 };
 
 
diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 9811c6605b..d96e88fe1e 100644
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -85,7 +85,7 @@ private:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent);
 #endif
 };
 
@@ -235,8 +235,8 @@ protected:
     wxAuiTabContainerButton* m_pressedButton;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxAuiTabCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxAuiTabCtrl);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -432,8 +432,8 @@ protected:
     unsigned int m_flags;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxAuiNotebook)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxAuiNotebook);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index bf158933b8..fca8a5c6a7 100644
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -70,8 +70,8 @@ private:
     wxAuiManager m_mgr;
 
 #ifndef SWIG
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxAuiFloatingFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxAuiFloatingFrame);
 #endif // SWIG
 };
 
diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index 3fe01f1b54..fdf29d4f8e 100644
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -664,8 +664,8 @@ protected:
     void* m_reserved;
 
 #ifndef SWIG
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxAuiManager)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxAuiManager);
 #endif // SWIG
 };
 
@@ -723,7 +723,7 @@ public:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent);
 #endif
 };
 
diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 8750831747..371e18abf0 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -107,8 +107,8 @@ protected:
     virtual void DoGetClientSize(int *width, int *height) const;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame);
 };
 
 //-----------------------------------------------------------------------------
@@ -228,8 +228,8 @@ protected:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame);
+    wxDECLARE_EVENT_TABLE();
 
     friend class wxAuiMDIClientWindow;
 };
@@ -262,8 +262,8 @@ protected:
     void OnSize(wxSizeEvent& evt);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
+    wxDECLARE_EVENT_TABLE();
 };
 #endif // wxUSE_AUI
 
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 8ab8ec23c0..1bef98d074 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -146,7 +146,7 @@ private:
     wxString      m_extension;
     wxBitmapType  m_type;
 
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxBitmapHandler);
 };
 
 // ----------------------------------------------------------------------------
@@ -254,7 +254,7 @@ public:
 protected:
     static wxList sm_handlers;
 
-    DECLARE_ABSTRACT_CLASS(wxBitmapBase)
+    wxDECLARE_ABSTRACT_CLASS(wxBitmapBase);
 };
 
 #endif // wxUSE_BITMAP_BASE
diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index cd9c8d5588..2564e9c617 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -356,10 +356,10 @@ private:
     // internal border
     unsigned int m_internalBorder;
 
-    DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
+    wxDECLARE_ABSTRACT_CLASS(wxBookCtrlBase);
     wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -398,7 +398,7 @@ private:
     int m_nSel,     // currently selected page
         m_nOldSel;  // previously selected page
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent);
 };
 
 typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index 85910363a7..494b0975a1 100644
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -172,7 +172,7 @@ public:
 private:
     wxDateTime::WeekDay m_wday;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index f59d72fea4..c56916f903 100644
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -102,8 +102,8 @@ protected:
     void OnChoiceSelected(wxCommandEvent& event);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 6786427b5d..2c37937c58 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -126,7 +126,7 @@ public:
 protected:
     wxVector<wxDataFormat> m_formats;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 1ed49a8419..5e30999e06 100644
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -149,7 +149,7 @@ protected:
         { return (style & wxCLRP_SHOW_LABEL); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrl);
 };
 
 
@@ -180,7 +180,7 @@ public:
 private:
     wxColour m_colour;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index c6125096a0..8f9656c5c3 100644
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -41,7 +41,7 @@ protected:
     wxString m_commandName;
 
 private:
-    DECLARE_CLASS(wxCommand)
+    wxDECLARE_CLASS(wxCommand);
 };
 
 // ----------------------------------------------------------------------------
@@ -132,7 +132,7 @@ protected:
     wxString      m_redoAccelerator;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
+    wxDECLARE_DYNAMIC_CLASS(wxCommandProcessor);
     wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
 };
 
diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index c8e345af56..9c93012567 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -138,7 +138,7 @@ private:
     wxPrintNativeDataBase  *m_nativeData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintData);
 };
 
 /*
@@ -213,7 +213,7 @@ private:
     wxPrintData     m_printData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintDialogData);
 };
 
 /*
@@ -302,7 +302,7 @@ private:
     wxPrintData     m_printData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
+    wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialogData);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index 9fa0472a84..4a66f124f9 100644
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -75,7 +75,7 @@ public:
 private:
     bool m_bCollapsed;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCollapsiblePaneEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCollapsiblePaneEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/colourdata.h b/include/wx/colourdata.h
index 5a755ae078..dfaab13f26 100644
--- a/include/wx/colourdata.h
+++ b/include/wx/colourdata.h
@@ -45,7 +45,7 @@ public:
     wxColour        m_custColours[NUM_CUSTOM];
     bool            m_chooseFull;
 
-    DECLARE_DYNAMIC_CLASS(wxColourData)
+    wxDECLARE_DYNAMIC_CLASS(wxColourData);
 };
 
 #endif // _WX_COLOURDATA_H_
diff --git a/include/wx/combo.h b/include/wx/combo.h
index 96c0a72d51..29cd02e819 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -728,9 +728,9 @@ private:
     // Is popup window wxPopupTransientWindow, wxPopupWindow or wxDialog?
     wxByte                  m_popupWinType;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_ABSTRACT_CLASS(wxComboCtrlBase)
+    wxDECLARE_ABSTRACT_CLASS(wxComboCtrlBase);
 };
 
 
diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 4d4403fa33..714e3d0092 100644
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -401,7 +401,7 @@ private:
   // Style flag
   long              m_style;
 
-  DECLARE_ABSTRACT_CLASS(wxConfigBase)
+  wxDECLARE_ABSTRACT_CLASS(wxConfigBase);
 };
 
 // a handy little class which changes current path to the path of given entry
diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 50b803b928..c521d454bc 100644
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -54,7 +54,7 @@ protected:
     bool    m_status; // true if the user left-clicked
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxContextHelp)
+    wxDECLARE_DYNAMIC_CLASS(wxContextHelp);
 };
 
 #if wxUSE_BMPBUTTON
@@ -89,8 +89,8 @@ public:
     void OnContextHelp(wxCommandEvent& event);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 284847e355..b934d2376f 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -492,7 +492,7 @@ private:
         wxControlWithItems() { }
 
     private:
-        DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+        wxDECLARE_ABSTRACT_CLASS(wxControlWithItems);
         wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
     };
 #endif
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 22e929cf3f..bf5554f951 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -755,7 +755,7 @@ private:
     int m_indent ;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -879,7 +879,7 @@ protected:
 #endif // wxUSE_DRAG_AND_DROP
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
@@ -1117,8 +1117,8 @@ public:
     void OnSize( wxSizeEvent &event );
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewListCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewListCtrl);
 };
 
 //-----------------------------------------------------------------------------
@@ -1342,8 +1342,8 @@ public:
     void OnSize( wxSizeEvent &event );
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl);
 };
 
 // old wxEVT_COMMAND_* constants
diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 6fa4367c0a..a3c236781a 100644
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -103,7 +103,7 @@ public:
         }
 
     private:
-        DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)
+        wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);
     };
 #endif
 
diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h
index 0bd8a670ad..2032d89a71 100644
--- a/include/wx/dateevt.h
+++ b/include/wx/dateevt.h
@@ -39,7 +39,7 @@ public:
 private:
     wxDateTime m_date;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/dc.h b/include/wx/dc.h
index a048ff75c4..7a0f8fae1a 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -776,7 +776,7 @@ protected:
 #endif // wxUSE_PALETTE
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxDCImpl);
 };
 
 
@@ -1373,7 +1373,7 @@ protected:
     wxDCImpl * const m_pimpl;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxDC)
+    wxDECLARE_ABSTRACT_CLASS(wxDC);
     wxDECLARE_NO_COPY_CLASS(wxDC);
 };
 
diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h
index 752c0d81ae..fb912f6e24 100644
--- a/include/wx/dcbuffer.h
+++ b/include/wx/dcbuffer.h
@@ -135,7 +135,7 @@ private:
 
     wxSize m_area;
     
-    DECLARE_DYNAMIC_CLASS(wxBufferedDC)
+    wxDECLARE_DYNAMIC_CLASS(wxBufferedDC);
     wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
 };
 
@@ -195,7 +195,7 @@ protected:
 private:
     wxPaintDC m_paintdc;
 
-    DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)
+    wxDECLARE_ABSTRACT_CLASS(wxBufferedPaintDC);
     wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC);
 };
 
diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index f4bf74f75f..28391d1266 100644
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -24,7 +24,7 @@ protected:
     wxWindowDC(wxDCImpl *impl) : wxDC(impl) { }
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxWindowDC)
+    wxDECLARE_ABSTRACT_CLASS(wxWindowDC);
 };
 
 //-----------------------------------------------------------------------------
@@ -40,7 +40,7 @@ protected:
     wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { }
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxClientDC)
+    wxDECLARE_ABSTRACT_CLASS(wxClientDC);
 };
 
 //-----------------------------------------------------------------------------
@@ -56,7 +56,7 @@ protected:
     wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { }
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxPaintDC)
+    wxDECLARE_ABSTRACT_CLASS(wxPaintDC);
 };
 
 #endif // _WX_DCCLIENT_H_BASE_
diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 06cca91298..ada4f9e3b6 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -47,7 +47,7 @@ public:
 #endif // __WXMSW__
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGCDC)
+    wxDECLARE_DYNAMIC_CLASS(wxGCDC);
     wxDECLARE_NO_COPY_CLASS(wxGCDC);
 };
 
@@ -218,7 +218,7 @@ protected:
 private:
     void Init(wxGraphicsContext*);
 
-    DECLARE_CLASS(wxGCDCImpl)
+    wxDECLARE_CLASS(wxGCDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };
 
diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index d5f301c942..573da75ce0 100644
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -36,7 +36,7 @@ public:
     wxBitmap& GetSelectedBitmap();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryDC);
 };
 
 
diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index 1d50954595..2e98c7e43b 100644
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -34,7 +34,7 @@ protected:
     wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrinterDC)
+    wxDECLARE_DYNAMIC_CLASS(wxPrinterDC);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 391e91aacf..fb60309da0 100644
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -27,7 +27,7 @@ public:
         { return true; }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    wxDECLARE_DYNAMIC_CLASS(wxScreenDC);
 };
 
 
diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 0fce5ed572..3f7bd5a5fd 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -242,7 +242,7 @@ private:
    // incremented in each SetClippingRegion() call.
    size_t m_clipUniqueId;
 
-   DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
+   wxDECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl);
 };
 
 
diff --git a/include/wx/dfb/app.h b/include/wx/dfb/app.h
index 4807dd6a4a..131996479f 100644
--- a/include/wx/dfb/app.h
+++ b/include/wx/dfb/app.h
@@ -38,7 +38,7 @@ public:
 private:
     wxVideoMode m_videoMode;
 
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 };
 
 #endif // _WX_DFB_APP_H_
diff --git a/include/wx/dfb/bitmap.h b/include/wx/dfb/bitmap.h
index 391a8e06fd..5be025381d 100644
--- a/include/wx/dfb/bitmap.h
+++ b/include/wx/dfb/bitmap.h
@@ -88,7 +88,7 @@ protected:
 
     bool CreateWithFormat(int width, int height, int dfbFormat);
 
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 #endif // _WX_DFB_BITMAP_H_
diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h
index b197ac064a..278f64e0b8 100644
--- a/include/wx/dfb/brush.h
+++ b/include/wx/dfb/brush.h
@@ -57,7 +57,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_DFB_BRUSH_H_
diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h
index 57e834583d..e1f6fe5257 100644
--- a/include/wx/dfb/cursor.h
+++ b/include/wx/dfb/cursor.h
@@ -38,7 +38,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif // _WX_DFB_CURSOR_H_
diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h
index ea6b8a0010..141224ba68 100644
--- a/include/wx/dfb/dc.h
+++ b/include/wx/dfb/dc.h
@@ -161,7 +161,7 @@ protected:
 
     friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init
 
-    DECLARE_ABSTRACT_CLASS(wxDFBDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxDFBDCImpl);
 };
 
 #endif // _WX_DFB_DC_H_
diff --git a/include/wx/dfb/dcclient.h b/include/wx/dfb/dcclient.h
index 29ed91b273..bc185c6864 100644
--- a/include/wx/dfb/dcclient.h
+++ b/include/wx/dfb/dcclient.h
@@ -37,7 +37,7 @@ private:
 
     friend class wxOverlayImpl; // for m_shouldFlip;
 
-    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
@@ -51,7 +51,7 @@ public:
     wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
     wxClientDCImpl(wxDC *owner, wxWindow *win);
 
-    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxClientDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
@@ -66,7 +66,7 @@ public:
     wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { }
     wxPaintDCImpl(wxDC *owner, wxWindow *win) : wxClientDCImpl(owner, win) { }
 
-    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxPaintDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h
index a02a7faefc..0ea21e1964 100644
--- a/include/wx/dfb/dcmemory.h
+++ b/include/wx/dfb/dcmemory.h
@@ -30,7 +30,7 @@ private:
 
     wxBitmap m_bmp;
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl);
 };
 
 #endif // _WX_DFB_DCMEMORY_H_
diff --git a/include/wx/dfb/dcscreen.h b/include/wx/dfb/dcscreen.h
index 37e44d69b7..d35d1ef25b 100644
--- a/include/wx/dfb/dcscreen.h
+++ b/include/wx/dfb/dcscreen.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxDFBDCImpl
 public:
     wxScreenDCImpl(wxScreenDC *owner);
 
-    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_DFB_DCSCREEN_H_
diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h
index 6be9d0a8f8..83e286353a 100644
--- a/include/wx/dfb/font.h
+++ b/include/wx/dfb/font.h
@@ -114,7 +114,7 @@ protected:
     virtual wxFontFamily DoGetFamily() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_DFB_FONT_H_
diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h
index e7ae220fb4..642c6569f6 100644
--- a/include/wx/dfb/pen.h
+++ b/include/wx/dfb/pen.h
@@ -68,7 +68,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif // _WX_DFB_PEN_H_
diff --git a/include/wx/dfb/popupwin.h b/include/wx/dfb/popupwin.h
index 00a8f80a05..73c9dad909 100644
--- a/include/wx/dfb/popupwin.h
+++ b/include/wx/dfb/popupwin.h
@@ -37,7 +37,7 @@ public:
                );
     }
 
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
 };
 
 #endif // _WX_DFB_POPUPWIN_H_
diff --git a/include/wx/dfb/region.h b/include/wx/dfb/region.h
index 8a62291c04..dbc2761b52 100644
--- a/include/wx/dfb/region.h
+++ b/include/wx/dfb/region.h
@@ -58,7 +58,7 @@ protected:
 
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 
-    DECLARE_DYNAMIC_CLASS(wxRegion);
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 
@@ -88,7 +88,7 @@ public:
 private:
     wxRect m_rect;
 
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif // _WX_DFB_REGION_H_
diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index f67cce2268..98800bbb5c 100644
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -185,9 +185,9 @@ private:
     friend class wxOverlayImpl; // for Add/RemoveOverlay
     friend class wxWindowDCImpl; // for PaintOverlays
 
-    DECLARE_DYNAMIC_CLASS(wxWindowDFB)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowDFB);
     wxDECLARE_NO_COPY_CLASS(wxWindowDFB);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_DFB_WINDOW_H_
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 603b3cba66..9a0d4511f0 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -270,7 +270,7 @@ private:
 
 
     wxDECLARE_NO_COPY_CLASS(wxDialogBase);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*!
@@ -282,7 +282,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject
 {
-    DECLARE_CLASS(wxDialogLayoutAdapter)
+    wxDECLARE_CLASS(wxDialogLayoutAdapter);
 public:
     wxDialogLayoutAdapter() {}
 
@@ -300,7 +300,7 @@ public:
 
 class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
 {
-    DECLARE_CLASS(wxStandardDialogLayoutAdapter)
+    wxDECLARE_CLASS(wxStandardDialogLayoutAdapter);
 public:
     wxStandardDialogLayoutAdapter() {}
 
@@ -380,7 +380,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent )
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent );
diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 470de732be..4ffd2e7509 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -48,7 +48,7 @@ public:
     }
 
 private:
-    DECLARE_CLASS(wxDocMDIParentFrame)
+    wxDECLARE_CLASS(wxDocMDIParentFrame);
     wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame);
 };
 
@@ -79,7 +79,7 @@ public:
     }
 
 private:
-    DECLARE_CLASS(wxDocMDIChildFrame)
+    wxDECLARE_CLASS(wxDocMDIChildFrame);
     wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
 };
 
diff --git a/include/wx/docview.h b/include/wx/docview.h
index c4d27eac65..45cfc585c9 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -218,7 +218,7 @@ private:
     typedef wxDList<wxDocument> DocsList;
     DocsList m_childDocuments;
 
-    DECLARE_ABSTRACT_CLASS(wxDocument)
+    wxDECLARE_ABSTRACT_CLASS(wxDocument);
     wxDECLARE_NO_COPY_CLASS(wxDocument);
 };
 
@@ -291,7 +291,7 @@ protected:
     wxDocChildFrameAnyBase *m_docChildFrame;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxView)
+    wxDECLARE_ABSTRACT_CLASS(wxView);
     wxDECLARE_NO_COPY_CLASS(wxView);
 };
 
@@ -376,7 +376,7 @@ protected:
     virtual wxView *DoCreateView();
 
 private:
-    DECLARE_CLASS(wxDocTemplate)
+    wxDECLARE_CLASS(wxDocTemplate);
     wxDECLARE_NO_COPY_CLASS(wxDocTemplate);
 };
 
@@ -562,8 +562,8 @@ protected:
     wxPageSetupDialogData m_pageSetupDialogData;
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxDocManager)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxDocManager);
     wxDECLARE_NO_COPY_CLASS(wxDocManager);
 };
 
@@ -798,7 +798,7 @@ public:
     }
 
 private:
-    DECLARE_CLASS(wxDocChildFrame)
+    wxDECLARE_CLASS(wxDocChildFrame);
     wxDECLARE_NO_COPY_CLASS(wxDocChildFrame);
 };
 
@@ -950,7 +950,7 @@ public:
     }
 
 private:
-    DECLARE_CLASS(wxDocParentFrame)
+    wxDECLARE_CLASS(wxDocParentFrame);
     wxDECLARE_NO_COPY_CLASS(wxDocParentFrame);
 };
 
@@ -977,7 +977,7 @@ protected:
     wxView*       m_printoutView;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDocPrintout)
+    wxDECLARE_DYNAMIC_CLASS(wxDocPrintout);
     wxDECLARE_NO_COPY_CLASS(wxDocPrintout);
 };
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 3de00f058e..50758508b5 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -72,7 +72,7 @@ private:
     wxString    m_text;
     wxIcon      m_icon;
 
-    DECLARE_DYNAMIC_CLASS(wxDataViewIconText)
+    wxDECLARE_DYNAMIC_CLASS(wxDataViewIconText);
 };
 
 DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
@@ -188,7 +188,7 @@ protected:
     wxDataViewCtrl* GetView() const;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase);
 };
 
 // include the real wxDataViewRenderer declaration for the native ports
diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h
index 7aad2ac205..c264c4c886 100644
--- a/include/wx/editlbox.h
+++ b/include/wx/editlbox.h
@@ -86,8 +86,8 @@ protected:
     void OnUpItem(wxCommandEvent& event);
     void OnDownItem(wxCommandEvent& event);
 
-    DECLARE_CLASS(wxEditableListBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxEditableListBox);
+    wxDECLARE_EVENT_TABLE();
 
 private:
     void SwapItems(long i1, long i2);
diff --git a/include/wx/effects.h b/include/wx/effects.h
index adaf951c10..b0e1b574b6 100644
--- a/include/wx/effects.h
+++ b/include/wx/effects.h
@@ -74,7 +74,7 @@ protected:
     wxColour    m_mediumShadow;     // Usually dark grey
     wxColour    m_darkShadow;       // Usually black
 
-    DECLARE_CLASS(wxEffectsImpl)
+    wxDECLARE_CLASS(wxEffectsImpl);
 };
 
 // current versions of g++ don't generate deprecation warnings for classes
diff --git a/include/wx/event.h b/include/wx/event.h
index 23f2764e09..c4da27e459 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1054,7 +1054,7 @@ private:
     friend class WXDLLIMPEXP_FWD_BASE wxEventProcessInHandlerOnly;
 
 
-    DECLARE_ABSTRACT_CLASS(wxEvent)
+    wxDECLARE_ABSTRACT_CLASS(wxEvent);
 };
 
 /*
@@ -1242,7 +1242,7 @@ protected:
     static wxIdleMode sm_idleMode;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent);
 };
 
 
@@ -1276,7 +1276,7 @@ public:
         { return wxEVT_CATEGORY_THREAD; }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent);
 };
 
 
@@ -1557,7 +1557,7 @@ private:
         m_propagationLevel = wxEVENT_PROPAGATE_MAX;
     }
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent);
 };
 
 // this class adds a possibility to react (from the user) code to a control
@@ -1588,7 +1588,7 @@ private:
     bool m_bAllow;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent);
 };
 
 
@@ -1620,7 +1620,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent);
 };
 
 // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
@@ -1657,7 +1657,7 @@ protected:
     long              m_extraLong;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent);
 };
 
 
@@ -1815,7 +1815,7 @@ protected:
     void Assign(const wxMouseEvent& evt);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMouseEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxMouseEvent);
 };
 
 // Cursor set event
@@ -1853,7 +1853,7 @@ private:
     wxCursor m_cursor;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent);
 };
 
 // Keyboard input event class
@@ -2037,7 +2037,7 @@ private:
     // when they're requested.
     bool m_hasPosition;
 
-    DECLARE_DYNAMIC_CLASS(wxKeyEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxKeyEvent);
 };
 
 // Size event class
@@ -2075,7 +2075,7 @@ public:
     wxRect m_rect; // Used for wxEVT_SIZING
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent);
 };
 
 // Move event class
@@ -2114,7 +2114,7 @@ protected:
     wxRect m_rect;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent);
 };
 
 // Paint event class
@@ -2160,7 +2160,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent);
 };
 
 class WXDLLIMPEXP_CORE wxNcPaintEvent : public wxEvent
@@ -2173,7 +2173,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent);
 };
 
 // Erase background event class
@@ -2202,7 +2202,7 @@ protected:
     wxDC *m_dc;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent);
 };
 
 // Focus event class
@@ -2234,7 +2234,7 @@ private:
     wxWindow *m_win;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent);
 };
 
 // wxChildFocusEvent notifies the parent that a child has got the focus: unlike
@@ -2249,7 +2249,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent);
 };
 
 // Activate event class
@@ -2294,7 +2294,7 @@ private:
     Reason m_activationReason;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent);
 };
 
 // InitDialog event class
@@ -2312,7 +2312,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent);
 };
 
 // Miscellaneous menu event class
@@ -2347,7 +2347,7 @@ private:
     int     m_menuId;
     wxMenu* m_menu;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent);
 };
 
 // Window close or session close event class
@@ -2403,7 +2403,7 @@ protected:
          m_canVeto;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent);
 };
 
 /*
@@ -2435,7 +2435,7 @@ protected:
     bool m_show;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent);
 };
 
 /*
@@ -2464,7 +2464,7 @@ protected:
     bool m_iconized;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent);
 };
 /*
  wxEVT_MAXIMIZE
@@ -2480,7 +2480,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent);
 };
 
 // Joystick event class
@@ -2579,7 +2579,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent);
 };
 
 // Drop files event class
@@ -2629,7 +2629,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent);
 };
 
 // Update UI event
@@ -2731,7 +2731,7 @@ protected:
     static wxUpdateUIMode   sm_updateMode;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent);
 };
 
 /*
@@ -2749,7 +2749,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent);
 };
 
 /*
@@ -2778,7 +2778,7 @@ public:
 private:
     wxWindow* m_gainedCapture;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent);
 };
 
 /*
@@ -2801,7 +2801,7 @@ public:
 
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); }
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent);
 };
 
 /*
@@ -2810,7 +2810,7 @@ public:
 class WXDLLIMPEXP_CORE wxDisplayChangedEvent : public wxEvent
 {
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent);
 
 public:
     wxDisplayChangedEvent()
@@ -2846,7 +2846,7 @@ protected:
     wxWindow*     m_changedWindow;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent);
 };
 
 /*
@@ -2876,7 +2876,7 @@ protected:
     bool m_paletteRealized;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent);
 };
 
 /*
@@ -2943,7 +2943,7 @@ public:
     wxWindow *m_focus;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent);
 };
 
 // Window creation/destruction events: the first is sent as soon as window is
@@ -2966,7 +2966,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent);
 };
 
 class WXDLLIMPEXP_CORE wxWindowDestroyEvent : public wxCommandEvent
@@ -2979,7 +2979,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent);
 };
 
 // A help event is sent when the user clicks on a window in context-help mode.
@@ -3044,7 +3044,7 @@ protected:
     static Origin GuessOrigin(Origin origin);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent);
 };
 
 // A Clipboard Text event is sent when a window intercepts text copy/cut/paste
@@ -3072,7 +3072,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent);
 };
 
 // A Context event is sent when the user right clicks on a window or
@@ -3107,7 +3107,7 @@ protected:
     wxPoint   m_pos;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent);
 };
 
 
@@ -3726,7 +3726,7 @@ private:
     // Head of the event filter linked list.
     static wxEventFilter* ms_filterList;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler);
 };
 
 WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE);
diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index e5223ca9ae..eec9ad7ecc 100644
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -161,7 +161,7 @@ public:
 private:
     wxString m_strReplace;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND, wxFindDialogEvent );
diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index a3dd19b17c..a15468cfd7 100644
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -252,7 +252,7 @@ private:
   bool m_isDirty;                       // if true, we have unsaved changes
 
   wxDECLARE_NO_COPY_CLASS(wxFileConfig);
-  DECLARE_ABSTRACT_CLASS(wxFileConfig)
+  wxDECLARE_ABSTRACT_CLASS(wxFileConfig);
 };
 
 #endif
diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h
index a7c2515976..c8c3d49a57 100644
--- a/include/wx/filectrl.h
+++ b/include/wx/filectrl.h
@@ -115,7 +115,7 @@ protected:
     wxString m_directory;
     wxArrayString m_files;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN( wxFileCtrlEvent )
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileCtrlEvent);
 };
 
 typedef void ( wxEvtHandler::*wxFileCtrlEventFunction )( wxFileCtrlEvent& );
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 2d007c9c78..b068129ae2 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -167,7 +167,7 @@ private:
     ExtraControlCreatorFunction m_extraControlCreator;
 
     void Init();
-    DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialogBase);
     wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);
 };
 
diff --git a/include/wx/filehistory.h b/include/wx/filehistory.h
index 123b0115d2..9cd4be4034 100644
--- a/include/wx/filehistory.h
+++ b/include/wx/filehistory.h
@@ -94,7 +94,7 @@ private:
         wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
             : wxFileHistoryBase(maxFiles, idBase) {}
 
-        DECLARE_DYNAMIC_CLASS(wxFileHistory)
+        wxDECLARE_DYNAMIC_CLASS(wxFileHistory);
     };
 #endif
 
diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 28f9b4732d..6c9b3f85a7 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -55,7 +55,7 @@ public:
 private:
     wxString m_path;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
@@ -310,7 +310,7 @@ protected:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFilePickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxFilePickerCtrl);
 };
 
 #endif      // wxUSE_FILEPICKERCTRL
@@ -407,7 +407,7 @@ protected:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxDirPickerCtrl);
 };
 
 #endif      // wxUSE_DIRPICKERCTRL
diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index a661f180b9..eb9a794e80 100644
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -97,7 +97,7 @@ private:
     wxDateTime m_Modif;
 #endif // wxUSE_DATETIME
 
-    DECLARE_ABSTRACT_CLASS(wxFSFile)
+    wxDECLARE_ABSTRACT_CLASS(wxFSFile);
     wxDECLARE_NO_COPY_CLASS(wxFSFile);
 };
 
@@ -154,7 +154,7 @@ protected:
     // {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"}
     static wxString GetRightLocation(const wxString& location);
 
-    DECLARE_ABSTRACT_CLASS(wxFileSystemHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxFileSystemHandler);
 };
 
 
@@ -245,7 +245,7 @@ protected:
     wxFSHandlerHash m_LocalHandlers;
             // Handlers local to this instance
 
-    DECLARE_DYNAMIC_CLASS(wxFileSystem)
+    wxDECLARE_DYNAMIC_CLASS(wxFileSystem);
     wxDECLARE_NO_COPY_CLASS(wxFileSystem);
 };
 
diff --git a/include/wx/fontdata.h b/include/wx/fontdata.h
index 87571ce940..592e0b6d9b 100644
--- a/include/wx/fontdata.h
+++ b/include/wx/fontdata.h
@@ -64,7 +64,7 @@ private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;
 
-    DECLARE_DYNAMIC_CLASS(wxFontData)
+    wxDECLARE_DYNAMIC_CLASS(wxFontData);
 };
 
 #endif // _WX_FONTDATA_H_
diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h
index 4e43c95f2c..650c919579 100644
--- a/include/wx/fontpicker.h
+++ b/include/wx/fontpicker.h
@@ -180,7 +180,7 @@ private:
     wxFontPickerWidget* GetPickerWidget() const
         { return static_cast<wxFontPickerWidget*>(m_picker); }
 
-    DECLARE_DYNAMIC_CLASS(wxFontPickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxFontPickerCtrl);
 };
 
 
@@ -210,7 +210,7 @@ public:
 private:
     wxFont m_font;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 920d12fea0..1e9cadd7c1 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -244,7 +244,7 @@ protected:
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_MENUS && wxUSE_STATUSBAR
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif // wxUSE_MENUS && wxUSE_STATUSBAR
 
     wxDECLARE_NO_COPY_CLASS(wxFrameBase);
diff --git a/include/wx/fs_arc.h b/include/wx/fs_arc.h
index 7b6979b27e..014270d609 100644
--- a/include/wx/fs_arc.h
+++ b/include/wx/fs_arc.h
@@ -47,7 +47,7 @@ private:
     wxString DoFind();
 
     wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler);
-    DECLARE_DYNAMIC_CLASS(wxArchiveFSHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxArchiveFSHandler);
 };
 
 #endif // wxUSE_FS_ARCHIVE
diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h
index 223dff7732..7f0fcbd72e 100644
--- a/include/wx/fswatcher.h
+++ b/include/wx/fswatcher.h
@@ -205,7 +205,7 @@ protected:
     wxFileName m_newPath;
     wxString m_errorMsg;
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent);
 };
 
 typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)
diff --git a/include/wx/gbsizer.h b/include/wx/gbsizer.h
index c606b18f33..501b5d8188 100644
--- a/include/wx/gbsizer.h
+++ b/include/wx/gbsizer.h
@@ -195,7 +195,7 @@ protected:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGBSizerItem)
+    wxDECLARE_DYNAMIC_CLASS(wxGBSizerItem);
     wxDECLARE_NO_COPY_CLASS(wxGBSizerItem);
 };
 
@@ -333,7 +333,7 @@ protected:
 
 private:
 
-    DECLARE_CLASS(wxGridBagSizer)
+    wxDECLARE_CLASS(wxGridBagSizer);
     wxDECLARE_NO_COPY_CLASS(wxGridBagSizer);
 };
 
diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 3d9675dcd8..81d1f46a6b 100644
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -86,7 +86,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const = 0;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const = 0;
 
-    DECLARE_DYNAMIC_CLASS(wxGDIObject)
+    wxDECLARE_DYNAMIC_CLASS(wxGDIObject);
 };
 
 #endif // _WX_GDIOBJ_H_BASE_
diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 7d821de409..0195f4642b 100644
--- a/include/wx/generic/accel.h
+++ b/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_
diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h
index 818daf890c..e625a43903 100644
--- a/include/wx/generic/animate.h
+++ b/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__
diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index d5e5cbb169..1b246d3220 100644
--- a/include/wx/generic/bmpcbox.h
+++ b/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_
diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h
index 0729950027..7a96d4adbe 100644
--- a/include/wx/generic/buttonbar.h
+++ b/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
diff --git a/include/wx/generic/calctrlg.h b/include/wx/generic/calctrlg.h
index 8e430b6231..7d06ac34cb 100644
--- a/include/wx/generic/calctrlg.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 2d92b44276..f4be95692e 100644
--- a/include/wx/generic/choicdgg.h
+++ b/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);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index de32125e00..fd12c0e637 100644
--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -75,7 +75,7 @@ protected:
     static wxColourData ms_data;
 
 private:
-   DECLARE_DYNAMIC_CLASS(wxGenericColourButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericColourButton);
 };
 
 
diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index ec0777115d..8c2e723e45 100644
--- a/include/wx/generic/collpaneg.h
+++ b/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_
diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 5db020cacd..8ef0ccb7c6 100644
--- a/include/wx/generic/colour.h
+++ b/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_
diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index a83abd8ce3..4399baa436 100644
--- a/include/wx/generic/colrdlgg.h
+++ b/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_
diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 4542e2f43d..303b9fce2d 100644
--- a/include/wx/generic/combo.h
+++ b/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_
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index c9797f2151..a0f5edc425 100644
--- a/include/wx/generic/dataview.h
+++ b/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();
 };
 
 
diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 47e656634b..551fa9d14e 100644
--- a/include/wx/generic/datectrl.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index ff51068543..5eb3463ee2 100644
--- a/include/wx/generic/dcpsg.h
+++ b/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
diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index a36dcc2b48..10c3978d7d 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index cc8b5a874b..6538da3393 100644
--- a/include/wx/generic/dirdlgg.h
+++ b/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_
diff --git a/include/wx/generic/dragimgg.h b/include/wx/generic/dragimgg.h
index 7dc98522a1..71ffd8aef9 100644
--- a/include/wx/generic/dragimgg.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/dvrenderer.h b/include/wx/generic/dvrenderer.h
index 75889a8108..251dc81297 100644
--- a/include/wx/generic/dvrenderer.h
+++ b/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_
diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index 7a0a9ddf73..a56beaf034 100644
--- a/include/wx/generic/dvrenderers.h
+++ b/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_
diff --git a/include/wx/generic/fdrepdlg.h b/include/wx/generic/fdrepdlg.h
index d1ad8d1b88..052193c9e2 100644
--- a/include/wx/generic/fdrepdlg.h
+++ b/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_
diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h
index ba26118d7f..b3d9cbec79 100644
--- a/include/wx/generic/filectrlg.h
+++ b/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
diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 7d14e523fb..dc335927af 100644
--- a/include/wx/generic/filedlgg.h
+++ b/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
diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index d88daa556a..480cc27515 100644
--- a/include/wx/generic/filepickerg.h
+++ b/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
diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 26aa2307fd..10cc17b9e8 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/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
diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index 7bb4dee0e0..ea2180ed35 100644
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -74,7 +74,7 @@ protected:
     wxFontData m_data;
 
 private:
-   DECLARE_DYNAMIC_CLASS(wxGenericFontButton)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericFontButton);
 };
 
 
diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 611c36fa7d..e466aba0a4 100644
--- a/include/wx/generic/grid.h
+++ b/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);
 };
 
 
diff --git a/include/wx/generic/grideditors.h b/include/wx/generic/grideditors.h
index 50bcf620d7..faa1007c65 100644
--- a/include/wx/generic/grideditors.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h
index 93201e1499..8a2a84ca1c 100644
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -173,7 +173,7 @@ private:
     wxArrayInt m_colIndices;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
 };
 
diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index fe0c3e7eb2..7743e183ae 100644
--- a/include/wx/generic/helpext.h
+++ b/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
diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index 64fd7c28fd..0b98032a73 100644
--- a/include/wx/generic/icon.h
+++ b/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_
diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 8fc145e03f..3c40702483 100644
--- a/include/wx/generic/imaglist.h
+++ b/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() {}
diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h
index 6da98bfa8c..2fb2312db2 100644
--- a/include/wx/generic/infobar.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index af67ef37b6..1e56b5e12c 100644
--- a/include/wx/generic/laywin.h
+++ b/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
diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 0245424d77..833a05e026 100644
--- a/include/wx/generic/listctrl.h
+++ b/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() {}
diff --git a/include/wx/generic/mask.h b/include/wx/generic/mask.h
index f6aad1a86d..454ba11cda 100644
--- a/include/wx/generic/mask.h
+++ b/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_
diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 7c433edc40..d3469069c3 100644
--- a/include/wx/generic/mdig.h
+++ b/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);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 66bd5484ea..2d8c932832 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/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_
diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index e328e0bfcf..807baebe2e 100644
--- a/include/wx/generic/notebook.h
+++ b/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_
diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h
index c98609e243..905efee6df 100644
--- a/include/wx/generic/numdlgg.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 0f6f5a4918..53d5d8bb26 100644
--- a/include/wx/generic/paletteg.h
+++ b/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__
diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 6da2c633e4..7d83738677 100644
--- a/include/wx/generic/printps.h
+++ b/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
diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index 7ef99700cf..be70fc054a 100644
--- a/include/wx/generic/private/grid.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/private/listctrl.h b/include/wx/generic/private/listctrl.h
index f34e293bfc..259e2ce69a 100644
--- a/include/wx/generic/private/listctrl.h
+++ b/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;
diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 6c8f7bd5a7..0902197794 100644
--- a/include/wx/generic/prntdlgg.h
+++ b/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
diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 5c930ac313..6c7ec2b110 100644
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -222,7 +222,7 @@ private:
     wxEventLoop *m_tempEventLoop;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxGenericProgressDialog);
 };
 
diff --git a/include/wx/generic/propdlg.h b/include/wx/generic/propdlg.h
index dd67ac6de3..286e418181 100644
--- a/include/wx/generic/propdlg.h
+++ b/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
diff --git a/include/wx/generic/richmsgdlgg.h b/include/wx/generic/richmsgdlgg.h
index 9384dbb882..053c901634 100644
--- a/include/wx/generic/richmsgdlgg.h
+++ b/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);
 };
diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index f122e3be0e..44cf8861b4 100644
--- a/include/wx/generic/sashwin.h
+++ b/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&);
diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 3a914ef64d..0f09abd5d7 100644
--- a/include/wx/generic/spinctlg.h
+++ b/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_
diff --git a/include/wx/generic/splash.h b/include/wx/generic/splash.h
index 4b96665a17..48417bb956 100644
--- a/include/wx/generic/splash.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index ff6b1efaec..f864be424a 100644
--- a/include/wx/generic/splitter.h
+++ b/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&);
diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 9f5a810b2f..f6d085a79d 100644
--- a/include/wx/generic/srchctlg.h
+++ b/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
diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h
index f3d198df4e..f4e09de3e6 100644
--- a/include/wx/generic/statbmpg.h
+++ b/include/wx/generic/statbmpg.h
@@ -68,7 +68,7 @@ private:
 
     wxBitmap m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap);
 };
 
 
diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 8a7ccbf088..5cd06f3714 100644
--- a/include/wx/generic/statline.h
+++ b/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
diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 918a4f4eb3..f64c880798 100644
--- a/include/wx/generic/stattextg.h
+++ b/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_
diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 3b3560961d..6d0edd6ec2 100644
--- a/include/wx/generic/statusbr.h
+++ b/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
diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index d376b3b510..c9c4fe6021 100644
--- a/include/wx/generic/tabg.h
+++ b/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);
diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index c714b51705..218f8c6f1c 100644
--- a/include/wx/generic/textdlgg.h
+++ b/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);
 };
 
diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 1e50878b7a..9243f60a9d 100644
--- a/include/wx/generic/treectlg.h
+++ b/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() {}
diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 8d6b64936d..3fbe31a466 100644
--- a/include/wx/generic/wizard.h
+++ b/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);
 };
 
diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 5ba99c131b..557b7d1774 100644
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -214,7 +214,7 @@ public:
     virtual bool InitGLVisual(const int *attribList);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGLApp)
+    wxDECLARE_DYNAMIC_CLASS(wxGLApp);
 };
 
 #endif // !wxGL_APP_DEFINED
diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 6ab3cab2bf..f8d016f216 100644
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -128,7 +128,7 @@ protected:
     virtual wxObjectRefData* CreateRefData() const wxOVERRIDE;
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxGraphicsObject)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsObject);
 };
 
 class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject
@@ -137,7 +137,7 @@ public:
     wxGraphicsPen() {}
     virtual ~wxGraphicsPen() {}
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsPen)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsPen);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
@@ -148,7 +148,7 @@ public:
     wxGraphicsBrush() {}
     virtual ~wxGraphicsBrush() {}
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsBrush);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
@@ -159,7 +159,7 @@ public:
     wxGraphicsFont() {}
     virtual ~wxGraphicsFont() {}
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsFont)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsFont);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
@@ -185,7 +185,7 @@ public:
     { return (wxGraphicsBitmapData*) GetRefData(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsBitmap);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
@@ -251,7 +251,7 @@ public:
     { return (wxGraphicsMatrixData*) GetRefData(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsMatrix)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsMatrix);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
@@ -337,7 +337,7 @@ public:
     { return (wxGraphicsPathData*) GetRefData(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGraphicsPath)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsPath);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;
@@ -741,7 +741,7 @@ protected:
                                          const wxGraphicsBrush& backgroundBrush);
 
     wxDECLARE_NO_COPY_CLASS(wxGraphicsContext);
-    DECLARE_ABSTRACT_CLASS(wxGraphicsContext)
+    wxDECLARE_ABSTRACT_CLASS(wxGraphicsContext);
 };
 
 #if 0
@@ -774,7 +774,7 @@ private:
     wxGraphicsMatrix* m_matrix;
     wxGraphicsPath* m_path;
 
-    DECLARE_DYNAMIC_CLASS(wxGraphicsFigure)
+    wxDECLARE_DYNAMIC_CLASS(wxGraphicsFigure);
 };
 
 #endif
@@ -887,7 +887,7 @@ public:
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer);
-    DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
+    wxDECLARE_ABSTRACT_CLASS(wxGraphicsRenderer);
 };
 
 
diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h
index 3046ddfe58..f07fdea939 100644
--- a/include/wx/gtk/animate.h
+++ b/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__
diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 43233e09e5..6db7b43f99 100644
--- a/include/wx/gtk/app.h
+++ b/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_
diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index c6dc0ba533..f472b87448 100644
--- a/include/wx/gtk/bitmap.h
+++ b/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_
diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index f70e28ceb7..70b4d4326d 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/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_
diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index 9714b5c190..57b464aa81 100644
--- a/include/wx/gtk/bmpcbox.h
+++ b/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_
diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 98612eb9b3..7f88eb1aef 100644
--- a/include/wx/gtk/brush.h
+++ b/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_
diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index cdc9119644..47e43b011e 100644
--- a/include/wx/gtk/button.h
+++ b/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_
diff --git a/include/wx/gtk/calctrl.h b/include/wx/gtk/calctrl.h
index 195b873412..81be1cd638 100644
--- a/include/wx/gtk/calctrl.h
+++ b/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);
 };
 
diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 0aa970d920..8068f0b556 100644
--- a/include/wx/gtk/checkbox.h
+++ b/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_
diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 0bd9a2babb..a12eb180da 100644
--- a/include/wx/gtk/checklst.h
+++ b/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_
diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index cef21a5b12..ce43533dd3 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -111,7 +111,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 
diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 2c46b368c0..b2316067e5 100644
--- a/include/wx/gtk/clipbrd.h
+++ b/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_
diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index eb7a63b607..b9894b5309 100644
--- a/include/wx/gtk/clrpicker.h
+++ b/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_
diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h
index 52d2af4bfa..3942e5b4c8 100644
--- a/include/wx/gtk/collpane.h
+++ b/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_
diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h
index 75d76a0f4d..784c6545d4 100644
--- a/include/wx/gtk/colordlg.h
+++ b/include/wx/gtk/colordlg.h
@@ -42,7 +42,7 @@ protected:
 
     wxColourData m_data;
 
-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
 };
 
 #endif
diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 605c28cad6..86e74e5720 100644
--- a/include/wx/gtk/colour.h
+++ b/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_
diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 2fc432ae5d..880ec67c8e 100644
--- a/include/wx/gtk/combobox.h
+++ b/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_
diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 009da4cf48..ce7a3a6ab0 100644
--- a/include/wx/gtk/control.h
+++ b/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_
diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 9b99370a02..51d106d445 100644
--- a/include/wx/gtk/cursor.h
+++ b/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_
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 90d302c868..f2064218aa 100644
--- a/include/wx/gtk/dataview.h
+++ b/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);
 };
 
diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index c016eec845..a3ca0a5661 100644
--- a/include/wx/gtk/dc.h
+++ b/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
diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index c6fc425827..93e80960d0 100644
--- a/include/wx/gtk/dcclient.h
+++ b/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_
diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 758ea4c0e4..3f7e7c057a 100644
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -51,7 +51,7 @@ private:
 
     void Init();
 
-    DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index 842e24bcc9..f59d6e3636 100644
--- a/include/wx/gtk/dcscreen.h
+++ b/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_
diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index d26dffbe7c..b64a0dc510 100644
--- a/include/wx/gtk/dialog.h
+++ b/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_
diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h
index 4f0712815e..1e4473ee66 100644
--- a/include/wx/gtk/dirdlg.h
+++ b/include/wx/gtk/dirdlg.h
@@ -57,7 +57,7 @@ protected:
 private:
     wxString m_selectedDirectory;
 
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 
 #endif // __GTKDIRDLGH__
diff --git a/include/wx/gtk/dvrenderer.h b/include/wx/gtk/dvrenderer.h
index a160e1715e..e463deb903 100644
--- a/include/wx/gtk/dvrenderer.h
+++ b/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_
diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 416e0ee98f..ee3a4bcd4c 100644
--- a/include/wx/gtk/dvrenderers.h
+++ b/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);
 };
 
 // -------------------------------------
diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index 4cfbf69aff..b2fad39cb6 100644
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -135,7 +135,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl )
+    wxDECLARE_DYNAMIC_CLASS(wxGtkFileCtrl);
 };
 
 #endif // wxUSE_FILECTRL
diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index edde44fa97..5db235f5c4 100644
--- a/include/wx/gtk/filedlg.h
+++ b/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_
diff --git a/include/wx/gtk/filehistory.h b/include/wx/gtk/filehistory.h
index 3c837fcb6c..edeb175455 100644
--- a/include/wx/gtk/filehistory.h
+++ b/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_
diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h
index 27e1fdc779..e9247c36e2 100644
--- a/include/wx/gtk/filepicker.h
+++ b/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
diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 216f88d107..d24c807c19 100644
--- a/include/wx/gtk/font.h
+++ b/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_
diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h
index 179af47042..bab724c904 100644
--- a/include/wx/gtk/fontdlg.h
+++ b/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
diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index cbbd188e58..ce56da14d0 100644
--- a/include/wx/gtk/fontpicker.h
+++ b/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_
diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 116efb6a5a..a7ddaa8e8a 100644
--- a/include/wx/gtk/frame.h
+++ b/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_
diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 98792657b7..1e6ff39202 100644
--- a/include/wx/gtk/gauge.h
+++ b/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
diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index e891a0a4c5..1a2d6734e7 100644
--- a/include/wx/gtk/glcanvas.h
+++ b/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_
diff --git a/include/wx/gtk/hyperlink.h b/include/wx/gtk/hyperlink.h
index 25464d6e47..b048160267 100644
--- a/include/wx/gtk/hyperlink.h
+++ b/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_
diff --git a/include/wx/gtk/listbox.h b/include/wx/gtk/listbox.h
index 22960abe6f..323ca9d9be 100644
--- a/include/wx/gtk/listbox.h
+++ b/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_
diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 380fab2da5..013c5cf878 100644
--- a/include/wx/gtk/mdi.h
+++ b/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_
diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 97df608564..baec0a0e7f 100644
--- a/include/wx/gtk/menu.h
+++ b/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
diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 61cd61627e..376959b32e 100644
--- a/include/wx/gtk/menuitem.h
+++ b/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_
diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 66f3d07596..57a6f28c3a 100644
--- a/include/wx/gtk/minifram.h
+++ b/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() {}
diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index 4aa1c93767..5a55f32a50 100644
--- a/include/wx/gtk/msgdlg.h
+++ b/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_
diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 63384d6d3f..395927cc69 100644
--- a/include/wx/gtk/notebook.h
+++ b/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_
diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 38f6544d80..40f809b5ef 100644
--- a/include/wx/gtk/pen.h
+++ b/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_
diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 26c8096300..566a7c05b4 100644
--- a/include/wx/gtk/popupwin.h
+++ b/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_
diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index ac17d52e83..b01b3cd524 100644
--- a/include/wx/gtk/print.h
+++ b/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
diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 7c32c97693..9e7df61a93 100644
--- a/include/wx/gtk/radiobox.h
+++ b/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_
diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 34234d78d5..340c671c1e 100644
--- a/include/wx/gtk/radiobut.h
+++ b/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_
diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 513c4e390f..f8282c6ba8 100644
--- a/include/wx/gtk/region.h
+++ b/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);
 };
 
 
diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 73bb500453..ceac3fd209 100644
--- a/include/wx/gtk/scrolbar.h
+++ b/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_
diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 6f15468e94..7dfc2ac772 100644
--- a/include/wx/gtk/slider.h
+++ b/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_
diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 25f1728ef5..ae974200b7 100644
--- a/include/wx/gtk/spinbutt.h
+++ b/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_
diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index db3f1b8b60..4972737cf2 100644
--- a/include/wx/gtk/spinctrl.h
+++ b/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_
diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index 094dd02627..e79255ee3a 100644
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -52,7 +52,7 @@ public:
 private:
     wxBitmap   m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 };
 
 #endif // __GTKSTATICBITMAPH__
diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 3158fb1590..7dd72b86ff 100644
--- a/include/wx/gtk/statbox.h
+++ b/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_
diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index aa4077671f..97501d609a 100644
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -39,7 +39,7 @@ public:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // wxUSE_STATLINE
diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index bc5e50f310..b94f399a50 100644
--- a/include/wx/gtk/stattext.h
+++ b/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
diff --git a/include/wx/gtk/taskbar.h b/include/wx/gtk/taskbar.h
index 1b358edda6..d351904c4b 100644
--- a/include/wx/gtk/taskbar.h
+++ b/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_
diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index e54668b108..921538b726 100644
--- a/include/wx/gtk/textctrl.h
+++ b/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_
diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 9100cf3f3d..bce1405aa8 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/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_
diff --git a/include/wx/gtk/toolbar.h b/include/wx/gtk/toolbar.h
index 251d3abda1..8ad323b5f0 100644
--- a/include/wx/gtk/toolbar.h
+++ b/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
diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h
index 25c682b428..dbed48993c 100644
--- a/include/wx/gtk/tooltip.h
+++ b/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_
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 13683f64de..35ac4e8adc 100644
--- a/include/wx/gtk/window.h
+++ b/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);
 };
 
diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index ea7441249f..0542f675fb 100644
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -71,7 +71,7 @@ private:
     // true if we're inside an assert modal dialog
     bool m_isInAssert;
 
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 };
 
 #endif // __GTKAPPH__
diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 6eb72a95c5..f4154fe317 100644
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -53,7 +53,7 @@ public:
     GdkBitmap *GetBitmap() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 };
 
 //-----------------------------------------------------------------------------
@@ -147,7 +147,7 @@ private:
     friend class wxBitmapHandler;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 40dc99d9bb..8c08f3d575 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -66,7 +66,7 @@ protected:
     void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // __BMPBUTTONH__
diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 7b71146bd0..2c6acb029a 100644
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -58,7 +58,7 @@ private:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // __GTKBRUSHH__
diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index d7909905d4..eddce05960 100644
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -61,7 +61,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 #endif // __GTKBUTTONH__
diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 2cc90a1703..61e3daa31e 100644
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -59,7 +59,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
 
 #endif // __GTKCHECKBOXH__
diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index bf20d53f55..3607ad5dc1 100644
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -53,7 +53,7 @@ public:
     int GetItemHeight() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif   //__GTKCHECKLISTH__
diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 83fb38db79..cedff268cc 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -104,7 +104,7 @@ public:
     int m_selection_hack;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 
diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 18d1d9d400..694e6adbf7 100644
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -67,7 +67,7 @@ public:
     wxDataObject     *m_receivedData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif
diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 6b780f7c6b..87d48fc65f 100644
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -45,7 +45,7 @@ protected:
 
     wxColourData m_data;
 
-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
 };
 
 #endif
diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 3c18f74368..b6deeea30b 100644
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -63,7 +63,7 @@ protected:
     InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // __GTKCOLOURH__
diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 585318f4b3..55a828207c 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -176,8 +176,8 @@ protected:
     virtual bool UseGTKStyleBase() const { return true; }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index c9b8982088..2f526a533e 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -98,7 +98,7 @@ protected:
     wxString m_label;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
+    wxDECLARE_DYNAMIC_CLASS(wxControl);
 };
 
 #endif // __GTKCONTROLH__
diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 9832ef8e40..63a743df3a 100644
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -55,7 +55,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif // __GTKCURSORH__
diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index a6d571f8eb..0771c6321d 100644
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -51,7 +51,7 @@ public:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxDC)
+    wxDECLARE_ABSTRACT_CLASS(wxDC);
 };
 
 // this must be defined when wxDC::Blit() honours the DC origian and needed to
diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 142268273a..bf9a8da0d3 100644
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -124,7 +124,7 @@ public:
     GdkWindow *GetWindow() { return m_window; }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -141,7 +141,7 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxClientDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ public:
     wxPaintDCImpl(wxDC *owner, wxWindow *win);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxPaintDCImpl);
 };
 
 #endif // __GTKDCCLIENTH__
diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 0c55c755d8..88705f9d08 100644
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -61,7 +61,7 @@ public:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl);
 };
 
 #endif // __GTKDCMEMORYH__
diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index 17adad8811..e8610e1eff 100644
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -31,7 +31,7 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxScreenDCImpl);
 };
 
 #endif // __GTKDCSCREENH__
diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index a5adcebec5..d4d068ea40 100644
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -57,8 +57,8 @@ protected:
     void Init();
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
 };
 
 #endif // __GTKDIALOGH__
diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 41ed774ea4..1acbfa6ed1 100644
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -60,8 +60,8 @@ public:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
+    wxDECLARE_EVENT_TABLE();
     void OnFakeOk( wxCommandEvent &event );
 };
 
diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 2bc317d630..0284f3d6b9 100644
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -134,7 +134,7 @@ protected:
     virtual wxFontFamily DoGetFamily() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // __GTKFONTH__
diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h
index 5f77c549f3..bf0af76922 100644
--- a/include/wx/gtk1/fontdlg.h
+++ b/include/wx/gtk1/fontdlg.h
@@ -33,7 +33,7 @@ protected:
     virtual bool DoCreate(wxWindow *parent);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFontDialog);
 };
 
 #endif
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 5df008daba..8d6914525e 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -100,7 +100,7 @@ public:
 
 #endif // wxUSE_MENUS_NATIVE
 
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif // __GTKFRAMEH__
diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 4e7cbb7e6e..89c9baff76 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -69,7 +69,7 @@ protected:
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
 };
 
 #endif
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 222225e0d9..bb4cd67323 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -101,7 +101,7 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_8
 
 private:
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_
diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 96968fc153..407108b5ff 100644
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -133,7 +133,7 @@ private:
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
 };
 
 #endif // __GTKLISTBOXH__
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 301ab4c482..304d12089e 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -69,7 +69,7 @@ public:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 //-----------------------------------------------------------------------------
@@ -124,8 +124,8 @@ private:
 
     GtkNotebook *GTKGetNotebook() const;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
 };
 
 //-----------------------------------------------------------------------------
@@ -141,7 +141,7 @@ public:
                               long style = wxVSCROLL | wxHSCROLL);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
 
 #endif // _WX_GTK1_MDI_H_
diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index b3285c7d11..410a601024 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -49,7 +49,7 @@ public:
 private:
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 //-----------------------------------------------------------------------------
@@ -94,7 +94,7 @@ private:
 
     GtkWidget *m_prevRadio;
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 #endif
diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index a36b1b2fc7..9085e91b97 100644
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -70,7 +70,7 @@ private:
     GtkWidget *m_menuItem;  // GtkMenuItem
     GtkWidget* m_labelWidget; // Label widget
 
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif
diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index 84e3104cbc..8e422a5583 100644
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxMiniFrame;
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
     wxMiniFrame() {}
diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index 444f5a798e..a2bd717ff8 100644
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -44,7 +44,7 @@ private:
     wxString m_caption;
     wxString m_message;
 
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
 };
 
 #endif
diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 45e7db965f..72bddce086 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -141,8 +141,8 @@ private:
     // the padding set by SetPadding()
     int m_padding;
 
-    DECLARE_DYNAMIC_CLASS(wxNotebook)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxNotebook);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index e2e593127a..77e754ec4c 100644
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -71,7 +71,7 @@ private:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif // __GTKPENH__
diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h
index b053b519de..7863507c69 100644
--- a/include/wx/gtk1/popupwin.h
+++ b/include/wx/gtk1/popupwin.h
@@ -46,8 +46,8 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
 };
 
 #endif // __GTKPOPUPWINDOWH__
diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index c6cac92ad9..edcd231196 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -129,7 +129,7 @@ protected:
     void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };
 
 #endif // _WX_GTK_RADIOBOX_H_
diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index 153dd275cf..f3cbde2024 100644
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -60,7 +60,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
 };
 
 #endif // __GTKRADIOBUTTONH__
diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 8647b94b80..3a2acb7e9f 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -82,7 +82,7 @@ protected:
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 // ----------------------------------------------------------------------------
@@ -117,7 +117,7 @@ private:
     wxRegion m_region;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 
diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 2a5baa7ff2..ac26af5712 100644
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -77,7 +77,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 #endif
diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index 0782415170..c4852c55aa 100644
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -67,7 +67,7 @@ public:
     float           m_oldPos;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 };
 
 #endif // __GTKSLIDERH__
diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
index 332628fd8d..f59970b1c7 100644
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -56,8 +56,8 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 };
 
 #endif
diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index 0b42fce248..45a7473ca0 100644
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -86,8 +86,8 @@ private:
 
     int m_base;
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index e67d425258..ed3f1315c5 100644
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -52,7 +52,7 @@ public:
 private:
     wxBitmap   m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 };
 
 #endif // __GTKSTATICBITMAPH__
diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index 089c3488c9..f94890ce9f 100644
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -45,7 +45,7 @@ protected:
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 };
 
 #endif // __GTKSTATICBOXH__
diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index b1be2ce3cc..8759194cb5 100644
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -39,7 +39,7 @@ public:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // wxUSE_STATLINE
diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index fd70468c9a..a9b9a221db 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -49,7 +49,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticText);
 };
 
 #endif // __GTKSTATICTEXTH__
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index ebb07ea642..cfc6eaf87b 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -187,8 +187,8 @@ private:
     bool        m_updateFont:1;
     bool        m_ignoreNextUpdate:1;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 #endif // __GTKTEXTCTRLH__
diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 60c9f8981d..aa0aa8c019 100644
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -75,7 +75,7 @@ public:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleBitmapButton);
 };
 
 //-----------------------------------------------------------------------------
@@ -129,7 +129,7 @@ public:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
 };
 
 #endif // _WX_GTK_TOGGLEBUTTON_H_
diff --git a/include/wx/gtk1/toolbar.h b/include/wx/gtk1/toolbar.h
index 6b6f05990a..0e25d1cb94 100644
--- a/include/wx/gtk1/toolbar.h
+++ b/include/wx/gtk1/toolbar.h
@@ -93,7 +93,7 @@ protected:
                                           const wxString& label);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
 };
 
 #endif // wxUSE_TOOLBAR
diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h
index e293160c8f..77ced7e7da 100644
--- a/include/wx/gtk1/tooltip.h
+++ b/include/wx/gtk1/tooltip.h
@@ -51,7 +51,7 @@ private:
     wxString     m_text;
     wxWindow    *m_window;
 
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
+    wxDECLARE_ABSTRACT_CLASS(wxToolTip);
 };
 
 #endif // __GTKTOOLTIPH__
diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index 304a3d91c8..f1a1a9265a 100644
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -357,7 +357,7 @@ protected:
                               wxTreeItemData *data);
 
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 };
 
 #endif
diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index a7fd1e9bac..7b5dd3c3ff 100644
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -264,7 +264,7 @@ protected:
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowGTK);
     wxDECLARE_NO_COPY_CLASS(wxWindowGTK);
 };
 
diff --git a/include/wx/hash.h b/include/wx/hash.h
index 1da1d21fc7..ea4e3021b2 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -275,7 +275,7 @@ private:
         virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
             { delete (eltype*)node->GetData(); }                              \
                                                                               \
-        DECLARE_NO_COPY_CLASS(hashclass)                                      \
+        wxDECLARE_NO_COPY_CLASS(hashclass);                                   \
     }
 
 
diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 4203954597..928ed7aa5e 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -232,7 +232,7 @@ private:
     void OnRClick(wxHeaderCtrlEvent& event);
 #endif // wxUSE_MENUS
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -418,7 +418,7 @@ protected:
     unsigned int m_order;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHeaderCtrlEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHeaderCtrlEvent);
 };
 
 
diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 9a924fd38e..f3cb199de4 100644
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -96,7 +96,7 @@ public:
 protected:
     wxWindow* m_parentWindow;
 private:
-    DECLARE_CLASS(wxHelpControllerBase)
+    wxDECLARE_CLASS(wxHelpControllerBase);
 };
 
 #endif // wxUSE_HELP
diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index dfa7cf5a6d..54c27afbe0 100644
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -41,7 +41,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpController);
 
 public:
     wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);
diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 5b4480379b..8c4aad9238 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -161,7 +161,7 @@ private:
 
 class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlHelpData)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpData);
     friend class wxHtmlSearchStatus;
 
 public:
diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index fd86b2e3f3..0f1f0eb884 100644
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpDialog);
 
 public:
     wxHtmlHelpDialog(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -79,7 +79,7 @@ protected:
     wxHtmlHelpWindow *m_HtmlHelpWin;
     wxHtmlHelpController* m_helpController;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);
 };
 
diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 302531dc6c..6bd3153493 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -67,7 +67,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame);
 
 public:
     wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -148,7 +148,7 @@ protected:
 
 private:
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame);
 };
 
diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index 803c0da14b..3626a9a3d8 100644
--- a/include/wx/html/helpwnd.h
+++ b/include/wx/html/helpwnd.h
@@ -76,7 +76,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpWindow : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlHelpWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlHelpWindow);
 
 public:
     wxHtmlHelpWindow(wxHtmlHelpData* data = NULL) { Init(data); }
@@ -261,7 +261,7 @@ private:
     void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow);
 };
 
diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 4f8b8c284c..0499f24f62 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -356,7 +356,7 @@ protected:
     // unique identifier of the cell, generated from "id" property of tags
     wxString m_id;
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlCell);
 };
 
@@ -399,7 +399,7 @@ protected:
     wxString m_Word;
     bool     m_allowLinebreak;
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlWordCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlWordCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlWordCell);
 };
 
@@ -541,7 +541,7 @@ protected:
             // Maximum possible length if ignoring line wrap
 
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlContainerCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell);
 };
 
@@ -565,7 +565,7 @@ protected:
     wxColour m_Colour;
     unsigned m_Flags;
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlColourCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlColourCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlColourCell);
 };
 
@@ -589,7 +589,7 @@ public:
 protected:
     wxFont m_Font;
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlFontCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlFontCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlFontCell);
 };
 
@@ -625,7 +625,7 @@ protected:
     int m_WidthFloat;
             // width float is used in adjustWidth (it is in percents)
 
-    DECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlWidgetCell);
 };
 
diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 2fdc5b9094..a4a03442da 100644
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -26,7 +26,7 @@
 
 class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlFilter);
 
 public:
     wxHtmlFilter() : wxObject() {}
@@ -52,7 +52,7 @@ public:
 
 class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText);
 
 public:
     virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
@@ -66,7 +66,7 @@ public:
 
 class wxHtmlFilterHTML : public wxHtmlFilter
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML);
 
     public:
         virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index 86612f168e..976ed93af3 100644
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -49,7 +49,7 @@ enum wxHtmlURLType
 // 2 tags.
 class WXDLLIMPEXP_HTML wxHtmlParser : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlParser)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlParser);
 
 public:
     wxHtmlParser();
@@ -215,7 +215,7 @@ protected:
 // 3. Handler restores original state of the parser
 class WXDLLIMPEXP_HTML wxHtmlTagHandler : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlTagHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlTagHandler);
 
 public:
     wxHtmlTagHandler() : wxObject () { m_Parser = NULL; }
@@ -264,7 +264,7 @@ protected:
 // both named entities and &#xxxx entries where xxxx is Unicode code.
 class WXDLLIMPEXP_HTML wxHtmlEntitiesParser : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser);
 
 public:
     wxHtmlEntitiesParser();
diff --git a/include/wx/html/htmlproc.h b/include/wx/html/htmlproc.h
index d608b58ff9..73e22459f7 100644
--- a/include/wx/html/htmlproc.h
+++ b/include/wx/html/htmlproc.h
@@ -30,7 +30,7 @@ enum
 
 class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlProcessor)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlProcessor);
 
 public:
     wxHtmlProcessor() : wxObject(), m_enabled(true) {}
diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 3e88a83795..82ef6132ac 100644
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -235,7 +235,7 @@ class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
                                       public wxHtmlWindowInterface,
                                       public wxHtmlWindowMouseHelper
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlWindow);
     friend class wxHtmlWinModule;
 
 public:
@@ -555,7 +555,7 @@ private:
     static wxCursor *ms_cursorText;
     static wxCursor *ms_cursorDefault;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlWindow);
 };
 
@@ -602,7 +602,7 @@ private:
 
     bool m_bLinkWasClicked;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlCellEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlCellEvent);
 };
 
 
@@ -629,7 +629,7 @@ public:
 private:
     wxHtmlLinkInfo m_linkInfo;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlLinkEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlLinkEvent);
 };
 
 
diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h
index 58603ac086..bdcc9ec540 100644
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -58,7 +58,7 @@ I STRONGLY recommend reading and understanding these macros!!
 #define TAGS_MODULE_BEGIN(name)                                           \
     class wxHTML_Module##name : public wxHtmlTagsModule                   \
     {                                                                     \
-        DECLARE_DYNAMIC_CLASS(wxHTML_Module##name )                       \
+        wxDECLARE_DYNAMIC_CLASS(wxHTML_Module##name );                    \
         public:                                                           \
             void FillHandlersTable(wxHtmlWinParser *parser)               \
                 {
@@ -75,7 +75,7 @@ I STRONGLY recommend reading and understanding these macros!!
 #define TAGS_MODULE_END(name)                                             \
                 }                                                         \
     };                                                                    \
-    IMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule);
 
 
 
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 66f8ae5ce5..63c366e481 100644
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -28,7 +28,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
 class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
 {
 public:
-    DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxWebKitCtrl);
 
     wxWebKitCtrl() {}
     wxWebKitCtrl(wxWindow *parent,
@@ -97,7 +97,7 @@ public:
     void OnMove(wxMoveEvent &event);
     void OnMouseEvents(wxMouseEvent &event);
 protected:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void MacVisibilityChanged();
 
 private:
@@ -140,7 +140,7 @@ enum {
 
 class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent
 {
-    DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
+    wxDECLARE_DYNAMIC_CLASS(wxWebKitBeforeLoadEvent);
 
 public:
     bool IsCancelled() { return m_cancelled; }
@@ -161,7 +161,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent
 {
-    DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
+    wxDECLARE_DYNAMIC_CLASS(wxWebKitStateChangedEvent);
 
 public:
     int GetState() { return m_state; }
@@ -180,7 +180,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
 {
-    DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent )
+    wxDECLARE_DYNAMIC_CLASS(wxWebKitNewWindowEvent);
 public:
     wxString GetURL() const { return m_url; }
     void SetURL(const wxString& url) { m_url = url; }
diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index ac7a3f70b1..7a74de8376 100644
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
 
 class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlWinParser)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlWinParser);
     friend class wxHtmlWindow;
 
 public:
@@ -258,7 +258,7 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlStyleParams;
 
 class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler);
 
 public:
     wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
@@ -288,7 +288,7 @@ protected:
 
 class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlTagsModule);
 
 public:
     wxHtmlTagsModule() : wxModule() {}
diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index c7e27ee809..f28ded7ba4 100644
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_HTML wxHtmlListBox : public wxVListBox,
                                        public wxHtmlWindowInterface,
                                        public wxHtmlWindowMouseHelper
 {
-    DECLARE_ABSTRACT_CLASS(wxHtmlListBox)
+    wxDECLARE_ABSTRACT_CLASS(wxHtmlListBox);
 public:
     // constructors and such
     // ---------------------
@@ -183,7 +183,7 @@ private:
     friend class wxHtmlListBoxWinInterface;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlListBox);
 };
 
@@ -198,7 +198,7 @@ private:
 class WXDLLIMPEXP_HTML wxSimpleHtmlListBox :
     public wxWindowWithItems<wxHtmlListBox, wxItemContainer>
 {
-    DECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox)
+    wxDECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox);
 public:
     // wxListbox-compatible constructors
     // ---------------------------------
diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 60a7def61e..b74bcf140c 100644
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -117,7 +117,7 @@ private:
     // URL associated with the hyperlink control that the used clicked on.
     wxString m_url;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHyperlinkEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHyperlinkEvent);
 };
 
 
diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 22f0cae14c..704c58f248 100644
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -126,7 +126,7 @@ private:
     // delete all icons
     void DeleteIcons();
 
-    DECLARE_DYNAMIC_CLASS(wxIconBundle)
+    wxDECLARE_DYNAMIC_CLASS(wxIconBundle);
 };
 
 #endif // _WX_ICONBNDL_H_
diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index ed90bdd8b1..a4a6527eed 100644
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -65,7 +65,7 @@ protected:
 #endif // wxUSE_STREAMS
 
 private:
-     DECLARE_DYNAMIC_CLASS(wxBMPHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBMPHandler);
 };
 
 #if wxUSE_ICO_CUR
@@ -95,7 +95,7 @@ protected:
 #endif // wxUSE_STREAMS
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxICOHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxICOHandler);
 };
 
 
@@ -124,7 +124,7 @@ protected:
 #endif // wxUSE_STREAMS
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCURHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxCURHandler);
 };
 // ----------------------------------------------------------------------------
 // wxANIHandler
@@ -152,7 +152,7 @@ protected:
 #endif // wxUSE_STREAMS
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxANIHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxANIHandler);
 };
 
 #endif // wxUSE_ICO_CUR
diff --git a/include/wx/image.h b/include/wx/image.h
index 29931d9cbb..0f95c001d2 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -171,7 +171,7 @@ protected:
     wxBitmapType m_type;
 
 private:
-    DECLARE_CLASS(wxImageHandler)
+    wxDECLARE_CLASS(wxImageHandler);
 };
 
 //-----------------------------------------------------------------------------
@@ -622,7 +622,7 @@ private:
     bool DoSave(wxImageHandler& handler, wxOutputStream& stream) const;
 #endif // wxUSE_STREAMS
 
-    DECLARE_DYNAMIC_CLASS(wxImage)
+    wxDECLARE_DYNAMIC_CLASS(wxImage);
 };
 
 
diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index 0d149e7b27..b59744c0cb 100644
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -84,7 +84,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGIFHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxGIFHandler);
 };
 
 #endif // wxUSE_GIF
diff --git a/include/wx/imagiff.h b/include/wx/imagiff.h
index 7a6c5e76ce..78c6561088 100644
--- a/include/wx/imagiff.h
+++ b/include/wx/imagiff.h
@@ -35,7 +35,7 @@ protected:
     virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE;
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxIFFHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxIFFHandler);
 };
 
 #endif // wxUSE_IMAGE && wxUSE_IFF
diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 4f124af32c..342aa7e99c 100644
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -43,7 +43,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxJPEGHandler);
 };
 
 #endif // wxUSE_LIBJPEG
diff --git a/include/wx/imagpcx.h b/include/wx/imagpcx.h
index 3337e21e50..210bbb3233 100644
--- a/include/wx/imagpcx.h
+++ b/include/wx/imagpcx.h
@@ -36,7 +36,7 @@ protected:
 #endif // wxUSE_STREAMS
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPCXHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxPCXHandler);
 };
 #endif // wxUSE_PCX
 
diff --git a/include/wx/imagpng.h b/include/wx/imagpng.h
index 20c6f294c3..e30cf73845 100644
--- a/include/wx/imagpng.h
+++ b/include/wx/imagpng.h
@@ -57,7 +57,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPNGHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxPNGHandler);
 };
 
 #endif
diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 8d49897829..0f3f460ad8 100644
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -38,7 +38,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPNMHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxPNMHandler);
 };
 #endif
 
diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h
index 8059ffd4f1..0c2c7d0a0d 100644
--- a/include/wx/imagtga.h
+++ b/include/wx/imagtga.h
@@ -38,7 +38,7 @@ protected:
     virtual bool DoCanRead(wxInputStream& stream) wxOVERRIDE;
 #endif // wxUSE_STREAMS
 
-    DECLARE_DYNAMIC_CLASS(wxTGAHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxTGAHandler);
 };
 
 #endif // wxUSE_TGA
diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 886453c508..0c7be8884a 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -50,7 +50,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxTIFFHandler);
 };
 
 #endif // wxUSE_LIBTIFF
diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index bf5cd5606c..1af34875e4 100644
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -36,7 +36,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxXPMHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxXPMHandler);
 };
 
 #endif // wxUSE_XPM
diff --git a/include/wx/init.h b/include/wx/init.h
index b3a9ff6a4e..0810cceb49 100644
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -21,7 +21,7 @@
 // do common initialization, return true if ok (in this case wxEntryCleanup
 // must be called later), otherwise the program can't use wxWidgets at all
 //
-// this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
+// this function also creates wxTheApp as a side effect, if wxIMPLEMENT_APP
 // hadn't been used a dummy default application object is created
 //
 // note that the parameters may be modified, this is why we pass them by
diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 1fc540e41d..864a2ec3ea 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -222,7 +222,7 @@ protected:
   bool          m_connected;
 
   wxDECLARE_NO_ASSIGN_CLASS(wxConnectionBase);
-  DECLARE_CLASS(wxConnectionBase)
+  wxDECLARE_CLASS(wxConnectionBase);
 };
 
 
@@ -238,7 +238,7 @@ public:
   // Callbacks to SERVER - override at will
   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) = 0;
 
-  DECLARE_CLASS(wxServerBase)
+  wxDECLARE_CLASS(wxServerBase);
 };
 
 class WXDLLIMPEXP_BASE wxClientBase : public wxObject
@@ -257,7 +257,7 @@ public:
   // Callbacks to CLIENT - override at will
   virtual wxConnectionBase *OnMakeConnection() = 0;
 
-  DECLARE_CLASS(wxClientBase)
+  wxDECLARE_CLASS(wxClientBase);
 };
 
 #endif // _WX_IPCBASEH__
diff --git a/include/wx/layout.h b/include/wx/layout.h
index 30d46c2490..829fa9d8e2 100644
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -147,7 +147,7 @@ protected:
     wxEdge otherEdge;
     bool done;
 
-    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
+    wxDECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint);
 };
 
 // ----------------------------------------------------------------------------
@@ -182,7 +182,7 @@ public:
                width.GetDone() && height.GetDone();
     }
 
-    DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
+    wxDECLARE_DYNAMIC_CLASS(wxLayoutConstraints);
 };
 
 #endif // wxUSE_CONSTRAINTS
diff --git a/include/wx/list.h b/include/wx/list.h
index 9448c9590f..9278a4f148 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -654,7 +654,7 @@ private:
     protected:                                                              \
         virtual void DeleteData();                                          \
                                                                             \
-        DECLARE_NO_COPY_CLASS(nodetype)                                     \
+        wxDECLARE_NO_COPY_CLASS(nodetype);                                  \
     };                                                                      \
                                                                             \
     classexp name : public wxListBase                                       \
diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 49f7252e55..dba43ffa44 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -366,7 +366,7 @@ protected:
     wxListItemAttr *m_attr;     // optional pointer to the items style
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxListItem)
+    wxDECLARE_DYNAMIC_CLASS(wxListItem);
 };
 
 // ----------------------------------------------------------------------------
@@ -533,7 +533,7 @@ protected:
     bool          m_editCancelled;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 98e0ba546b..5edfc0c6a8 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -99,8 +99,8 @@ private:
     void UpdateSize();
 
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 2feacada5f..1ed3b6cdfd 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -102,7 +102,7 @@ public:
     void ClearColumnImage(int col) { SetColumnImage(col, -1); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListView)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListView);
 };
 
 #endif // wxUSE_LISTCTRL
diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 144812a9e0..512a365fb4 100644
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -111,7 +111,7 @@ public:
 
 
     // Put this class on wxWidget's RTTI table
-    DECLARE_DYNAMIC_CLASS(wxMediaEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxMediaEvent);
 };
 
 // ----------------------------------------------------------------------------
@@ -228,7 +228,7 @@ protected:
     class wxMediaBackend* m_imp;
     bool m_bLoaded;
 
-    DECLARE_DYNAMIC_CLASS(wxMediaCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxMediaCtrl);
 };
 
 // ----------------------------------------------------------------------------
@@ -236,7 +236,7 @@ protected:
 // wxMediaBackend
 //
 // Derive from this and use standard wxWidgets RTTI
-// (DECLARE_DYNAMIC_CLASS and IMPLEMENT_CLASS) to make a backend
+// (wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_CLASS) to make a backend
 // for wxMediaCtrl.  Backends are searched alphabetically -
 // the one with the earliest letter is tried first.
 //
@@ -320,7 +320,7 @@ public:
     {                                   }
     virtual void RESERVED9() {}
 
-    DECLARE_DYNAMIC_CLASS(wxMediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxMediaBackend);
 };
 
 
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 6ca2205ddf..252ea54ea7 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -429,8 +429,8 @@ public:
 private:
     wxMenu *m_menu;
     wxString m_title;
-    
-    DECLARE_DYNAMIC_CLASS(wxMenuInfoHelper)
+
+    wxDECLARE_DYNAMIC_CLASS(wxMenuInfoHelper);
 };
 
 WX_DECLARE_EXPORTED_LIST(wxMenuInfoHelper, wxMenuInfoHelperList );
diff --git a/include/wx/module.h b/include/wx/module.h
index 96600b76ca..2fc8559dd8 100644
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -113,7 +113,7 @@ private:
     } m_state;
 
 
-    DECLARE_CLASS(wxModule)
+    wxDECLARE_CLASS(wxModule);
 };
 
 #endif // _WX_MODULE_H_
diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 1c048c6dca..4daba48c29 100644
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 1fb7f951ec..ead5545457 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -39,7 +39,7 @@ WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
 
 class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 
 public:
     wxApp();
diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 8a3bcf335c..9fc399a7fb 100644
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -52,7 +52,7 @@ protected:
 
     WXPixmap m_insensPixmap;
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // _WX_BMPBUTTN_H_
diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 29d201e111..423ea0b90f 100644
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -50,7 +50,7 @@ private:
     wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();
 
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 #endif // _WX_BUTTON_H_
diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index 0fc4c1e488..6ef7405e4e 100644
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -14,7 +14,7 @@
 // Checkbox item (single checkbox)
 class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 
 public:
     inline wxCheckBox() { Init(); }
diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index c197dedaa4..7bead5be47 100644
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 
 public:
     // ctors
@@ -69,7 +69,7 @@ public:
 private:
     void DoToggleItem( int item, int x );
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 625810d14c..327d7f5e81 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -23,7 +23,7 @@
 // Choice item
 class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 
 public:
     wxChoice();
diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index a70022659d..6da55bdfd7 100644
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -72,7 +72,7 @@ public:
     wxDataIdToDataObjectList m_idToObject;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // wxUSE_CLIPBOARD
diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index c30bbee091..1721614de0 100644
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -17,7 +17,7 @@
 // Colour
 class WXDLLIMPEXP_CORE wxColour : public wxColourBase
 {
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 public:
     // constructors
     // ------------
diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 15f2249a86..4eb14d5342 100644
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -126,7 +126,7 @@ private:
 public:
     bool m_inSetSelection;
 
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxComboBox);
 };
 
 #endif // _WX_COMBOBOX_H_
diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 88062ce02d..248f092017 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -18,7 +18,7 @@
 // General item class
 class WXDLLIMPEXP_CORE wxControl: public wxControlBase
 {
-    DECLARE_ABSTRACT_CLASS(wxControl)
+    wxDECLARE_ABSTRACT_CLASS(wxControl);
 
 public:
     wxControl();
@@ -68,7 +68,7 @@ protected:
     // Motif: prevent callbacks being called while in SetValue
     bool m_inSetValue;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_CONTROL_H_
diff --git a/include/wx/motif/ctrlsub.h b/include/wx/motif/ctrlsub.h
index 582cf854de..73eef28ff4 100644
--- a/include/wx/motif/ctrlsub.h
+++ b/include/wx/motif/ctrlsub.h
@@ -31,7 +31,7 @@ protected:
     }
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+    wxDECLARE_ABSTRACT_CLASS(wxControlWithItems);
     wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
 };
 
diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index b089ac8975..0658abc6ec 100644
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -60,7 +60,7 @@ private:
     // Make a cursor from standard id
     WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
 
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index 4a96162fdf..159145f029 100644
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -55,7 +55,7 @@ public:
         return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY;
     }
 
-    DECLARE_DYNAMIC_CLASS(wxMotifDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxMotifDCImpl);
 };
 
 #endif // _WX_DC_H_
diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 6dc0b0c522..2aaa4ac02a 100644
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -154,7 +154,7 @@ protected:
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp
 
-    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
@@ -165,7 +165,7 @@ public:
 
     virtual ~wxPaintDCImpl();
 
-    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxPaintDCImpl);
 };
 
 class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
@@ -175,7 +175,7 @@ public:
     wxClientDCImpl(wxDC *owner, wxWindow* win)
         : wxWindowDCImpl(owner, win) { }
 
-    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxClientDCImpl);
 };
 
 #endif // _WX_DCCLIENT_H_
diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 6a2e3e4e4d..2a56d8d41e 100644
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -37,7 +37,7 @@ private:
 
     wxBitmap m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/motif/dcprint.h b/include/wx/motif/dcprint.h
index d0e133cb51..7e0a9f2569 100644
--- a/include/wx/motif/dcprint.h
+++ b/include/wx/motif/dcprint.h
@@ -25,7 +25,7 @@ public:
 
     wxRect GetPaperRect() const;
 
-    DECLARE_CLASS(wxPrinterDCImpl)
+    wxDECLARE_CLASS(wxPrinterDCImpl);
 };
 
 #endif // _WX_DCPRINT_H_
diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h
index e12af87660..1b53041ca5 100644
--- a/include/wx/motif/dcscreen.h
+++ b/include/wx/motif/dcscreen.h
@@ -35,7 +35,7 @@ private:
     static int sm_overlayWindowX;
     static int sm_overlayWindowY;
 
-    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_DCSCREEN_H_
diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index f826926bfd..600179c553 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -82,7 +82,7 @@ protected:
 
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
 };
 
 #endif // _WX_DIALOG_H_
diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index 8a44a32add..83f24d769e 100644
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
 public:
 
     // For Motif
diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 300cb485b4..656cb743b6 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -157,7 +157,7 @@ protected:
     void Unshare();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_FONT_H_
diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 3815420d5e..78239dc598 100644
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -120,8 +120,8 @@ private:
 
 
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif // _WX_MOTIF_FRAME_H_
diff --git a/include/wx/motif/gauge.h b/include/wx/motif/gauge.h
index 1af241343e..6089ea9af0 100644
--- a/include/wx/motif/gauge.h
+++ b/include/wx/motif/gauge.h
@@ -14,7 +14,7 @@
 // Group box
 class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
 {
-    DECLARE_DYNAMIC_CLASS(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
 
 public:
     inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 8b2620bf4a..f09b9c8a8f 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -55,7 +55,7 @@ public:
     void CopyFromBitmap(const wxBitmap& bmp);
 
 
-    DECLARE_DYNAMIC_CLASS(wxIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxIcon);
 };
 
 #endif // _WX_ICON_H_
diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 0b8b91a59f..96aa3d3466 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 // List box item
 class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
 
 public:
     wxListBox();
diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 822a13d28b..388bd80e66 100644
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -100,7 +100,7 @@ private:
     // common code for both constructors:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 // ----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ public:
     wxColour      m_backgroundColour;
     wxFont        m_font;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 #endif // _WX_MOTIF_MENU_H_
diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 541e970a89..456358a2de 100644
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -61,7 +61,7 @@ private:
     wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
 
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif  // _WX_MOTIF_MENUITEM_H
diff --git a/include/wx/motif/minifram.h b/include/wx/motif/minifram.h
index f04a9ea989..50197cf0d4 100644
--- a/include/wx/motif/minifram.h
+++ b/include/wx/motif/minifram.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
 
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
     inline wxMiniFrame() {}
diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index c662da2deb..0a5a73aef2 100644
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -37,7 +37,7 @@ public:
 protected:
     long        m_result;
 
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
 };
 
 #endif // _WX_MSGBOXDLG_H_
diff --git a/include/wx/motif/popupwin.h b/include/wx/motif/popupwin.h
index 8ef11f1e1b..8c08fdb0d6 100644
--- a/include/wx/motif/popupwin.h
+++ b/include/wx/motif/popupwin.h
@@ -29,7 +29,7 @@ public:
 private:
     void Init() { m_isShown = false; }
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
 
 #endif // _WX_MOTIF_POPUPWIN_H_
diff --git a/include/wx/motif/print.h b/include/wx/motif/print.h
index 258a8091d8..5217f10178 100644
--- a/include/wx/motif/print.h
+++ b/include/wx/motif/print.h
@@ -19,7 +19,7 @@
 
 class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxPrinter);
 
 public:
     wxPrinter(wxPrintData *data = NULL);
@@ -37,7 +37,7 @@ public:
 
 class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
 {
-    DECLARE_CLASS(wxPrintPreview)
+    wxDECLARE_CLASS(wxPrintPreview);
 
 public:
     wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 80dc58d22e..a2ad8d7b23 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -128,7 +128,7 @@ protected:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };
 
 #endif // _WX_MOTIF_RADIOBOX_H_
diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index 072294e4bd..fdaa2ee0b9 100644
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -13,7 +13,7 @@
 
 class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
 public:
     wxRadioButton();
     virtual ~wxRadioButton() { RemoveFromCycle(); }
diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 2029f60b03..2881124ce7 100644
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -14,7 +14,7 @@
 // Scrollbar item
 class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
 {
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 
 public:
     inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
diff --git a/include/wx/motif/slider.h b/include/wx/motif/slider.h
index db86ca0952..8d36cb1263 100644
--- a/include/wx/motif/slider.h
+++ b/include/wx/motif/slider.h
@@ -16,7 +16,7 @@
 // Slider
 class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 
 public:
     wxSlider();
@@ -71,7 +71,7 @@ protected:
         int sizeFlags = wxSIZE_AUTO);
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index eed6f6ce83..0934abab5a 100644
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -15,7 +15,7 @@ class WXDLLIMPEXP_FWD_CORE wxArrowButton; // internal
 
 class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 
 public:
     wxSpinButton() : m_up( 0 ), m_down( 0 ), m_pos( 0 ) { }
diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index c19268b710..a597a040ab 100644
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 
 public:
     wxStaticBitmap() { }
diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index a33967cf5d..13dc048db5 100644
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -14,7 +14,7 @@
 // Group box
 class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 
 public:
     wxStaticBox();
@@ -51,7 +51,7 @@ private:
     WXWidget  m_labelWidget;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 7abec32193..e92780cd02 100644
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -13,7 +13,7 @@
 
 class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticText);
 
 public:
     wxStaticText() { }
diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 9ffe9d5a96..a4ea8ed42d 100644
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -106,8 +106,8 @@ public:
     bool      m_processedDefault;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 #endif
diff --git a/include/wx/motif/tglbtn.h b/include/wx/motif/tglbtn.h
index 68e731f5f6..7a9c908b0a 100644
--- a/include/wx/motif/tglbtn.h
+++ b/include/wx/motif/tglbtn.h
@@ -41,7 +41,7 @@ protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
 
     // common part of all constructors
     void Init()
diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index 021a896c6a..b55f72ac82 100644
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -75,7 +75,7 @@ private:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 private:
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
 };
 
 #endif
diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index d4cbc60d96..f4dfda12ed 100644
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -297,9 +297,9 @@ private:
     // common part of all ctors
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxWindow);
     wxDECLARE_NO_COPY_CLASS(wxWindow);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/mousemanager.h b/include/wx/mousemanager.h
index caa2abeaec..997bee01ea 100644
--- a/include/wx/mousemanager.h
+++ b/include/wx/mousemanager.h
@@ -144,7 +144,7 @@ private:
     wxPoint m_posLast;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     wxDECLARE_NO_COPY_CLASS(wxMouseEventsManager);
 };
diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 773321d6fa..b4e7303eaa 100644
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -58,7 +58,7 @@ private:
     size_t m_length;
 
     // copy ctor is implemented above: it copies the other stream in this one
-    DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)
+    wxDECLARE_ABSTRACT_CLASS(wxMemoryInputStream);
     wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);
 };
 
@@ -83,7 +83,7 @@ protected:
     wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
     wxFileOffset OnSysTell() const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryOutputStream);
     wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);
 };
 
diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 182662c209..325755784c 100644
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -38,7 +38,7 @@ public:
     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 };
 
 #endif
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index c5f6c2756d..174b78bf6e 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -111,9 +111,9 @@ public:
     static int m_nCmdShow;
 
 protected:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxApp);
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 };
 
 #ifdef __WXWINCE__
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 94072ac75e..33e78e87fc 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -230,7 +230,7 @@ private:
                          wxBitmapTransparency transp = wxBitmapTransparency_Auto);
 
 
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 // ----------------------------------------------------------------------------
@@ -274,7 +274,7 @@ public:
 protected:
     WXHBITMAP m_maskBitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 };
 
 
@@ -322,7 +322,7 @@ public:
                           const wxPalette *palette = NULL) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapHandler);
 };
 
 #endif
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index e435673c2b..066c0f4f4f 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -42,8 +42,8 @@ public:
                 const wxString& name = wxButtonNameStr);
 
 protected:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton);
 };
 
 #endif // _WX_BMPBUTTN_H_
diff --git a/include/wx/msw/bmpcbox.h b/include/wx/msw/bmpcbox.h
index 0462c46217..3530c1b591 100644
--- a/include/wx/msw/bmpcbox.h
+++ b/include/wx/msw/bmpcbox.h
@@ -127,9 +127,9 @@ private:
 
     bool m_inResize;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox);
 };
 
 #endif // _WX_MSW_BMPCBOX_H_
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 09c4f2fe76..3de73c57e0 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -54,7 +54,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_BRUSH_H_
diff --git a/include/wx/msw/calctrl.h b/include/wx/msw/calctrl.h
index c5c51d9fde..8fe57f7749 100644
--- a/include/wx/msw/calctrl.h
+++ b/include/wx/msw/calctrl.h
@@ -91,7 +91,7 @@ private:
     wxUint32 m_holidays;
 
 
-    DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxCalendarCtrl);
     wxDECLARE_NO_COPY_CLASS(wxCalendarCtrl);
 };
 
diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 7370ad6f11..a79a21da22 100644
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -74,7 +74,7 @@ private:
     // current state of the checkbox
     wxCheckBoxState m_state;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox);
 };
 
 #endif // _WX_CHECKBOX_H_
diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 21b8651ac0..9392f3e399 100644
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -81,8 +81,8 @@ protected:
 
     wxSize DoGetBestClientSize() const;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox);
 };
 
 #endif    //_CHECKLST_H
diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 16b3e07819..2758409c57 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -170,7 +170,7 @@ protected:
     // wxDefaultCoord if it hadn't
     int m_heightOwn;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice);
 };
 
 #endif // _WX_CHOICE_H_
diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 53e8a169f9..51c94afe04 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -81,7 +81,7 @@ private:
     IDataObject *m_lastDataObject;
     bool m_isOpened;
 
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // wxUSE_CLIPBOARD
diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index 76c7a37c74..fe9745427b 100644
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -67,7 +67,7 @@ protected:
     bool m_movedWindow;
 
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog);
 };
 
 #endif // _WX_COLORDLG_H_
diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 4b359fb370..07d72dc682 100644
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -66,7 +66,7 @@ private:
     unsigned char m_alpha;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // _WX_COLOUR_H_
diff --git a/include/wx/msw/combo.h b/include/wx/msw/combo.h
index 9ab1b30e73..eeb2edc244 100644
--- a/include/wx/msw/combo.h
+++ b/include/wx/msw/combo.h
@@ -106,9 +106,9 @@ private:
     int         m_animFlags;
 #endif
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_DYNAMIC_CLASS(wxComboCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxComboCtrl);
 };
 
 
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 449eb17266..c016fd3e17 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -167,8 +167,8 @@ private:
     // normally true, false if text events are currently disabled
     bool m_allowTextEvents;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_COMBOBOX
diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index f4969b3f0f..8aaf380889 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -130,7 +130,7 @@ protected:
     wxArrayLong m_subControls;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxControl);
 };
 
 #endif // _WX_CONTROL_H_
diff --git a/include/wx/msw/ctrlsub.h b/include/wx/msw/ctrlsub.h
index 068be29e58..e3d9d6e63a 100644
--- a/include/wx/msw/ctrlsub.h
+++ b/include/wx/msw/ctrlsub.h
@@ -34,7 +34,7 @@ protected:
     virtual WXHWND MSWGetItemsHWND() const { return GetHWND(); }
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+    wxDECLARE_ABSTRACT_CLASS(wxControlWithItems);
     wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
 };
 
diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index 8e5dcceb5b..7ff2d45de2 100644
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -42,7 +42,7 @@ protected:
     virtual wxGDIImageRefData *CreateData() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif
diff --git a/include/wx/msw/datectrl.h b/include/wx/msw/datectrl.h
index 7ec52f0349..e7f8da5c45 100644
--- a/include/wx/msw/datectrl.h
+++ b/include/wx/msw/datectrl.h
@@ -60,7 +60,7 @@ protected:
     virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); }
     virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);
 };
 
 #endif // _WX_MSW_DATECTRL_H_
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 8ec5a94729..193c2243ad 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -323,7 +323,7 @@ protected:
     static wxObjectList     sm_dcCache;
 #endif
 
-    DECLARE_CLASS(wxMSWDCImpl)
+    wxDECLARE_CLASS(wxMSWDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl);
 };
 
diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 9399e5c4be..10ac3ab571 100644
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -40,7 +40,7 @@ protected:
     // initialize the newly created DC
     void InitDC();
 
-    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_CLASS(wxWindowDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
@@ -60,7 +60,7 @@ public:
 protected:
     void InitDC();
 
-    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_CLASS(wxClientDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
@@ -85,7 +85,7 @@ protected:
     // Find the DC for this window in the cache, return NULL if not found.
     static wxPaintDCInfo *FindInCache(wxWindow* win);
 
-    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_CLASS(wxPaintDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
@@ -100,7 +100,7 @@ class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
 
-    DECLARE_CLASS(wxPaintDCEx)
+    wxDECLARE_CLASS(wxPaintDCEx);
     wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
 };
 
diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 59fdbc11b9..8c57173974 100644
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -36,7 +36,7 @@ protected:
     // initialize the newly created DC
     void Init();
 
-    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_CLASS(wxMemoryDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 85a60246dd..c3f223b512 100644
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -56,7 +56,7 @@ protected:
     wxPrintData m_printData;
 
 private:
-    DECLARE_CLASS(wxPrinterDCImpl)
+    wxDECLARE_CLASS(wxPrinterDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
 };
 
diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index f85bbe2ff3..839b585ab1 100644
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -25,7 +25,7 @@ public:
         GetDeviceSize(w, h);
     }
 
-    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_CLASS(wxScreenDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index 558f66c40e..cc3da0a1c3 100644
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -73,7 +73,7 @@ public:
   wxIPCFormat   m_dataType;
 
   wxDECLARE_NO_COPY_CLASS(wxDDEConnection);
-  DECLARE_DYNAMIC_CLASS(wxDDEConnection)
+  wxDECLARE_DYNAMIC_CLASS(wxDDEConnection);
 };
 
 class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase
@@ -98,7 +98,7 @@ protected:
     wxString  m_serviceName;
     wxDDEConnectionList m_connections;
 
-    DECLARE_DYNAMIC_CLASS(wxDDEServer)
+    wxDECLARE_DYNAMIC_CLASS(wxDDEServer);
 };
 
 class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase
@@ -128,7 +128,7 @@ protected:
     int       m_lastError;
     wxDDEConnectionList m_connections;
 
-    DECLARE_DYNAMIC_CLASS(wxDDEClient)
+    wxDECLARE_DYNAMIC_CLASS(wxDDEClient);
 };
 
 void WXDLLIMPEXP_BASE wxDDEInitialize();
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 5e6157426a..61e68d9f0e 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -134,7 +134,7 @@ private:
     // this pointer is non-NULL only while the modal event loop is running
     wxDialogModalData *m_modalData;
 
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
     wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index b6939581ee..365d97fea5 100644
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -32,7 +32,7 @@ private:
     int ShowSHBrowseForFolder(WXHWND owner);
     int ShowIFileDialog(WXHWND owner);
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog);
 };
 
 #endif
diff --git a/include/wx/msw/dragimag.h b/include/wx/msw/dragimag.h
index e08723511a..28671c070a 100644
--- a/include/wx/msw/dragimag.h
+++ b/include/wx/msw/dragimag.h
@@ -235,7 +235,7 @@ protected:
     bool            m_fullScreen;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDragImage)
+    wxDECLARE_DYNAMIC_CLASS(wxDragImage);
     wxDECLARE_NO_COPY_CLASS(wxDragImage);
 };
 
diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index 6ec8731cdf..b3ae3bb4c6 100644
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -78,7 +78,7 @@ private:
     wxString m_filename;
     WXHANDLE m_hMF;
 
-    DECLARE_DYNAMIC_CLASS(wxEnhMetaFile)
+    wxDECLARE_DYNAMIC_CLASS(wxEnhMetaFile);
 };
 
 // ----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ public:
     wxEnhMetaFile *Close();
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC);
 };
 
 #if wxUSE_DRAG_AND_DROP
diff --git a/include/wx/msw/fdrepdlg.h b/include/wx/msw/fdrepdlg.h
index af4de0d207..ac7ba48858 100644
--- a/include/wx/msw/fdrepdlg.h
+++ b/include/wx/msw/fdrepdlg.h
@@ -54,7 +54,7 @@ protected:
 
     wxFindReplaceDialogImpl *m_impl;
 
-    DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFindReplaceDialog);
     wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
 };
 
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index a1958bace7..0b230b0e89 100644
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -63,7 +63,7 @@ private:
     bool m_bMovedWindow;
     int m_centreDir;        // nothing to do if 0
 
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
     wxDECLARE_NO_COPY_CLASS(wxFileDialog);
 };
 
diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index c264621856..e46a62ca6e 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -166,7 +166,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_FONT_H_
diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 692d0c8102..9e5d1f66c7 100644
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -27,7 +27,7 @@ public:
     virtual int ShowModal();
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);
 };
 
 #endif
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index b3d93819e7..6cc4ae1279 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -183,8 +183,8 @@ private:
     wxTaskBarButton* m_taskBarButton;
 #endif
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame);
 };
 
 #endif
diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h
index 3cf4fcf44e..4f54f34e08 100644
--- a/include/wx/msw/gauge.h
+++ b/include/wx/msw/gauge.h
@@ -71,7 +71,7 @@ private:
     void SetIndeterminateMode();
     void SetDeterminateMode();
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge);
 };
 
 #endif // wxUSE_GAUGE
diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 52b82f42a0..b56ccd1f5d 100644
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -35,7 +35,7 @@ protected:
     HGLRC m_glContext;
 
 private:
-    DECLARE_CLASS(wxGLContext)
+    wxDECLARE_CLASS(wxGLContext);
 };
 
 // ----------------------------------------------------------------------------
@@ -151,8 +151,8 @@ protected:
     HDC m_hDC;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_
diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 4deffa4adb..a6f1b2cb0e 100644
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -118,7 +118,7 @@ protected:
     wxHelpControllerBase* m_helpController;
     int m_style;
 
-    DECLARE_DYNAMIC_CLASS(wxBestHelpController)
+    wxDECLARE_DYNAMIC_CLASS(wxBestHelpController);
     wxDECLARE_NO_COPY_CLASS(wxBestHelpController);
 };
 
diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 17cda8ce00..1aadac3bda 100644
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -81,7 +81,7 @@ protected:
 
     wxString m_helpFile;
 
-    DECLARE_DYNAMIC_CLASS(wxCHMHelpController)
+    wxDECLARE_DYNAMIC_CLASS(wxCHMHelpController);
 };
 
 #endif // wxUSE_MS_HTML_HELP
diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 7cc5545435..e0f797a6d4 100644
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -19,7 +19,7 @@
 
 class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWinHelpController)
+    wxDECLARE_DYNAMIC_CLASS(wxWinHelpController);
 
 public:
     wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 4737e449a4..6bf5acb897 100644
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -89,7 +89,7 @@ protected:
     void CreateIconFromXpm(const char* const* data);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxIcon);
 };
 
 #endif
diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h
index 3f831f1832..d0a7e45f1a 100644
--- a/include/wx/msw/imaglist.h
+++ b/include/wx/msw/imaglist.h
@@ -198,7 +198,7 @@ public:
 protected:
   WXHIMAGELIST m_hImageList;
 
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxImageList)
+  wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxImageList);
 };
 
 #endif
diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 63ebd00141..b08c52c857 100644
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -97,7 +97,7 @@ private:
            m_strPath;     // the rest of the path (no trailing '_'!)
 
   wxDECLARE_NO_COPY_CLASS(wxIniConfig);
-  DECLARE_ABSTRACT_CLASS(wxIniConfig)
+  wxDECLARE_ABSTRACT_CLASS(wxIniConfig);
 };
 
 #endif // wxUSE_CONFIG && wxUSE_INICONF
diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index b3f5e57105..09c8bcb7c8 100644
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -15,8 +15,8 @@
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
+  wxDECLARE_DYNAMIC_CLASS(wxJoystick);
+public:
   /*
    * Public interface
    */
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index a08cd9ad16..c64b63e394 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -194,7 +194,7 @@ private:
     bool m_updateHorizontalExtent;
 
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox);
 };
 
 #endif // wxUSE_LISTBOX
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 3a12d065df..6458429c1c 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -457,8 +457,8 @@ private:
     void OnCharHook(wxKeyEvent& event);
 
 
-    DECLARE_DYNAMIC_CLASS(wxListCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxListCtrl);
 };
 
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index e20a57db5a..125c5a6532 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -153,8 +153,8 @@ private:
 
     friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
     wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
 };
 
@@ -233,8 +233,8 @@ protected:
 private:
     bool m_needsResize; // flag which tells us to artificially resize the frame
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame);
 };
 
 // ---------------------------------------------------------------------------
@@ -263,8 +263,8 @@ protected:
     int m_scrollX, m_scrollY;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow);
 };
 
 #endif // _WX_MSW_MDI_H_
diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 7ecdf485be..16a9507be9 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -173,7 +173,7 @@ private:
     int m_maxAccelWidth;
 #endif // wxUSE_OWNER_DRAWN
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu);
 };
 
 // ----------------------------------------------------------------------------
@@ -261,7 +261,7 @@ protected:
 #endif
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar);
 };
 
 #endif // _WX_MENU_H_
diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 2e8257dfb6..5847295f83 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -150,7 +150,7 @@ private:
     // Give wxMenu access to our MSWMustUseOwnerDrawn() and GetHBitmapForMenu().
     friend class wxMenu;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem);
 };
 
 #endif  //_MENUITEM_H
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 8991f58c91..8a7c6ce68f 100644
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -73,7 +73,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMetafile)
+    wxDECLARE_DYNAMIC_CLASS(wxMetafile);
 };
 
 class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl
@@ -105,7 +105,7 @@ protected:
     wxMetafile*   m_metaFile;
 
 private:
-    DECLARE_CLASS(wxMetafileDCImpl)
+    wxDECLARE_CLASS(wxMetafileDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
@@ -131,7 +131,7 @@ public:
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
-    DECLARE_CLASS(wxMetafileDC)
+    wxDECLARE_CLASS(wxMetafileDC);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 5e12562ebc..c6d86c99da 100644
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -44,7 +44,7 @@ public:
   }
 
 protected:
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
+  wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame);
 };
 
 #endif
diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 2a13764007..78750d5155 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -201,8 +201,8 @@ protected:
 #endif // wxUSE_UXTHEME
 
 
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNotebook);
+  wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_NOTEBOOK
diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 0472a07b44..1f1d15736f 100644
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -44,7 +44,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxPalette);
 };
 
 #endif // _WX_PALETTE_H_
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index d0d728cddf..7641cd4293 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -72,7 +72,7 @@ protected:
     // same as FreeResource() + RealizeResource()
     bool Recreate();
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif // _WX_PEN_H_
diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index e8effc0125..3fbd2d4dcc 100644
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -35,7 +35,7 @@ public:
     virtual WXHWND MSWGetParent() const;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
 
 #endif // _WX_MSW_POPUPWIN_H_
diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 2955b89b3c..b3419cbdbb 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -50,7 +50,7 @@ private:
     short m_customWindowsPaperId;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData);
 };
 
 // ---------------------------------------------------------------------------
@@ -86,8 +86,8 @@ private:
     void*             m_printDlg;
 
 private:
+    wxDECLARE_CLASS(wxWindowsPrintDialog);
     wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
-    DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
 // ---------------------------------------------------------------------------
@@ -116,7 +116,7 @@ private:
     void*                   m_pageDlg;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog);
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index e5ef80b043..b6fceef7c6 100644
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -19,7 +19,7 @@
 
 class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowsPrinter);
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);
@@ -59,7 +59,7 @@ protected:
     virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
 #endif
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview);
 };
 
 #endif
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 53620db9b3..3c11d52842 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -181,7 +181,7 @@ protected:
     int m_selectedButton;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
     wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 76fc661b9c..f5708fb6ad 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -75,7 +75,7 @@ private:
     // sometimes gets out of sync in WM_COMMAND handler
     bool m_isChecked;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton);
 };
 
 #endif // _WX_RADIOBUT_H_
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index ec290ec88c..312d1ba5f9 100644
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -106,7 +106,7 @@ private:
   wxString  m_strPath;
 
   wxDECLARE_NO_COPY_CLASS(wxRegConfig);
-  DECLARE_ABSTRACT_CLASS(wxRegConfig)
+  wxDECLARE_ABSTRACT_CLASS(wxRegConfig);
 };
 
 #endif // wxUSE_CONFIG && wxUSE_REGKEY
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index aba0d536dc..54b4935b66 100644
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -55,7 +55,7 @@ protected:
 
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
@@ -97,7 +97,7 @@ private:
     wxRegion m_region;
     wxRect*  m_rects;
 
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif // _WX_MSW_REGION_H_
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 1b7c86295d..1e3023203b 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -67,7 +67,7 @@ protected:
     int m_viewSize;
     int m_objectSize;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrollBar);
 };
 
 #endif
diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index b210d1acf1..03f58c3fd4 100644
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -140,7 +140,7 @@ protected:
     // Platform-specific implementation of SetTickFreq
     virtual void DoSetTickFreq(int freq);
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider);
 };
 
 #endif // _WX_SLIDER_H_
diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index d50912fbf8..051cadf428 100644
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -66,7 +66,7 @@ protected:
    virtual void NormalizeValue();
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton);
 };
 
 #endif // wxUSE_SPINBTN
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 6c8bd49fe1..28c16f5437 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -160,8 +160,8 @@ private:
     void UpdateBuddyStyle();
 
 
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
 };
 
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 55231a2192..7342aff383 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -96,7 +96,7 @@ private:
     void DeleteCurrentHandleIfNeeded();
 
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
     wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 7721ccacb1..a0fcc78891 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -65,7 +65,7 @@ protected:
     void OnPaint(wxPaintEvent& event);
 #endif // !__WXWINCE__
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox);
 };
 
 #endif // _WX_MSW_STATBOX_H_
diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 1d2662b3bb..ce4569448b 100644
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -43,7 +43,7 @@ public:
     // usually overridden base class virtuals
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine);
 };
 
 #endif // _WX_MSW_STATLINE_H_
diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 9bbcca7141..5a478c3500 100644
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -50,7 +50,7 @@ protected:
     virtual wxString DoGetLabel() const;
     virtual void DoSetLabel(const wxString& str);
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
 };
 
 #endif
diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index b1d352a7cc..4aa4349959 100644
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -103,7 +103,7 @@ private:
     // return the various status bar metrics
     static const MSWMetrics& MSWGetMetrics();
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar);
 };
 
 #endif  // wxUSE_NATIVE_STATUSBAR
diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index c9a4a11ca5..5728a424f0 100644
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -64,7 +64,7 @@ protected:
     wxIcon               m_icon;
     wxString             m_strTooltip;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
 };
 
 #endif // _WX_TASKBAR_H_
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 4aefbdff10..cc62128c7e 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -282,8 +282,8 @@ private:
     // false if we hit the limit set by SetMaxLength() and so didn't change it.
     bool AdjustSpaceLimit();
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl);
 
     wxMenu* m_privateContextMenu;
 
diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 67f58696d4..523c4489ec 100644
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -64,7 +64,7 @@ protected:
     bool m_state;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton);
 };
 
 //-----------------------------------------------------------------------------
@@ -105,7 +105,7 @@ public:
     virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
 };
 
 #endif // _WX_TOGGLEBUTTON_H_
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index 8db67d8718..942ff351c2 100644
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -170,8 +170,8 @@ private:
     WXHBRUSH MSWGetToolbarBgBrush();
 #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
     wxDECLARE_NO_COPY_CLASS(wxToolBar);
 };
 
diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index fd3fe908f0..caf4b753c8 100644
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -108,7 +108,7 @@ private:
                                 // (or a rect with width/height == 0 to show it for the entire window)
     unsigned int m_id;          // the id of this tooltip (ignored when m_rect width/height is 0)
 
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
+    wxDECLARE_ABSTRACT_CLASS(wxToolTip);
     wxDECLARE_NO_COPY_CLASS(wxToolTip);
 };
 
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 93427a7a45..e70031c47c 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -235,7 +235,7 @@ private:
     // MSWGetSystemMenu(). Owned by this window.
     wxMenu *m_menuSystem;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };
 
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index b438c33ffe..914cddc395 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -339,7 +339,7 @@ private:
     friend class wxTreeItemIndirectData;
     friend class wxTreeSortHelper;
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
     wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
 };
 
diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index bc19ee85ae..07f7cc6738 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -143,7 +143,7 @@ public:
     void onActiveXEvent(wxActiveXEvent& evt);
     void onEraseBg(wxEraseEvent&) {}
 
-    DECLARE_EVENT_TABLE();
+    wxDECLARE_EVENT_TABLE();
 
 protected:
     virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
diff --git a/include/wx/msw/wince/checklst.h b/include/wx/msw/wince/checklst.h
index 61121298bc..b624e029ef 100644
--- a/include/wx/msw/wince/checklst.h
+++ b/include/wx/msw/wince/checklst.h
@@ -83,8 +83,8 @@ protected:
 private:
     wxArrayPtrVoid m_itemsClientData;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox);
 };
 
 #endif    //_CHECKLSTCE_H
diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h
index e280be7fdc..ca855c50c6 100644
--- a/include/wx/msw/wince/choicece.h
+++ b/include/wx/msw/wince/choicece.h
@@ -132,7 +132,7 @@ protected:
     static wxArrayChoiceSpins ms_allChoiceSpins;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice);
 };
 
 #endif // wxUSE_CHOICE
diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index 20cd4e405c..0e527bdfed 100644
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -48,7 +48,7 @@ protected:
 private:
     wxString m_helpFile;
 
-    DECLARE_CLASS(wxWinceHelpController)
+    wxDECLARE_CLASS(wxWinceHelpController);
 };
 
 #endif // wxUSE_MS_HTML_HELP
diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h
index d8845476da..1491546e2a 100644
--- a/include/wx/msw/wince/tbarwce.h
+++ b/include/wx/msw/wince/tbarwce.h
@@ -66,8 +66,8 @@ protected:
                                           const wxString& label);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
     wxDECLARE_NO_COPY_CLASS(wxToolBar);
 };
 
@@ -155,8 +155,8 @@ protected:
     wxMenuBar*  m_menuBar;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolMenuBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxToolMenuBar);
     wxDECLARE_NO_COPY_CLASS(wxToolMenuBar);
 };
 
diff --git a/include/wx/msw/wince/textctrlce.h b/include/wx/msw/wince/textctrlce.h
index 3c51633b0a..0a925bd138 100644
--- a/include/wx/msw/wince/textctrlce.h
+++ b/include/wx/msw/wince/textctrlce.h
@@ -226,8 +226,8 @@ protected:
     WXFARPROC  m_wndProcBuddy;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl);
 
     bool m_isNativeCaretShown;
 };
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 0a5b7f8712..ff995ca94b 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -725,9 +725,9 @@ private:
     bool        m_contextMenuEnabled;
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxWindowMSW)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowMSW);
     wxDECLARE_NO_COPY_CLASS(wxWindowMSW);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // window creation helper class: before creating a new HWND, instantiate an
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 5d358147fd..2d5de60566 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -90,7 +90,7 @@ private:
     bool m_selected;
     int m_imageId;
     
-    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
+    wxDECLARE_DYNAMIC_CLASS(wxNotebookPageInfo);
 };
 
 WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index e4695104bc..64cfc64fcf 100644
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -222,7 +222,7 @@ private:
     wxTimer                 m_partialCompletionTimer;
 #endif // wxUSE_TIMER
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
@@ -391,9 +391,9 @@ protected:
 private:
     void Init();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
-    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBox);
 };
 
 
diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index a6690acf5f..70ba837e3e 100644
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
diff --git a/include/wx/osx/anybutton.h b/include/wx/osx/anybutton.h
index ffa28dfb6c..f86b03ef70 100644
--- a/include/wx/osx/anybutton.h
+++ b/include/wx/osx/anybutton.h
@@ -52,7 +52,7 @@ protected:
     wxBitmap m_bitmaps[State_Max];
 
     wxDECLARE_NO_COPY_CLASS(wxAnyButton);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_OSX_ANYBUTTON_H_
diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 0eba951444..66c98e9d0e 100644
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -33,7 +33,7 @@ bool WXDLLIMPEXP_CORE wxYield();
 // a new App object to start application
 class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 
     wxApp();
     virtual ~wxApp();
@@ -174,7 +174,7 @@ public:
     // Hide the application windows the same as the system hide command would do it.
     void MacHideApp();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 8f51d7678f..200d5a26fa 100644
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 
 public:
     wxMask();
@@ -83,7 +83,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 
     friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 4a045fe0b6..813a6dcb61 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -42,7 +42,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // _WX_OSX_BMPBUTTN_H_
diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h
index 846f786898..072cfa4d16 100644
--- a/include/wx/osx/brush.h
+++ b/include/wx/osx/brush.h
@@ -50,7 +50,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_BRUSH_H_
diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 8e8752288c..a845513197 100644
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -53,7 +53,7 @@ public:
 #endif
 
 protected:
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 // OS X specific class, not part of public wx API
diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index a689b3f3b9..966ca4249a 100644
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -315,7 +315,7 @@ private:
 //
 // wxWidget internal stuff
 //
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl)
+    wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl);
 };
 
 // ============================================================================
diff --git a/include/wx/osx/carbon/drawer.h b/include/wx/osx/carbon/drawer.h
index 6edb3921d4..39acbe7eb8 100644
--- a/include/wx/osx/carbon/drawer.h
+++ b/include/wx/osx/carbon/drawer.h
@@ -24,7 +24,7 @@
 
 class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxDrawerWindow);
 
 public:
 
diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index a960cc3a81..f829b5ee49 100644
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -440,7 +440,7 @@ protected :
     ControlRef  m_controlRef;
     wxFont      m_font;
     long        m_windowStyle;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl);
 };
 
 // ============================================================================
@@ -581,7 +581,7 @@ protected :
     virtual Boolean CompareItems(DataBrowserItemID itemOneID,
         DataBrowserItemID itemTwoID,
         DataBrowserPropertyID sortProperty) = 0;
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)
+    wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl);
 };
 
 // ============================================================================
@@ -755,7 +755,7 @@ protected:
 private :
 
     bool m_suppressSelection;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl);
 };
 
 class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor
@@ -894,7 +894,7 @@ private:
     wxArrayMacDataBrowserColumns m_columns;
     int m_nextColumnId ;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl);
 };
 
 // ============================================================================
@@ -1038,7 +1038,7 @@ protected :
     WXEVENTHANDLERREF   m_macEventHandler ;
     WindowRef           m_macWindow;
     void *              m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl);
 };
 
 #endif // wxUSE_GUI
diff --git a/include/wx/osx/carbon/private/print.h b/include/wx/osx/carbon/private/print.h
index 3feafe6052..82c198da19 100644
--- a/include/wx/osx/carbon/private/print.h
+++ b/include/wx/osx/carbon/private/print.h
@@ -55,7 +55,7 @@ protected :
     PMPrintSettings         m_macPrintSettings ;
     PMPaper                 m_macPaper;
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXPrintData);
 } ;
 
 WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData();
@@ -67,7 +67,7 @@ public:
                             wxOSXCarbonPrintData();
     virtual                 ~wxOSXCarbonPrintData();
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData);
 } ;
 #endif
 
@@ -85,7 +85,7 @@ protected:
 
     WX_NSPrintInfo          m_macPrintInfo;
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData);
 } ;
 #endif
 
diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h
index f9c3fe3dd3..1aa40e46e2 100644
--- a/include/wx/osx/carbon/region.h
+++ b/include/wx/osx/carbon/region.h
@@ -57,7 +57,7 @@ protected:
     virtual bool DoUnionWithRect(const wxRect& rect);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 };
 
@@ -96,7 +96,7 @@ private:
     wxRegion m_region;
     wxRect*  m_rects;
 
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif // _WX_MAC_CARBON_REGION_H_
diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h
index 0f9ffb1763..3a0754e4f5 100644
--- a/include/wx/osx/carbon/statbmp.h
+++ b/include/wx/osx/carbon/statbmp.h
@@ -15,8 +15,8 @@
 
 class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
+  wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
+public:
   wxStaticBitmap() { }
 
   wxStaticBitmap(wxWindow *parent, wxWindowID id,
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
     virtual wxSize DoGetBestSize() const;
 
     wxBitmap m_bitmap;
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index 3ba0accc90..c81865fbce 100644
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -42,7 +42,7 @@ protected:
     void DoSet3StateValue(wxCheckBoxState val);
     virtual wxCheckBoxState DoGet3StateValue() const;
 
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
@@ -76,7 +76,7 @@ public:
     virtual void SetLabel(const wxBitmap *bitmap);
     virtual void SetLabel( const wxString & WXUNUSED(name) ) {}
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox);
 };
 #endif
     // _WX_CHECKBOX_H_
diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index c23d36f562..334e2ffdb4 100644
--- a/include/wx/osx/checklst.h
+++ b/include/wx/osx/checklst.h
@@ -86,8 +86,8 @@ protected:
     void Init();
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif // _WX_MAC_CHECKLST_H_
diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index 0e108f4552..e261782ef6 100644
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -21,7 +21,7 @@ WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 // Choice item
 class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 
 public:
     wxChoice()
diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h
index cba7a41e22..2c45068e24 100644
--- a/include/wx/osx/clipbrd.h
+++ b/include/wx/osx/clipbrd.h
@@ -59,7 +59,7 @@ private:
     bool              m_open;
     wxCFRef<PasteboardRef> m_pasteboard;
 
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // wxUSE_CLIPBOARD
diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 0470d3aa50..83cd34d41e 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -187,7 +187,7 @@ protected:
     // events, don't resend them
     bool m_hasEditor;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl);
 };
 
 DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
@@ -271,7 +271,7 @@ protected :
     CGWindowLevel   m_macWindowLevel;
     WXWindow        m_macWindow;
     void *          m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl);
 };
 
 DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton );
diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h
index 832b46cf0d..c46f2f5d0f 100644
--- a/include/wx/osx/colordlg.h
+++ b/include/wx/osx/colordlg.h
@@ -20,7 +20,7 @@
 
 class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
 public:
     wxColourDialog();
     wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index d7d16f503f..0ebb8028a2 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
 #endif
                 wxComboBoxBase>
 {
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxComboBox);
 
  public:
     virtual ~wxComboBox();
diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index f0d7c4606b..6e667fdd24 100644
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -16,7 +16,7 @@ WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[];
 // General item class
 class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
-    DECLARE_ABSTRACT_CLASS(wxControl)
+    wxDECLARE_ABSTRACT_CLASS(wxControl);
 
 public:
    wxControl();
diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index 004b627f61..228d10c7c7 100644
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -80,7 +80,7 @@ private:
     ChannelType             m_green;
     ChannelType             m_alpha;
 
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif
diff --git a/include/wx/osx/core/joystick.h b/include/wx/osx/core/joystick.h
index 36941b5b0b..51e373821a 100644
--- a/include/wx/osx/core/joystick.h
+++ b/include/wx/osx/core/joystick.h
@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
+    wxDECLARE_DYNAMIC_CLASS(wxJoystick);
  public:
 
     wxJoystick(int joystick = wxJOYSTICK1);
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index fec62fa63e..eb2758a17b 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -179,7 +179,7 @@ public :
 protected :
     wxMenuItem* m_peer;
 
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
 } ;
 
 class wxMenuImpl : public wxObject
@@ -213,7 +213,7 @@ public :
 protected :
     wxMenu* m_peer;
 
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
 } ;
 #endif
 
@@ -568,7 +568,7 @@ protected :
     bool                m_needsFrame;
     bool                m_shouldSendEvents;
 
-    DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxWidgetImpl);
 };
 
 //
@@ -913,7 +913,7 @@ public :
     virtual void RestoreWindowLevel() {}
 protected :
     wxNonOwnedWindow*   m_wxPeer;
-    DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl);
 };
 
 #endif // wxUSE_GUI
diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index b250839dc2..7af9a4176c 100644
--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -44,7 +44,7 @@ private:
 
     void CreateFromImage(const wxImage & image) ;
 
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index de7bd27839..d9af0a3384 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -302,9 +302,9 @@ private:
   wxDataViewModelNotifier* m_ModelNotifier; // stores the model notifier for the control (does not own the notifier)
 
  // wxWidget internal stuff:
-  DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-  DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl);
+  wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
+  wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_DATAVIEWCTRL_OSX_H_
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index fca62cf35b..4c88220d9e 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -36,7 +36,7 @@ protected:
     int m_width;
     int m_height;
 
-    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_CLASS(wxWindowDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
@@ -49,7 +49,7 @@ public:
     virtual ~wxClientDCImpl();
 
 private:
-    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_CLASS(wxClientDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
@@ -62,7 +62,7 @@ public:
     virtual ~wxPaintDCImpl();
 
 protected:
-    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_CLASS(wxPaintDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 
diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index bace3c5a95..05fccf5075 100644
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -37,7 +37,7 @@ private:
 
     wxBitmap  m_selected;
 
-    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_CLASS(wxMemoryDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 
diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h
index ec9f785167..7bebfbc37c 100644
--- a/include/wx/osx/dcprint.h
+++ b/include/wx/osx/dcprint.h
@@ -42,7 +42,7 @@ protected:
     wxNativePrinterDC* m_nativePrinterDC ;
 
 private:
-    DECLARE_CLASS(wxPrinterDC)
+    wxDECLARE_CLASS(wxPrinterDC);
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index 374f0efcd8..c6fdd335a2 100644
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -25,7 +25,7 @@ private:
     void* m_overlayWindow;
 
 private:
-    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_CLASS(wxScreenDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 3b0b724fb8..88d5462f15 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;
 // Dialog boxes
 class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
 
 public:
     wxDialog() { Init(); }
diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index f355f604e8..c23cf71bf5 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -64,7 +64,7 @@ private:
     // Common part of all ctors.
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 
 #endif // _WX_DIRDLG_H_
diff --git a/include/wx/osx/dvrenderer.h b/include/wx/osx/dvrenderer.h
index d7ded78464..ed7792be03 100644
--- a/include/wx/osx/dvrenderer.h
+++ b/include/wx/osx/dvrenderer.h
@@ -104,7 +104,7 @@ private:
     // value that is going to be rendered
     wxVariant m_value;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer);
 };
 
 #endif // _WX_OSX_DVRENDERER_H_
diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index 8798611ff4..a5d0a75b21 100644
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -43,7 +43,7 @@ private:
 
     wxDC* m_DCPtr;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer);
 };
 
 // ---------------------------------------------------------
@@ -68,7 +68,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -87,7 +87,7 @@ public:
     virtual bool MacRender();
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
 };
 
 #if wxOSX_USE_COCOA
@@ -117,7 +117,7 @@ public:
 private:
     wxArrayString m_choices;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer);
 };
 
 #endif // wxOSX_USE_COCOA
@@ -143,7 +143,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -168,7 +168,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
 };
 
 // ---------------------------------------------------------
@@ -194,7 +194,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
 };
 
 // ---------------------------------------------------------
@@ -219,7 +219,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer);
 };
 
 #endif // _WX_OSX_DVRENDERERS_H_
diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index 10342fa8a8..d8e8a862a6 100644
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
 
 class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
 protected:
     wxArrayString m_fileNames;
     wxArrayString m_paths;
diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index fa3536a264..792f6ca980 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -184,7 +184,7 @@ protected:
 
 private:
 
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_FONT_H_
diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index e271578cdf..817501e39b 100644
--- a/include/wx/osx/fontdlg.h
+++ b/include/wx/osx/fontdlg.h
@@ -47,7 +47,7 @@ public:
 protected:
     wxFontData m_fontData;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);
 };
 
 extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
@@ -87,10 +87,10 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 
 class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFontDialog);
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif
 
 public:
diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 5c804a54e8..5727144eeb 100644
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -108,8 +108,8 @@ protected:
 
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif
diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index 692c3b587a..9344b95766 100644
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -46,7 +46,7 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
     void Pulse();
 
  protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge);
 };
 
 #endif
diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 1789a900f0..3bc6e1c5ce 100644
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -155,8 +155,8 @@ protected:
     GLint m_bufferName;
 #endif
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_
diff --git a/include/wx/osx/helpxxxx.h b/include/wx/osx/helpxxxx.h
index 9a9fe4c67f..f5d889570b 100644
--- a/include/wx/osx/helpxxxx.h
+++ b/include/wx/osx/helpxxxx.h
@@ -18,7 +18,7 @@
 
 class WXDLLIMPEXP_CORE wxXXXXHelpController: public wxHelpControllerBase
 {
-  DECLARE_CLASS(wxXXXXHelpController)
+  wxDECLARE_CLASS(wxXXXXHelpController);
 
  public:
   wxXXXXHelpController();
diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h
index fc6f426084..2540a346d8 100644
--- a/include/wx/osx/icon.h
+++ b/include/wx/osx/icon.h
@@ -62,7 +62,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxIcon);
 
     bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
     bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
@@ -93,7 +93,7 @@ public:
         { return LoadFile(bitmap, name, flags, -1, -1); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxICONResourceHandler);
 };
 
 #endif
diff --git a/include/wx/osx/imaglist.h b/include/wx/osx/imaglist.h
index 0405f4cd43..32c8f26cc1 100644
--- a/include/wx/osx/imaglist.h
+++ b/include/wx/osx/imaglist.h
@@ -53,7 +53,7 @@ private:
     int     m_width;
     int     m_height;
 
-    DECLARE_DYNAMIC_CLASS(wxImageList)
+    wxDECLARE_DYNAMIC_CLASS(wxImageList);
 };
 
 #endif  // _WX_IMAGLIST_H_
diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index 1550eb8765..b5b0a59906 100644
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -121,7 +121,7 @@ public :
     virtual void         controlTextDidChange();
 protected:
     WXWidget m_osxView;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl);
 };
 
 class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl
@@ -189,7 +189,7 @@ protected :
     WX_UIWindow          m_macWindow;
     void *              m_macFullScreenData ;
     bool                m_initialShowSent;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl);
 };
 
 #ifdef __OBJC__
diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h
index e5f834390a..310cb6ddd0 100644
--- a/include/wx/osx/joystick.h
+++ b/include/wx/osx/joystick.h
@@ -15,8 +15,8 @@
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
+  wxDECLARE_DYNAMIC_CLASS(wxJoystick);
+public:
   /*
    * Public interface
    */
diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index 60f4199e74..c717ee0521 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -172,8 +172,8 @@ private:
     friend class wxMacDataBrowserListControl;
 #endif // Carbon
 
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_LISTBOX_H_
diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 9f2fdfe984..8e36535dd9 100644
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -24,8 +24,8 @@ WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
 
 class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
 {
-  DECLARE_DYNAMIC_CLASS(wxListCtrl)
- public:
+    wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
+public:
   /*
    * Public interface
    */
diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index 7a859d198d..8945cea51c 100644
--- a/include/wx/osx/mdi.h
+++ b/include/wx/osx/mdi.h
@@ -88,8 +88,8 @@ protected:
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase
@@ -132,7 +132,7 @@ protected:
     // common part of all ctors
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
 };
 
 class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
@@ -147,7 +147,7 @@ public:
 protected:
     virtual void DoGetClientSize(int *width, int *height) const;
 
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
 
 #endif // _WX_OSX_CARBON_MDI_H_
diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 32de382ba1..7772f93fc9 100644
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -91,7 +91,7 @@ private:
 
     wxMenuImpl* m_peer;
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 #if wxOSX_USE_COCOA_OR_CARBON
@@ -178,7 +178,7 @@ private:
     wxMenu* m_rootMenu;
     wxMenu* m_appleMenu;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 #endif
diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 69dc7e7bcb..b5e0000876 100644
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -92,7 +92,7 @@ private:
 
     wxMenuItemImpl* m_peer;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif  //_MENUITEM_H
diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 973a5736a4..1851a08cad 100644
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -59,7 +59,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxMetafile)
+    wxDECLARE_DYNAMIC_CLASS(wxMetafile);
 };
 
 
@@ -86,7 +86,7 @@ protected:
     wxMetafile*   m_metaFile;
 
 private:
-    DECLARE_CLASS(wxMetafileDCImpl)
+    wxDECLARE_CLASS(wxMetafileDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
@@ -108,7 +108,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
-    DECLARE_CLASS(wxMetafileDC)
+    wxDECLARE_CLASS(wxMetafileDC);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 
diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index 00fe6e474a..00e4c6e124 100644
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
 
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+  wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
   inline wxMiniFrame() {}
diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 871d32f940..c4257aff57 100644
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -48,7 +48,7 @@ protected:
 #if wxOSX_USE_COCOA
     WX_NSObject m_sheetDelegate;
 #endif
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
 };
 
 #endif // _WX_MSGBOXDLG_H_
diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index 7e0ac72291..8f14236ae2 100644
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -133,8 +133,8 @@ protected:
   // the icon indices
   wxArrayInt m_images;
 
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS(wxNotebook);
+  wxDECLARE_EVENT_TABLE();
 };
 
 
diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h
index 86e014f80f..7c695ec1c9 100644
--- a/include/wx/osx/palette.h
+++ b/include/wx/osx/palette.h
@@ -34,7 +34,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxPalette);
 };
 
 #endif // _WX_PALETTE_H_
diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h
index c28ff64ec6..c203e2faeb 100644
--- a/include/wx/osx/pen.h
+++ b/include/wx/osx/pen.h
@@ -68,7 +68,7 @@ protected:
 private:
     void Unshare();
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif
diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index c040521337..f4ce96ccbd 100644
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
+  wxDECLARE_DYNAMIC_CLASS(wxPNGFileHandler);
 public:
   inline wxPNGFileHandler(void)
   {
diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index 01a3a147db..21065febcf 100644
--- a/include/wx/osx/popupwin.h
+++ b/include/wx/osx/popupwin.h
@@ -28,7 +28,7 @@ public:
 
     virtual bool Show(bool show = true);
     
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
 
 #endif // _WX_MAC_POPUPWIN_H_
diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index d2601eccbe..83fbd58dde 100644
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -46,7 +46,7 @@ private:
     wxWindow*           m_dialogParent;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintDialog);
 };
 
 /*
@@ -70,7 +70,7 @@ private:
     wxWindow*               m_dialogParent;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog);
 };
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
@@ -104,7 +104,7 @@ private:
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog);
 };
 
 
diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index fb68fd8d5f..caf4aca61b 100644
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -19,9 +19,9 @@
 
 class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMacPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxMacPrinter);
 
- public:
+public:
     wxMacPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxMacPrinter();
 
@@ -40,9 +40,9 @@ class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 
 class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxMacPrintPreview)
+    wxDECLARE_CLASS(wxMacPrintPreview);
 
- public:
+public:
     wxMacPrintPreview(wxPrintout *printout,
                           wxPrintout *printoutForPrinting = NULL,
                           wxPrintDialogData *data = NULL);
diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index f591a7df9b..42cba23423 100644
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton ;
 
 class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 public:
 // Constructors & destructor
     wxRadioBox();
@@ -102,7 +102,7 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 649a544c3c..8b91711c2b 100644
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -13,8 +13,8 @@
 
 class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
- protected:
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
+
 public:
     inline wxRadioButton() {}
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
@@ -61,10 +61,10 @@ WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxBitmapRadioButtonNameStr[];
 
 class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
+  wxDECLARE_DYNAMIC_CLASS(wxBitmapRadioButton);
+protected:
   wxBitmap *theButtonBitmap;
- public:
+public:
   inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
   inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
            const wxBitmap *label,
diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index 2115ca5479..296c4b5b8b 100644
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -61,8 +61,8 @@ protected:
     int m_viewSize;
     int m_objectSize;
 
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_SCROLBAR_H_
diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index bd99512dca..4b58671c42 100644
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -18,7 +18,7 @@
 // Slider
 class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 
 public:
     wxSlider();
@@ -102,7 +102,7 @@ protected:
     int           m_lineSize;
     int           m_tickFreq;
 private :
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index b294851f96..e8b48f3f89 100644
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -69,7 +69,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 };
 
 #endif
diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 1cad161db1..abdddcdf5f 100644
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -76,9 +76,9 @@ protected:
     wxString m_descriptiveText;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxSearchCtrl);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_SEARCHCTRL
diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index 5b5f049c58..5ab7ad670f 100644
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -16,9 +16,9 @@
 // Group box
 class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 
- public:
+public:
     inline wxStaticBox() {}
     inline wxStaticBox(wxWindow *parent, wxWindowID id,
            const wxString& label,
diff --git a/include/wx/osx/statline.h b/include/wx/osx/statline.h
index bd94398239..204c8759bc 100644
--- a/include/wx/osx/statline.h
+++ b/include/wx/osx/statline.h
@@ -49,7 +49,7 @@ protected:
     // we implement the static line using a static box
     wxStaticBox *m_statbox;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // _WX_GENERIC_STATLINE_H_
diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 3b4b9b6637..28c89a05d8 100644
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -50,7 +50,7 @@ protected :
     virtual bool DoSetLabelMarkup(const wxString& markup);
 #endif // wxUSE_MARKUP && wxOSX_USE_COCOA
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
 };
 
 #endif
diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 74ae67758c..57f738118d 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -35,8 +35,8 @@ protected:
     virtual void DrawField(wxDC& dc, int i, int textHeight);
     virtual void DoUpdateStatusText(int number = 0);
 
-    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_STATBAR_H_
diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 7d13df747e..cf7056a2c0 100644
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
 public:
     wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();
diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index a52620b5c7..439e93d000 100644
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -27,7 +27,7 @@
 
 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
 public:
     wxTextCtrl()
@@ -148,7 +148,7 @@ protected:
 private :
     wxMenu  *m_privateContextMenu;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_TEXTCTRL_H_
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index eaa48e8b81..1283d33f6c 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -48,7 +48,7 @@ protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton);
 };
 
 
@@ -78,7 +78,7 @@ public:
                 const wxString& name = wxCheckBoxNameStr);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton);
 };
 
 #endif // _WX_TOGGLEBUTTON_H_
diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 270e17f0e8..3c8ae1bab4 100644
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -18,8 +18,8 @@
 
 class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
- public:
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
+public:
   /*
    * Public interface
    */
@@ -114,7 +114,7 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool m_macUsesNativeToolbar ;
     void* m_macToolbar ;
diff --git a/include/wx/osx/tooltip.h b/include/wx/osx/tooltip.h
index f05122ba00..c229555071 100644
--- a/include/wx/osx/tooltip.h
+++ b/include/wx/osx/tooltip.h
@@ -51,7 +51,7 @@ public:
 private:
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
+    wxDECLARE_ABSTRACT_CLASS(wxToolTip);
 };
 
 #endif // _WX_MAC_TOOLTIP_H_
diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index d88846dd3b..5f694222ab 100644
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -93,7 +93,7 @@ protected:
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 private :
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h
index 71118f121f..344a8f8f0f 100644
--- a/include/wx/osx/treectrl.h
+++ b/include/wx/osx/treectrl.h
@@ -61,7 +61,7 @@ enum {
 
 class WXDLLIMPEXP_CORE wxTreeItem: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeItem)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeItem);
 
 public:
 
@@ -208,7 +208,7 @@ protected:
     wxImageList* m_imageListNormal;
     wxImageList* m_imageListState;
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 };
 
 /*
@@ -230,7 +230,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeEvent);
 
 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 12ce268685..f28196b223 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -149,7 +149,7 @@ public:
 protected:
     virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void MacVisibilityChanged();
 
 private:
diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 623493aa1e..ac32e35d32 100644
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowMac)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowMac);
 
     friend class wxDC;
     friend class wxPaintDC;
@@ -397,7 +397,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
     wxDECLARE_NO_COPY_CLASS(wxWindowMac);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_WINDOW_H_
diff --git a/include/wx/paper.h b/include/wx/paper.h
index d50d549804..19e6d26a45 100644
--- a/include/wx/paper.h
+++ b/include/wx/paper.h
@@ -62,7 +62,7 @@ public:
     wxString    m_paperName;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintPaperType);
 };
 
 WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
@@ -111,7 +111,7 @@ public:
 private:
     wxStringToPrintPaperTypeHashMap* m_map;
     wxPrintPaperTypeList* m_list;
-    // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
+    //wxDECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase);
 };
 
 extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index 7ca5e53a24..6c1f1cb0d0 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -181,7 +181,7 @@ protected:
     wxBoxSizer *m_sizer;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxPickerBase)
+    wxDECLARE_ABSTRACT_CLASS(wxPickerBase);
 };
 
 
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 5587c08ec2..ea6a4427a4 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -149,8 +149,8 @@ protected:
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxPopupTransientWindow);
     wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
 };
 
@@ -184,8 +184,8 @@ protected:
     // the parent combobox
     wxComboCtrl *m_combo;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxPopupComboWindow);
 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
diff --git a/include/wx/power.h b/include/wx/power.h
index 65b42baf24..7c45abafb6 100644
--- a/include/wx/power.h
+++ b/include/wx/power.h
@@ -69,7 +69,7 @@ public:
 private:
     bool m_veto;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPowerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPowerEvent);
 };
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, wxPowerEvent );
diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index d7e7e4e267..ecb2ce8819 100644
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -41,7 +41,7 @@ public:
     virtual wxDC *GetPrintDC() = 0;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
+    wxDECLARE_ABSTRACT_CLASS(wxPrintDialogBase);
     wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
 };
 
@@ -66,7 +66,7 @@ private:
     wxPrintDialogBase  *m_pimpl;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintDialog);
     wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
 };
 
@@ -88,7 +88,7 @@ public:
     virtual wxPageSetupDialogData& GetPageSetupDialogData() = 0;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)
+    wxDECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase);
     wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);
 };
 
@@ -111,7 +111,7 @@ private:
     wxPageSetupDialogBase  *m_pimpl;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialog);
     wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
 };
 
diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index b8b56e0c2c..18987fffb3 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -175,7 +175,7 @@ public:
     int  m_ref;
 
 private:
-    DECLARE_CLASS(wxPrintNativeDataBase)
+    wxDECLARE_CLASS(wxPrintNativeDataBase);
     wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase);
 };
 
@@ -219,7 +219,7 @@ public:
     static bool           sm_abortIt;
 
 private:
-    DECLARE_CLASS(wxPrinterBase)
+    wxDECLARE_CLASS(wxPrinterBase);
     wxDECLARE_NO_COPY_CLASS(wxPrinterBase);
 };
 
@@ -246,7 +246,7 @@ protected:
     wxPrinterBase    *m_pimpl;
 
 private:
-    DECLARE_CLASS(wxPrinter)
+    wxDECLARE_CLASS(wxPrinter);
     wxDECLARE_NO_COPY_CLASS(wxPrinter);
 };
 
@@ -340,7 +340,7 @@ private:
     wxRect           m_paperRectPixels;
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxPrintout)
+    wxDECLARE_ABSTRACT_CLASS(wxPrintout);
     wxDECLARE_NO_COPY_CLASS(wxPrintout);
 };
 
@@ -378,8 +378,8 @@ private:
 
     wxPrintPreviewBase* m_printPreview;
 
-    DECLARE_CLASS(wxPreviewCanvas)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxPreviewCanvas);
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas);
 };
 
@@ -440,8 +440,8 @@ protected:
 private:
     void OnChar(wxKeyEvent& event);
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPreviewFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxPreviewFrame);
     wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);
 };
 
@@ -480,7 +480,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxPreviewControlBar: public wxPanel
 {
-    DECLARE_CLASS(wxPreviewControlBar)
+    wxDECLARE_CLASS(wxPreviewControlBar);
 
 public:
     wxPreviewControlBar(wxPrintPreviewBase *preview,
@@ -558,7 +558,7 @@ private:
     void OnZoomOutButton(wxCommandEvent & WXUNUSED(event)) { DoZoomOut(); }
     void OnZoomChoice(wxCommandEvent& WXUNUSED(event)) { DoZoom(); }
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar);
 };
 
@@ -674,7 +674,7 @@ private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
     wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase);
-    DECLARE_CLASS(wxPrintPreviewBase)
+    wxDECLARE_CLASS(wxPrintPreviewBase);
 };
 
 //----------------------------------------------------------------------------
@@ -726,7 +726,7 @@ private:
     wxPrintPreviewBase *m_pimpl;
 
 private:
-    DECLARE_CLASS(wxPrintPreview)
+    wxDECLARE_CLASS(wxPrintPreview);
     wxDECLARE_NO_COPY_CLASS(wxPrintPreview);
 };
 
@@ -752,7 +752,7 @@ public:
 private:
     wxStaticText *m_progress;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);
 };
 
diff --git a/include/wx/process.h b/include/wx/process.h
index 3278829776..733275d99a 100644
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -143,7 +143,7 @@ protected:
 
     bool m_redirect;
 
-    DECLARE_DYNAMIC_CLASS(wxProcess)
+    wxDECLARE_DYNAMIC_CLASS(wxProcess);
     wxDECLARE_NO_COPY_CLASS(wxProcess);
 };
 
@@ -179,7 +179,7 @@ public:
     int m_pid,
         m_exitcode;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent);
 };
 
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index b8adcca3c5..750b4fb3a3 100644
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -127,7 +127,7 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColourPropertyValue)
+    wxDECLARE_DYNAMIC_CLASS(wxColourPropertyValue);
 };
 
 
@@ -288,7 +288,7 @@ private:
 */
 class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
 {
-    DECLARE_DYNAMIC_CLASS(wxCursorProperty)
+    wxDECLARE_DYNAMIC_CLASS(wxCursorProperty);
 
     wxCursorProperty( const wxString& label= wxPG_LABEL,
                       const wxString& name= wxPG_LABEL,
@@ -312,7 +312,7 @@ WXDLLIMPEXP_PROPGRID const wxString& wxPGGetDefaultImageWildcard();
 */
 class WXDLLIMPEXP_PROPGRID wxImageFileProperty : public wxFileProperty
 {
-    DECLARE_DYNAMIC_CLASS(wxImageFileProperty)
+    wxDECLARE_DYNAMIC_CLASS(wxImageFileProperty);
 public:
 
     wxImageFileProperty( const wxString& label= wxPG_LABEL,
@@ -494,7 +494,7 @@ protected:
 //   used for event handling here.
 class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor);
 public:
     virtual ~wxPGSpinCtrlEditor();
 
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index 27cb986e6e..e917e58b6e 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -78,7 +78,7 @@ public:
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditor : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxPGEditor)
+    wxDECLARE_ABSTRACT_CLASS(wxPGEditor);
 public:
 
     /** Constructor. */
@@ -232,7 +232,7 @@ public:
 
 
 #define WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(EDITOR,CLASSNAME,BASECLASS) \
-IMPLEMENT_DYNAMIC_CLASS(CLASSNAME, BASECLASS) \
+wxIMPLEMENT_DYNAMIC_CLASS(CLASSNAME, BASECLASS); \
 wxString CLASSNAME::GetName() const \
 { \
     return wxS(#EDITOR); \
@@ -246,7 +246,7 @@ wxPGEditor* wxPGEditor_##EDITOR = NULL;
 
 class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor);
 public:
     wxPGTextCtrlEditor() {}
     virtual ~wxPGTextCtrlEditor();
@@ -289,7 +289,7 @@ public:
 
 class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGChoiceEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGChoiceEditor);
 public:
     wxPGChoiceEditor() {}
     virtual ~wxPGChoiceEditor();
@@ -336,7 +336,7 @@ public:
 
 class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor);
 public:
     wxPGComboBoxEditor() {}
     virtual ~wxPGComboBoxEditor();
@@ -374,7 +374,7 @@ public:
                                           const wxPoint& pos,
                                           const wxSize& size) const;
 
-    DECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor);
 };
 
 class WXDLLIMPEXP_PROPGRID
@@ -390,7 +390,7 @@ public:
                                           const wxPoint& pos,
                                           const wxSize& size) const;
 
-    DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor);
 };
 
 
@@ -402,7 +402,7 @@ public:
 //
 class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor);
 public:
     wxPGCheckBoxEditor() {}
     virtual ~wxPGCheckBoxEditor();
@@ -464,7 +464,7 @@ public:
 */
 class WXDLLIMPEXP_PROPGRID wxPGEditorDialogAdapter : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter)
+    wxDECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter);
 public:
     wxPGEditorDialogAdapter()
         : wxObject()
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 2404e70508..ffa8969111 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -67,7 +67,7 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGridPage : public wxEvtHandler,
                                                 public wxPropertyGridPageState
 {
     friend class wxPropertyGridManager;
-    DECLARE_CLASS(wxPropertyGridPage)
+    wxDECLARE_CLASS(wxPropertyGridPage);
 public:
 
     wxPropertyGridPage();
@@ -188,7 +188,7 @@ protected:
 private:
     bool                    m_isDefault; // is this base page object?
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // -----------------------------------------------------------------------
@@ -220,7 +220,7 @@ class wxPGHeaderCtrl;
 class WXDLLIMPEXP_PROPGRID
     wxPropertyGridManager : public wxPanel, public wxPropertyGridInterface
 {
-    DECLARE_CLASS(wxPropertyGridManager)
+    wxDECLARE_CLASS(wxPropertyGridManager);
     friend class wxPropertyGridPage;
 public:
 
@@ -753,7 +753,7 @@ protected:
     // Reconnect propgrid event handlers.
     void ReconnectEventHandlers(wxWindowID oldId, wxWindowID newId);
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // -----------------------------------------------------------------------
diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index a5e1cbd816..9d9b49f4ad 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -1131,7 +1131,7 @@ class WXDLLIMPEXP_PROPGRID wxPGProperty : public wxObject
     friend class wxPropertyGridPopulator;
     friend class wxStringProperty;  // Proper "<composed>" support requires this
 
-    DECLARE_ABSTRACT_CLASS(wxPGProperty)
+    wxDECLARE_ABSTRACT_CLASS(wxPGProperty);
 public:
     typedef wxUint32 FlagType;
 
@@ -2538,7 +2538,7 @@ private:
 #ifndef WX_PG_DECLARE_PROPERTY_CLASS
     #define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
         public: \
-            DECLARE_DYNAMIC_CLASS(CLASSNAME) \
+            wxDECLARE_DYNAMIC_CLASS(CLASSNAME); \
             WX_PG_DECLARE_DOGETEDITORCLASS \
         private:
 #endif
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 4b1ac95968..600366a826 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -757,7 +757,7 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxControl,
     friend class wxPropertyGridManager;
     friend class wxPGHeaderCtrl;
 
-    DECLARE_DYNAMIC_CLASS(wxPropertyGrid)
+    wxDECLARE_DYNAMIC_CLASS(wxPropertyGrid);
 public:
 
 #ifndef SWIG
@@ -2301,7 +2301,7 @@ private:
 
     bool ButtonTriggerKeyTest( int action, wxKeyEvent& event );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // -----------------------------------------------------------------------
@@ -2606,7 +2606,7 @@ public:
 private:
     void Init();
     void OnPropertyGridSet();
-    DECLARE_DYNAMIC_CLASS(wxPropertyGridEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxPropertyGridEvent);
 
     wxPGProperty*       m_property;
     wxPropertyGrid*     m_pg;
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index baaf63449c..f02e630f91 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -35,13 +35,13 @@ class wxPGArrayEditorDialog;
 //
 
 #define wxPG_IMPLEMENT_PROPERTY_CLASS(NAME, UPCLASS, EDITOR) \
-wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS) \
+wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS); \
 wxPG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, EDITOR)
 
 #if WXWIN_COMPATIBILITY_3_0
 // This macro is deprecated. Use wxPG_IMPLEMENT_PROPERTY_CLASS instead.
 #define WX_PG_IMPLEMENT_PROPERTY_CLASS(NAME, UPCLASS, T, T_AS_ARG, EDITOR) \
-IMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS) \
+wxIMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS); \
 WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, T, EDITOR)
 #endif // WXWIN_COMPATIBILITY_3_0
 
@@ -767,7 +767,7 @@ protected:
 */
 class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxLongStringProperty
 {
-    DECLARE_DYNAMIC_CLASS(wxDirProperty)
+    wxDECLARE_DYNAMIC_CLASS(wxDirProperty);
 public:
     wxDirProperty( const wxString& name = wxPG_LABEL,
                    const wxString& label = wxPG_LABEL,
@@ -1022,8 +1022,8 @@ protected:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayEditorDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayEditorDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_EDITABLELISTBOX
@@ -1076,8 +1076,8 @@ protected:
     virtual void ArraySwap( size_t first, size_t second );
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 // -----------------------------------------------------------------------
diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index 57a9d94fa5..4654728403 100644
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -29,7 +29,7 @@ public:
     wxInputStream *GetInputStream(const wxString& path) wxOVERRIDE;
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto);
     DECLARE_PROTOCOL(wxFileProto)
 };
 
diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index e3501a3f0d..426b6c9914 100644
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -163,7 +163,7 @@ protected:
     friend class wxInputFTPStream;
     friend class wxOutputFTPStream;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP);
     DECLARE_PROTOCOL(wxFTP)
 };
 
diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 1d4f375a54..90e044862a 100644
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -85,7 +85,7 @@ protected:
     wxString       m_contentType;
     int m_http_response;
 
-    DECLARE_DYNAMIC_CLASS(wxHTTP)
+    wxDECLARE_DYNAMIC_CLASS(wxHTTP);
     DECLARE_PROTOCOL(wxHTTP)
     wxDECLARE_NO_COPY_CLASS(wxHTTP);
 };
diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index 23ffc1dd92..e500f9dbb2 100644
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -128,7 +128,7 @@ protected:
 private:
     wxProtocolLog *m_log;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol);
 };
 
 // ----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ protected:
 
     friend class wxURL;
 
-    DECLARE_DYNAMIC_CLASS(wxProtoInfo)
+    wxDECLARE_DYNAMIC_CLASS(wxProtoInfo);
     wxDECLARE_NO_COPY_CLASS(wxProtoInfo);
 };
 
diff --git a/include/wx/qt/accel.h b/include/wx/qt/accel.h
index 2837a2142a..be25cd13fd 100644
--- a/include/wx/qt/accel.h
+++ b/include/wx/qt/accel.h
@@ -54,7 +54,7 @@ protected:
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
     
 private:  
-    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 };
 
 #endif // _WX_QT_ACCEL_H_
diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h
index 93164cc7ea..13d5b80745 100644
--- a/include/wx/qt/bitmap.h
+++ b/include/wx/qt/bitmap.h
@@ -83,7 +83,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 class WXDLLIMPEXP_CORE wxMask : public wxObject
@@ -118,7 +118,7 @@ public:
     QBitmap *GetHandle() const;
 
 protected:
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 
 private:
     QBitmap *m_qtBitmap;
diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h
index 909f89dbdb..cf40ccc0c5 100644
--- a/include/wx/qt/calctrl.h
+++ b/include/wx/qt/calctrl.h
@@ -88,7 +88,7 @@ private:
     wxCalendarDateAttr *m_attrs[31];
 
 
-    DECLARE_DYNAMIC_CLASS(wxCalendarCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxCalendarCtrl);
 };
 
 #endif // _WX_QT_CALCTRL_H_
diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h
index 7e40c0c5b2..8ab1811879 100644
--- a/include/wx/qt/choice.h
+++ b/include/wx/qt/choice.h
@@ -75,7 +75,7 @@ protected:
 
 private:
 
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 #endif // _WX_QT_CHOICE_H_
diff --git a/include/wx/qt/clipbrd.h b/include/wx/qt/clipbrd.h
index 9c8a50e00a..1a0cb22bb2 100644
--- a/include/wx/qt/clipbrd.h
+++ b/include/wx/qt/clipbrd.h
@@ -37,8 +37,8 @@ private:
     wxEvtHandlerRef    m_sink;
 
     bool m_open;
-    
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // _WX_QT_CLIPBRD_H_
diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h
index 9e8d999120..8629217134 100644
--- a/include/wx/qt/colour.h
+++ b/include/wx/qt/colour.h
@@ -42,7 +42,7 @@ protected:
 private:
     QColor m_qtColor;
 
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // _WX_QT_COLOUR_H_
diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h
index 87865d69d8..3b0169f9c6 100644
--- a/include/wx/qt/combobox.h
+++ b/include/wx/qt/combobox.h
@@ -86,7 +86,7 @@ private:
     // From wxTextEntry:
     virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
 
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxComboBox);
 };
 
 #endif // _WX_QT_COMBOBOX_H_
diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h
index d5ab94ca1d..be112cd036 100644
--- a/include/wx/qt/control.h
+++ b/include/wx/qt/control.h
@@ -32,7 +32,7 @@ protected:
         const wxString &name );
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
+    wxDECLARE_DYNAMIC_CLASS(wxControl);
 };
 
 #endif // _WX_QT_CONTROL_H_
diff --git a/include/wx/qt/ctrlsub.h b/include/wx/qt/ctrlsub.h
index 2d4abfb30b..f021fa4970 100644
--- a/include/wx/qt/ctrlsub.h
+++ b/include/wx/qt/ctrlsub.h
@@ -16,7 +16,7 @@ public:
 protected:
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+    wxDECLARE_ABSTRACT_CLASS(wxControlWithItems);
 };
 
 #endif // _WX_QT_CTRLSUB_H_
diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h
index 4c5452ec4f..0db340209c 100644
--- a/include/wx/qt/cursor.h
+++ b/include/wx/qt/cursor.h
@@ -39,8 +39,8 @@ protected:
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-    
-    DECLARE_DYNAMIC_CLASS( wxCursor )
+
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif // _WX_QT_CURSOR_H_
diff --git a/include/wx/qt/dcscreen.h b/include/wx/qt/dcscreen.h
index 5289cc53fb..baa996ff46 100644
--- a/include/wx/qt/dcscreen.h
+++ b/include/wx/qt/dcscreen.h
@@ -21,7 +21,7 @@ public:
 
 private:
 
-    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_QT_DCSCREEN_H_
diff --git a/include/wx/qt/dirdlg.h b/include/wx/qt/dirdlg.h
index 7a32531693..f7bc38a3f5 100644
--- a/include/wx/qt/dirdlg.h
+++ b/include/wx/qt/dirdlg.h
@@ -40,7 +40,7 @@ public:     // overrides from wxGenericDirDialog
 
 private:
 
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 
 #endif // _WX_QT_DIRDLG_H_
diff --git a/include/wx/qt/filedlg.h b/include/wx/qt/filedlg.h
index 7983d12514..47ce43fc96 100644
--- a/include/wx/qt/filedlg.h
+++ b/include/wx/qt/filedlg.h
@@ -49,10 +49,10 @@ public:
     virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
 
     virtual QFileDialog *GetHandle() const;
-    
+
 private:
-    
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
+
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
 };
 
 #endif // _WX_QT_FILEDLG_H_
diff --git a/include/wx/qt/font.h b/include/wx/qt/font.h
index 224468e8b4..dd11fc1774 100644
--- a/include/wx/qt/font.h
+++ b/include/wx/qt/font.h
@@ -75,7 +75,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
     virtual wxFontFamily DoGetFamily() const;
 
-    DECLARE_DYNAMIC_CLASS( wxFont )
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 
 };
 
diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h
index de44da7473..b1d63464cc 100644
--- a/include/wx/qt/fontdlg.h
+++ b/include/wx/qt/fontdlg.h
@@ -26,7 +26,7 @@ private:
 
     wxFontData m_data;
 
-    DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFontDialog);
 };
 
 #endif // _WX_QT_FONTDLG_H_
diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h
index f812ffaf6c..73c5b54957 100644
--- a/include/wx/qt/glcanvas.h
+++ b/include/wx/qt/glcanvas.h
@@ -21,7 +21,7 @@ public:
 private:
     QGLContext *m_glContext;
 
-    DECLARE_CLASS(wxGLContext)
+    wxDECLARE_CLASS(wxGLContext);
 };
 
 // ----------------------------------------------------------------------------
@@ -58,8 +58,8 @@ public:
 
 private:
 
-//    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGLCanvas)
+//    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_
diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h
index 42ef40a104..59e5822dad 100644
--- a/include/wx/qt/listbox.h
+++ b/include/wx/qt/listbox.h
@@ -89,7 +89,7 @@ protected:
 private:
     virtual void Init(); //common construction
 
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
 };
 
 #endif // _WX_QT_LISTBOX_H_
diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h
index ab622a85cb..f8ec160355 100644
--- a/include/wx/qt/mdi.h
+++ b/include/wx/qt/mdi.h
@@ -39,7 +39,7 @@ public:
 protected:
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 
diff --git a/include/wx/qt/minifram.h b/include/wx/qt/minifram.h
index 86897e2730..daf75a35f5 100644
--- a/include/wx/qt/minifram.h
+++ b/include/wx/qt/minifram.h
@@ -41,7 +41,7 @@ public:
   }
 
 protected:
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
+  wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame);
 };
 
 #endif
diff --git a/include/wx/qt/popupwin.h b/include/wx/qt/popupwin.h
index 1a86e39b79..d70ad9225b 100644
--- a/include/wx/qt/popupwin.h
+++ b/include/wx/qt/popupwin.h
@@ -17,7 +17,7 @@ public:
 protected:
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
 };
 
 #endif // _WX_QT_POPUPWIN_H_
diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h
index 54016ae3d0..62ea5a50cc 100644
--- a/include/wx/qt/radiobox.h
+++ b/include/wx/qt/radiobox.h
@@ -89,7 +89,7 @@ private:
     // Autofit layout for buttons (either vert. or horiz.):
     QBoxLayout *m_qtBoxLayout;
 
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };
 
 #endif // _WX_QT_RADIOBOX_H_
diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h
index 61a62ead6c..2efa3dde30 100644
--- a/include/wx/qt/scrolbar.h
+++ b/include/wx/qt/scrolbar.h
@@ -47,7 +47,7 @@ public:
 private:
     QScrollBar *m_qtScrollBar;
 
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 
diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h
index 6794074fc2..6d016eb101 100644
--- a/include/wx/qt/spinctrl.h
+++ b/include/wx/qt/spinctrl.h
@@ -85,7 +85,7 @@ private:
         m_base = 10;
     }
     int m_base;
-    DECLARE_DYNAMIC_CLASS( wxSpinCtrl )
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrl);
 };
 
 class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlQt< double, QDoubleSpinBox >
diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h
index 634d0f50ec..a4b87687d6 100644
--- a/include/wx/qt/statbmp.h
+++ b/include/wx/qt/statbmp.h
@@ -41,7 +41,7 @@ protected:
 private:
     QLabel *m_qtLabel;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 };
 
 #endif // _WX_QT_STATBMP_H_
diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h
index 1cd3b18cb5..233e506efd 100644
--- a/include/wx/qt/statusbar.h
+++ b/include/wx/qt/statusbar.h
@@ -44,7 +44,7 @@ private:
     QStatusBar *m_qtStatusBar;
     QList< QLabel* > m_qtPanes;
 
-    DECLARE_DYNAMIC_CLASS( wxStatusBar )
+    wxDECLARE_DYNAMIC_CLASS(wxStatusBar);
 };
 
 
diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h
index 354a6a9557..6a29f93749 100644
--- a/include/wx/qt/taskbar.h
+++ b/include/wx/qt/taskbar.h
@@ -28,7 +28,7 @@ public:
 private:
     QSystemTrayIcon m_qtSystemTrayIcon;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
 };
 
 #endif // _WX_QT_TASKBAR_H_
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index c409656e7c..1aee755854 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -39,7 +39,7 @@ public:
     virtual QPushButton *GetHandle() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
 
 };
 
diff --git a/include/wx/qt/toolbar.h b/include/wx/qt/toolbar.h
index 276f7ffe96..0697d372ea 100644
--- a/include/wx/qt/toolbar.h
+++ b/include/wx/qt/toolbar.h
@@ -71,7 +71,7 @@ private:
 
     QToolBar *m_qtToolBar;
 
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
 };
 
 #endif // _WX_QT_TOOLBAR_H_
diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h
index e14af5fa18..af832c522f 100644
--- a/include/wx/qt/treectrl.h
+++ b/include/wx/qt/treectrl.h
@@ -135,7 +135,7 @@ protected:
 private:
     QTreeWidget *m_qtTreeWidget;
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 };
 
 #endif // _WX_QT_TREECTRL_H_
diff --git a/include/wx/quantize.h b/include/wx/quantize.h
index d323a3504c..366194f1f3 100644
--- a/include/wx/quantize.h
+++ b/include/wx/quantize.h
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 class WXDLLIMPEXP_CORE wxQuantize: public wxObject
 {
 public:
-DECLARE_DYNAMIC_CLASS(wxQuantize)
+    wxDECLARE_DYNAMIC_CLASS(wxQuantize);
 
 //// Constructor
 
diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index c83d4acafc..f9d7c324fe 100644
--- a/include/wx/rearrangectrl.h
+++ b/include/wx/rearrangectrl.h
@@ -111,7 +111,7 @@ private:
     wxArrayInt m_order;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxRearrangeList);
 };
 
@@ -168,7 +168,7 @@ private:
     wxRearrangeList *m_list;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxRearrangeCtrl);
 };
 
diff --git a/include/wx/ribbon/bar.h b/include/wx/ribbon/bar.h
index 954a8e6f76..221640504f 100644
--- a/include/wx/ribbon/bar.h
+++ b/include/wx/ribbon/bar.h
@@ -75,7 +75,7 @@ protected:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonBarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonBarEvent);
 #endif
 };
 
@@ -215,8 +215,8 @@ protected:
     wxRibbonDisplayMode m_ribbon_state;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonBar);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h
index 93bdd09c29..2f3693cb2c 100644
--- a/include/wx/ribbon/buttonbar.h
+++ b/include/wx/ribbon/buttonbar.h
@@ -192,8 +192,8 @@ protected:
     bool m_show_tooltips_for_disabled;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonButtonBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonButtonBar);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -229,7 +229,7 @@ protected:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonButtonBarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonButtonBarEvent);
 #endif
 };
 
diff --git a/include/wx/ribbon/control.h b/include/wx/ribbon/control.h
index cbd445b8d3..120ae7dee0 100644
--- a/include/wx/ribbon/control.h
+++ b/include/wx/ribbon/control.h
@@ -72,7 +72,7 @@ private:
     void Init() { m_art = NULL; }
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonControl)
+    wxDECLARE_CLASS(wxRibbonControl);
 #endif
 };
 
diff --git a/include/wx/ribbon/gallery.h b/include/wx/ribbon/gallery.h
index 07b76cf0bb..4c1b2fd726 100644
--- a/include/wx/ribbon/gallery.h
+++ b/include/wx/ribbon/gallery.h
@@ -117,8 +117,8 @@ protected:
     bool m_hovered;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonGallery)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonGallery);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -153,7 +153,7 @@ protected:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonGalleryEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonGalleryEvent);
 #endif
 };
 
diff --git a/include/wx/ribbon/page.h b/include/wx/ribbon/page.h
index 140012fc86..3a047b7be6 100644
--- a/include/wx/ribbon/page.h
+++ b/include/wx/ribbon/page.h
@@ -95,8 +95,8 @@ protected:
     bool m_scroll_buttons_visible;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonPage)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonPage);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h
index f549a9758f..6f8a489b41 100644
--- a/include/wx/ribbon/panel.h
+++ b/include/wx/ribbon/panel.h
@@ -134,8 +134,8 @@ protected:
     wxRect m_ext_button_rect;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonPanel)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonPanel);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -166,7 +166,7 @@ protected:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonPanelEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonPanelEvent);
 #endif
 };
 
diff --git a/include/wx/ribbon/toolbar.h b/include/wx/ribbon/toolbar.h
index 06d12857b3..996927bf5e 100644
--- a/include/wx/ribbon/toolbar.h
+++ b/include/wx/ribbon/toolbar.h
@@ -191,8 +191,8 @@ protected:
     int m_nrows_max;
 
 #ifndef SWIG
-    DECLARE_CLASS(wxRibbonToolBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonToolBar);
+    wxDECLARE_EVENT_TABLE();
 #endif
 };
 
@@ -224,7 +224,7 @@ protected:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonToolBarEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonToolBarEvent);
 #endif
 };
 
diff --git a/include/wx/richtext/richtextbackgroundpage.h b/include/wx/richtext/richtextbackgroundpage.h
index db24690bdf..45d0086287 100644
--- a/include/wx/richtext/richtextbackgroundpage.h
+++ b/include/wx/richtext/richtextbackgroundpage.h
@@ -47,8 +47,8 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextColourSwatchCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBackgroundPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextBackgroundPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBackgroundPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextborderspage.h b/include/wx/richtext/richtextborderspage.h
index 26148cb820..3f7e8740a7 100644
--- a/include/wx/richtext/richtextborderspage.h
+++ b/include/wx/richtext/richtextborderspage.h
@@ -48,8 +48,8 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBorderPreviewCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBordersPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextBordersPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBordersPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
@@ -295,7 +295,7 @@ private:
     wxRichTextAttr* m_attributes;
 
     void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 8e487fef26..197d5da97a 100644
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -1852,7 +1852,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRect, wxRichTextRectArray, WXDLLIMPEXP_RICHT
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextProperties: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxRichTextProperties)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextProperties);
 public:
 
     /**
@@ -2078,7 +2078,7 @@ protected:
 
     double m_fontScale;
 
-    DECLARE_DYNAMIC_CLASS(wxRichTextFontTable)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextFontTable);
 };
 
 /**
@@ -2395,7 +2395,7 @@ public:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingContext: public wxObject
 {
-    DECLARE_CLASS(wxRichTextDrawingContext)
+    wxDECLARE_CLASS(wxRichTextDrawingContext);
 public:
 
     /**
@@ -2519,7 +2519,7 @@ public:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextObject: public wxObject
 {
-    DECLARE_CLASS(wxRichTextObject)
+    wxDECLARE_CLASS(wxRichTextObject);
 public:
     /**
         Constructor, taking an optional parent pointer.
@@ -3106,7 +3106,7 @@ WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIM
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextCompositeObject: public wxRichTextObject
 {
-    DECLARE_CLASS(wxRichTextCompositeObject)
+    wxDECLARE_CLASS(wxRichTextCompositeObject);
 public:
 // Constructors
 
@@ -3226,7 +3226,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox);
 public:
 // Constructors
 
@@ -3831,7 +3831,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBox);
 public:
 // Constructors
 
@@ -3913,7 +3913,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextField: public wxRichTextParagraphLayoutBox
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextField)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextField);
 public:
 // Constructors
 
@@ -3997,7 +3997,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFieldType: public wxObject
 {
-    DECLARE_CLASS(wxRichTextFieldType)
+    wxDECLARE_CLASS(wxRichTextFieldType);
 public:
     /**
         Creates a field type definition.
@@ -4111,7 +4111,7 @@ WX_DECLARE_STRING_HASH_MAP(wxRichTextFieldType*, wxRichTextFieldTypeHashMap);
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFieldTypeStandard: public wxRichTextFieldType
 {
-    DECLARE_CLASS(wxRichTextFieldTypeStandard)
+    wxDECLARE_CLASS(wxRichTextFieldTypeStandard);
 public:
 
     // Display style types
@@ -4487,7 +4487,7 @@ WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEX
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph: public wxRichTextCompositeObject
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraph)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraph);
 public:
 // Constructors
 
@@ -4674,7 +4674,7 @@ friend class wxRichTextFloatCollector;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextPlainText)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextPlainText);
 public:
 // Constructors
 
@@ -4946,7 +4946,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextImage)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextImage);
 public:
     enum { ImageState_Unloaded, ImageState_Loaded, ImageState_Bad };
 
@@ -5109,7 +5109,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextBuffer)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBuffer);
 public:
 // Constructors
 
@@ -5921,7 +5921,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextCell: public wxRichTextBox
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextCell)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextCell);
 public:
 // Constructors
 
@@ -5998,7 +5998,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextObjectPtrArray, wxRichTextObjectPtrA
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextTable: public wxRichTextBox
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextTable)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextTable);
 public:
 
 // Constructors
@@ -6620,7 +6620,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject
 {
-    DECLARE_CLASS(wxRichTextFileHandler)
+    wxDECLARE_CLASS(wxRichTextFileHandler);
 public:
     /**
         Creates a file handler object.
@@ -6775,7 +6775,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextPlainTextHandler: public wxRichTextFileHandler
 {
-    DECLARE_CLASS(wxRichTextPlainTextHandler)
+    wxDECLARE_CLASS(wxRichTextPlainTextHandler);
 public:
     wxRichTextPlainTextHandler(const wxString& name = wxT("Text"),
                                const wxString& ext = wxT("txt"),
@@ -6812,7 +6812,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingHandler: public wxObject
 {
-    DECLARE_CLASS(wxRichTextDrawingHandler)
+    wxDECLARE_CLASS(wxRichTextDrawingHandler);
 public:
     /**
         Creates a drawing handler object.
diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index 63e55c1696..661666a02c 100644
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -45,8 +45,8 @@ class wxRichTextCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextBulletsPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBulletsPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index 2327fe3dcc..d83fbbcf31 100644
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -217,8 +217,8 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl,
                                             public wxTextCtrlIface,
                                             public wxScrollHelper
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextCtrl )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextCtrl);
+    wxDECLARE_EVENT_TABLE();
 
 public:
 // Constructors
@@ -2653,7 +2653,7 @@ protected:
     wxRichTextParagraphLayoutBox*   m_oldContainer;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent);
 };
 
 /*!
diff --git a/include/wx/richtext/richtextdialogpage.h b/include/wx/richtext/richtextdialogpage.h
index 206fd3e915..8caffca89f 100644
--- a/include/wx/richtext/richtextdialogpage.h
+++ b/include/wx/richtext/richtextdialogpage.h
@@ -24,7 +24,7 @@
 class WXDLLIMPEXP_RICHTEXT wxRichTextDialogPage: public wxPanel
 {
 public:
-    DECLARE_CLASS(wxRichTextDialogPage)
+    wxDECLARE_CLASS(wxRichTextDialogPage);
     wxRichTextDialogPage() {}
     wxRichTextDialogPage(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0)
     {
diff --git a/include/wx/richtext/richtextfontpage.h b/include/wx/richtext/richtextfontpage.h
index b658f3a30f..78b80ffc51 100644
--- a/include/wx/richtext/richtextfontpage.h
+++ b/include/wx/richtext/richtextfontpage.h
@@ -51,8 +51,8 @@ class wxRichTextFontPreviewCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextFontPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextFontPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index b48e4953eb..ea0909065b 100644
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -122,7 +122,7 @@ public:
 class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog,
                                                        public wxWithImages
 {
-DECLARE_CLASS(wxRichTextFormattingDialog)
+    wxDECLARE_CLASS(wxRichTextFormattingDialog);
 DECLARE_HELP_PROVISION()
 
 public:
@@ -273,7 +273,7 @@ protected:
     static bool                                 sm_restoreLastPage;
     static int                                  sm_lastPage;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 //-----------------------------------------------------------------------------
@@ -292,7 +292,7 @@ private:
     int m_textEffects;
 
     void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*
@@ -301,7 +301,7 @@ private:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextColourSwatchCtrl: public wxControl
 {
-    DECLARE_CLASS(wxRichTextColourSwatchCtrl)
+    wxDECLARE_CLASS(wxRichTextColourSwatchCtrl);
 public:
     wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
     ~wxRichTextColourSwatchCtrl();
@@ -317,7 +317,7 @@ public:
 protected:
     wxColour    m_colour;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*!
@@ -327,8 +327,8 @@ DECLARE_EVENT_TABLE()
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextFontListBox: public wxHtmlListBox
 {
-    DECLARE_CLASS(wxRichTextFontListBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRichTextFontListBox);
+    wxDECLARE_EVENT_TABLE();
 
 public:
     wxRichTextFontListBox()
diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h
index 9761384f81..9bd275047b 100644
--- a/include/wx/richtext/richtexthtml.h
+++ b/include/wx/richtext/richtexthtml.h
@@ -26,7 +26,7 @@
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler);
 public:
     wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML);
 
diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index 81f595fb0e..daf320ae8c 100644
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -45,8 +45,8 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextObjectPropertiesDialog: public wxRichTextFormattingDialog
 {    
-    DECLARE_DYNAMIC_CLASS( wxRichTextObjectPropertiesDialog )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextObjectPropertiesDialog);
+    wxDECLARE_EVENT_TABLE();
 
 public:
     /// Constructors
diff --git a/include/wx/richtext/richtextindentspage.h b/include/wx/richtext/richtextindentspage.h
index 6c61bf2c85..d5a879bcbe 100644
--- a/include/wx/richtext/richtextindentspage.h
+++ b/include/wx/richtext/richtextindentspage.h
@@ -47,8 +47,8 @@ class wxRichTextCtrl;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextIndentsSpacingPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextIndentsSpacingPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextliststylepage.h b/include/wx/richtext/richtextliststylepage.h
index 1285ecd3e8..488b0d034b 100644
--- a/include/wx/richtext/richtextliststylepage.h
+++ b/include/wx/richtext/richtextliststylepage.h
@@ -41,8 +41,8 @@
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextListStylePage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextListStylePage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextListStylePage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextmarginspage.h b/include/wx/richtext/richtextmarginspage.h
index 32259a09db..e247a1ef1c 100644
--- a/include/wx/richtext/richtextmarginspage.h
+++ b/include/wx/richtext/richtextmarginspage.h
@@ -46,9 +46,9 @@
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextMarginsPage: public wxRichTextDialogPage
-{    
-    DECLARE_DYNAMIC_CLASS( wxRichTextMarginsPage )
-    DECLARE_EVENT_TABLE()
+{
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextMarginsPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 5dceccf319..bff09ec5e3 100644
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -86,7 +86,7 @@ public:
     void SetTextColour(const wxColour& col) { m_colour = col; }
     const wxColour& GetTextColour() const { return m_colour; }
 
-    DECLARE_CLASS(wxRichTextHeaderFooterData)
+    wxDECLARE_CLASS(wxRichTextHeaderFooterData);
 
 private:
 
diff --git a/include/wx/richtext/richtextsizepage.h b/include/wx/richtext/richtextsizepage.h
index c3422a754e..93c1e0a81e 100644
--- a/include/wx/richtext/richtextsizepage.h
+++ b/include/wx/richtext/richtextsizepage.h
@@ -48,8 +48,8 @@
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextSizePage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextSizePage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextSizePage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index eeb5189c22..79b14f99c7 100644
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -78,8 +78,8 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextStyleOrganiserDialog);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextstylepage.h b/include/wx/richtext/richtextstylepage.h
index c3ebb2e9bb..49fbd1fcb9 100644
--- a/include/wx/richtext/richtextstylepage.h
+++ b/include/wx/richtext/richtextstylepage.h
@@ -31,8 +31,8 @@
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStylePage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextStylePage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextStylePage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextstyles.h b/include/wx/richtext/richtextstyles.h
index 4293ccf76c..28caaa7ab0 100644
--- a/include/wx/richtext/richtextstyles.h
+++ b/include/wx/richtext/richtextstyles.h
@@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleDefinition: public wxObject
 {
-    DECLARE_CLASS(wxRichTextStyleDefinition)
+    wxDECLARE_CLASS(wxRichTextStyleDefinition);
 public:
 
     /// Copy constructors
@@ -129,7 +129,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextCharacterStyleDefinition: public wxRichTextStyleDefinition
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition);
 public:
 
     /// Copy constructor
@@ -154,7 +154,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphStyleDefinition: public wxRichTextStyleDefinition
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition);
 public:
 
     /// Copy constructor
@@ -195,7 +195,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextListStyleDefinition: public wxRichTextParagraphStyleDefinition
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextListStyleDefinition)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextListStyleDefinition);
 public:
 
     /// Copy constructor
@@ -261,7 +261,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextBoxStyleDefinition: public wxRichTextStyleDefinition
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextBoxStyleDefinition)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextBoxStyleDefinition);
 public:
 
     /// Copy constructor
@@ -295,7 +295,7 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet: public wxObject
 {
-    DECLARE_CLASS( wxRichTextStyleSheet )
+    wxDECLARE_CLASS(wxRichTextStyleSheet);
 
 public:
     /// Constructors
@@ -466,8 +466,8 @@ protected:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListBox: public wxHtmlListBox
 {
-    DECLARE_CLASS(wxRichTextStyleListBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRichTextStyleListBox);
+    wxDECLARE_EVENT_TABLE();
 
 public:
     /// Which type of style definition is currently showing?
@@ -578,8 +578,8 @@ private:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListCtrl: public wxControl
 {
-    DECLARE_CLASS(wxRichTextStyleListCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRichTextStyleListCtrl);
+    wxDECLARE_EVENT_TABLE();
 
 public:
 
@@ -690,7 +690,7 @@ protected:
     int             m_value;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*!
@@ -700,8 +700,8 @@ private:
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextStyleComboCtrl: public wxComboCtrl
 {
-    DECLARE_CLASS(wxRichTextStyleComboCtrl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRichTextStyleComboCtrl);
+    wxDECLARE_EVENT_TABLE();
 
 public:
     wxRichTextStyleComboCtrl()
diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index eafdbe5801..03b7dc0cbe 100644
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -55,8 +55,8 @@ class wxStdDialogButtonSizer;
 
 class WXDLLIMPEXP_RICHTEXT wxSymbolPickerDialog: public wxDialog
 {
-    DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxSymbolPickerDialog);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
@@ -366,9 +366,9 @@ private:
     // Unicode/ASCII mode
     bool        m_unicodeMode;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl);
-    DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
+    wxDECLARE_ABSTRACT_CLASS(wxSymbolListCtrl);
 };
 
 #endif
diff --git a/include/wx/richtext/richtexttabspage.h b/include/wx/richtext/richtexttabspage.h
index ee50f7498c..b0e595f803 100644
--- a/include/wx/richtext/richtexttabspage.h
+++ b/include/wx/richtext/richtexttabspage.h
@@ -45,8 +45,8 @@
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextTabsPage: public wxRichTextDialogPage
 {
-    DECLARE_DYNAMIC_CLASS( wxRichTextTabsPage )
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextTabsPage);
+    wxDECLARE_EVENT_TABLE();
     DECLARE_HELP_PROVISION()
 
 public:
diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index 072d34b2a7..6a17ade7db 100644
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -175,7 +175,7 @@ class WXDLLIMPEXP_FWD_XML wxXmlDocument;
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler);
 public:
     wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML)
         : wxRichTextFileHandler(name, ext, type)
diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index d1526344dd..941abe81c0 100644
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -64,7 +64,7 @@ protected:
 
 private:
     void Init();
-    DECLARE_ABSTRACT_CLASS(wxSockAddress)
+    wxDECLARE_ABSTRACT_CLASS(wxSockAddress);
 };
 
 // An IP address (either IPv4 or IPv6)
@@ -113,7 +113,7 @@ private:
     virtual void DoInitImpl() = 0;
 
 
-    DECLARE_ABSTRACT_CLASS(wxIPaddress)
+    wxDECLARE_ABSTRACT_CLASS(wxIPaddress);
 };
 
 // An IPv4 address
@@ -145,7 +145,7 @@ public:
 private:
     virtual void DoInitImpl();
 
-    DECLARE_DYNAMIC_CLASS(wxIPV4address)
+    wxDECLARE_DYNAMIC_CLASS(wxIPV4address);
 };
 
 
@@ -176,7 +176,7 @@ public:
 private:
     virtual void DoInitImpl();
 
-    DECLARE_DYNAMIC_CLASS(wxIPV6address)
+    wxDECLARE_DYNAMIC_CLASS(wxIPV6address);
 };
 
 #endif // wxUSE_IPV6
@@ -208,7 +208,7 @@ private:
         return const_cast<wxUNIXaddress *>(this)->GetUNIX();
     }
 
-    DECLARE_DYNAMIC_CLASS(wxUNIXaddress)
+    wxDECLARE_DYNAMIC_CLASS(wxUNIXaddress);
 };
 
 #endif // wxHAS_UNIX_DOMAIN_SOCKETS
diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 7dfe011d92..7d1e2c32d0 100644
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -109,7 +109,7 @@ private:
     friend class wxTCPEventHandler;
 
     wxDECLARE_NO_COPY_CLASS(wxTCPConnection);
-    DECLARE_DYNAMIC_CLASS(wxTCPConnection)
+    wxDECLARE_DYNAMIC_CLASS(wxTCPConnection);
 };
 
 class WXDLLIMPEXP_NET wxTCPServer : public wxServerBase
@@ -132,7 +132,7 @@ protected:
 #endif // __UNIX_LIKE__
 
     wxDECLARE_NO_COPY_CLASS(wxTCPServer);
-    DECLARE_DYNAMIC_CLASS(wxTCPServer)
+    wxDECLARE_DYNAMIC_CLASS(wxTCPServer);
 };
 
 class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase
@@ -151,7 +151,7 @@ public:
     virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxTCPClient)
+    wxDECLARE_DYNAMIC_CLASS(wxTCPClient);
 };
 
 #endif // wxUSE_SOCKETS && wxUSE_IPC
diff --git a/include/wx/scopedarray.h b/include/wx/scopedarray.h
index c857093e7c..2f80911fa2 100644
--- a/include/wx/scopedarray.h
+++ b/include/wx/scopedarray.h
@@ -60,7 +60,7 @@ public:
 private:
     T *m_array;
 
-    DECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedArray, T)
+    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedArray, T);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/scopedptr.h b/include/wx/scopedptr.h
index 5cc0c0770d..9cc8f3968e 100644
--- a/include/wx/scopedptr.h
+++ b/include/wx/scopedptr.h
@@ -101,7 +101,7 @@ public:
 private:
     T * m_ptr;
 
-    DECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedPtr, T)
+    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedPtr, T);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index d22564faed..fad40d0ac4 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -471,7 +471,7 @@ public:
                      const wxString& name = wxPanelNameStr)
         : wxScrolled<wxPanel>(parent, winid, pos, size, style, name) {}
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow);
 };
 
 typedef wxScrolled<wxWindow> wxScrolledCanvas;
diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 1a562d2346..96435d844f 100644
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -498,7 +498,7 @@ protected:
     wxObject    *m_userData;
 
 private:
-    DECLARE_CLASS(wxSizerItem)
+    wxDECLARE_CLASS(wxSizerItem);
     wxDECLARE_NO_COPY_CLASS(wxSizerItem);
 };
 
@@ -752,7 +752,7 @@ protected:
     virtual wxSizerItem* DoInsert(size_t index, wxSizerItem *item);
 
 private:
-    DECLARE_CLASS(wxSizer)
+    wxDECLARE_CLASS(wxSizer);
 };
 
 //---------------------------------------------------------------------------
@@ -839,7 +839,7 @@ protected:
     }
 
 private:
-    DECLARE_CLASS(wxGridSizer)
+    wxDECLARE_CLASS(wxGridSizer);
 };
 
 //---------------------------------------------------------------------------
@@ -931,7 +931,7 @@ protected:
     wxSize m_calculatedMinSize;
 
 private:
-    DECLARE_CLASS(wxFlexGridSizer)
+    wxDECLARE_CLASS(wxFlexGridSizer);
     wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer);
 };
 
@@ -1024,7 +1024,7 @@ protected:
     wxSize m_minSize;
 
 private:
-    DECLARE_CLASS(wxBoxSizer)
+    wxDECLARE_CLASS(wxBoxSizer);
 };
 
 //---------------------------------------------------------------------------
@@ -1060,7 +1060,7 @@ protected:
     wxStaticBox   *m_staticBox;
 
 private:
-    DECLARE_CLASS(wxStaticBoxSizer)
+    wxDECLARE_CLASS(wxStaticBoxSizer);
     wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer);
 };
 
@@ -1112,7 +1112,7 @@ protected:
     wxButton *m_buttonHelp;         // wxID_HELP, wxID_CONTEXT_HELP
 
 private:
-    DECLARE_CLASS(wxStdDialogButtonSizer)
+    wxDECLARE_CLASS(wxStdDialogButtonSizer);
     wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer);
 };
 
diff --git a/include/wx/socket.h b/include/wx/socket.h
index e2f8c0f1c5..daded4bf05 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -300,8 +300,8 @@ private:
     friend class wxSocketReadGuard;
     friend class wxSocketWriteGuard;
 
+    wxDECLARE_CLASS(wxSocketBase);
     wxDECLARE_NO_COPY_CLASS(wxSocketBase);
-    DECLARE_CLASS(wxSocketBase)
 };
 
 
@@ -320,8 +320,8 @@ public:
 
     bool WaitForAccept(long seconds = -1, long milliseconds = 0);
 
+    wxDECLARE_CLASS(wxSocketServer);
     wxDECLARE_NO_COPY_CLASS(wxSocketServer);
-    DECLARE_CLASS(wxSocketServer)
 };
 
 
@@ -359,8 +359,8 @@ private:
     int m_initialRecvBufferSize;
     int m_initialSendBufferSize;
 
+    wxDECLARE_CLASS(wxSocketClient);
     wxDECLARE_NO_COPY_CLASS(wxSocketClient);
-    DECLARE_CLASS(wxSocketClient)
 };
 
 
@@ -388,8 +388,8 @@ public:
      */
 
 private:
+    wxDECLARE_CLASS(wxDatagramSocket);
     wxDECLARE_NO_COPY_CLASS(wxDatagramSocket);
-    DECLARE_CLASS(wxDatagramSocket)
 };
 
 
@@ -417,7 +417,7 @@ public:
     wxSocketNotify  m_event;
     void           *m_clientData;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent);
 };
 
 
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index abf191b555..7370ebf600 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -114,7 +114,7 @@ public:
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxSpinEvent(*this); }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent);
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 1d898e5c86..4df89ff178 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -87,7 +87,7 @@ protected:
     double m_value;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinDoubleEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinDoubleEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 35a15e5fb3..5d2f3fbc0b 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -5010,8 +5010,8 @@ protected:
     void NotifyParent(SCNotification* scn);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxStyledTextCtrl);
 
 protected:
 
@@ -5114,7 +5114,7 @@ public:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS(wxStyledTextEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxStyledTextEvent);
 
     int  m_position;
     int  m_key;
diff --git a/include/wx/stream.h b/include/wx/stream.h
index 017eb50004..52217f6fd3 100644
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -81,7 +81,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxStreamBase)
+    wxDECLARE_ABSTRACT_CLASS(wxStreamBase);
     wxDECLARE_NO_COPY_CLASS(wxStreamBase);
 };
 
@@ -221,7 +221,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxInputStream)
+    wxDECLARE_ABSTRACT_CLASS(wxInputStream);
     wxDECLARE_NO_COPY_CLASS(wxInputStream);
 };
 
@@ -263,7 +263,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxOutputStream)
+    wxDECLARE_ABSTRACT_CLASS(wxOutputStream);
     wxDECLARE_NO_COPY_CLASS(wxOutputStream);
 };
 
@@ -292,7 +292,7 @@ protected:
     size_t m_currentPos,
            m_lastPos;
 
-    DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
+    wxDECLARE_DYNAMIC_CLASS(wxCountingOutputStream);
     wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
 };
 
@@ -318,7 +318,7 @@ protected:
     wxInputStream *m_parent_i_stream;
     bool m_owns;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterInputStream)
+    wxDECLARE_ABSTRACT_CLASS(wxFilterInputStream);
     wxDECLARE_NO_COPY_CLASS(wxFilterInputStream);
 };
 
@@ -340,7 +340,7 @@ protected:
     wxOutputStream *m_parent_o_stream;
     bool m_owns;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)
+    wxDECLARE_ABSTRACT_CLASS(wxFilterOutputStream);
     wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream);
 };
 
@@ -372,7 +372,7 @@ public:
 protected:
     wxString::size_type FindExtension(const wxString& location) const;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase)
+    wxDECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase);
 };
 
 class WXDLLIMPEXP_BASE wxFilterClassFactory : public wxFilterClassFactoryBase
@@ -405,7 +405,7 @@ private:
     static wxFilterClassFactory *sm_first;
     wxFilterClassFactory *m_next;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterClassFactory)
+    wxDECLARE_ABSTRACT_CLASS(wxFilterClassFactory);
 };
 
 // ============================================================================
diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index 8459b1bbec..37a1ab3a99 100644
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -142,7 +142,7 @@ private:
 
     friend class wxTarInputStream;
 
-    DECLARE_DYNAMIC_CLASS(wxTarEntry)
+    wxDECLARE_DYNAMIC_CLASS(wxTarEntry);
 };
 
 
@@ -344,7 +344,7 @@ protected:
         { return NewStream(stream); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxTarClassFactory)
+    wxDECLARE_DYNAMIC_CLASS(wxTarClassFactory);
 };
 
 
diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index f97316cd53..84b1c1dec6 100644
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -66,7 +66,7 @@ private:
     // default events handling, calls CreatePopupMenu:
     void OnRightButtonDown(wxTaskBarIconEvent& event);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTaskBarIconBase);
 };
 
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index a104a49be1..71bddad2a5 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -265,7 +265,7 @@ protected:
     wxMenu *m_dropdownMenu;
 #endif
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase);
 };
 
 // a list of toolbar tools
@@ -695,7 +695,7 @@ protected:
     wxCoord m_defaultWidth, m_defaultHeight;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxToolBarBase);
 };
 
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index c69954f99d..aaad1a56a3 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -759,7 +759,7 @@ protected:
     virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
 
     wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase);
-    DECLARE_ABSTRACT_CLASS(wxTextCtrlBase)
+    wxDECLARE_ABSTRACT_CLASS(wxTextCtrlBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -831,7 +831,7 @@ protected:
          m_end;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTextUrlEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTextUrlEvent);
 
 public:
     // for wxWin RTTI only, don't use
diff --git a/include/wx/timer.h b/include/wx/timer.h
index 78e4b8e75a..956cc2a87e 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -180,7 +180,7 @@ public:
 private:
     wxTimer* m_timer;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent);
 };
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index a2ca0f13e2..1334c05d42 100644
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -85,7 +85,7 @@ private:
     wxTipWindow** m_windowPtr;
     wxRect m_rectBound;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
     friend class wxTipWindowView;
 
diff --git a/include/wx/tls.h b/include/wx/tls.h
index 7c21958a4f..7e7592286b 100644
--- a/include/wx/tls.h
+++ b/include/wx/tls.h
@@ -130,7 +130,7 @@
     private:
         wxTlsKey m_key;
 
-        DECLARE_NO_COPY_TEMPLATE_CLASS(wxTlsValue, T)
+        wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxTlsValue, T);
     };
 
     #define wxTLS_TYPE(T) wxTlsValue<T>
diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h
index e8e437362e..ecd703cfc2 100644
--- a/include/wx/toolbook.h
+++ b/include/wx/toolbook.h
@@ -119,8 +119,8 @@ private:
     // common part of all constructors
     void Init();
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolbook)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToolbook);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 559112a6fa..b6a2a49767 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -339,7 +339,7 @@ protected:
     bool m_modified;
 
     wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
@@ -390,7 +390,7 @@ protected:
         {
         }
 
-        DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
+        wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow);
     };
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index efab3e0fd9..6ce145f603 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -279,7 +279,7 @@ private:
     friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
     friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;
 
-    DECLARE_DYNAMIC_CLASS(wxTreeEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeEvent);
 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index b0e0204cf7..8661349c78 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -219,8 +219,8 @@ private:
     size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); }
 
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook);
 };
 
 
diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 480b6da8d3..ebb3a619e7 100644
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -63,8 +63,8 @@ protected:
     bool ChangeBitmap(const wxBitmap& bmp);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // _WX_UNIV_BMPBUTTN_H_
diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index ed8d21005c..16a58b1d7c 100644
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -105,7 +105,7 @@ protected:
     void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 #endif // _WX_UNIV_BUTTON_H_
diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 4019749df0..8e4a8fa028 100644
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -143,7 +143,7 @@ private:
     // is the checkbox currently pressed?
     bool m_isPressed;
 
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
 
 #endif // _WX_UNIV_CHECKBOX_H_
diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index a6132c21dc..7b20f37eee 100644
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -104,7 +104,7 @@ private:
     // the array containing the checked status of the items
     wxArrayInt m_checks;
 
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif // _WX_UNIV_CHECKLST_H_
diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 3578198331..b1b5f90337 100644
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -55,8 +55,8 @@ public:
 private:
     void OnComboBox(wxCommandEvent &event);
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 
diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 0a99a84b09..13283906e6 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -183,8 +183,8 @@ private:
     // the popup listbox
     wxListBox *m_lbox;
 
-    //DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    //wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxComboBox);
 };
 
 #endif // _WX_UNIV_COMBOBOX_H_
diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h
index 03ee6fa9ec..f6e228c51b 100644
--- a/include/wx/univ/control.h
+++ b/include/wx/univ/control.h
@@ -95,8 +95,8 @@ private:
     wxString   m_label;
     int        m_indexAccel;
 
-    DECLARE_DYNAMIC_CLASS(wxControl)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxControl);
+    wxDECLARE_EVENT_TABLE();
     WX_DECLARE_INPUT_CONSUMER()
 };
 
diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index e1c84e80c1..d73f8e5dc5 100644
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -79,8 +79,8 @@ private:
     // is modal right now?
     bool m_isShowingModal;
 
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 2e91dd9558..2ba413bdc3 100644
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -81,8 +81,8 @@ protected:
     virtual void PositionToolBar() wxOVERRIDE;
 #endif // wxUSE_TOOLBAR
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif // _WX_UNIV_FRAME_H_
diff --git a/include/wx/univ/gauge.h b/include/wx/univ/gauge.h
index e2d12b1dcd..2784368a4e 100644
--- a/include/wx/univ/gauge.h
+++ b/include/wx/univ/gauge.h
@@ -68,7 +68,7 @@ protected:
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
 };
 
 #endif // _WX_UNIV_GAUGE_H_
diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 2d120b1613..a3834cb82c 100644
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -303,8 +303,8 @@ private:
     // by not extending the selection but by choosing it directly
     int m_selAnchor;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
 };
 
 #endif // _WX_UNIV_LISTBOX_H_
diff --git a/include/wx/univ/menu.h b/include/wx/univ/menu.h
index a4734017f9..27ba99ad5b 100644
--- a/include/wx/univ/menu.h
+++ b/include/wx/univ/menu.h
@@ -130,7 +130,7 @@ private:
 
     // it calls out OnDismiss()
     friend class wxPopupMenuWindow;
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 // ----------------------------------------------------------------------------
@@ -267,8 +267,8 @@ private:
     // it calls out ProcessMouseEvent()
     friend class wxPopupMenuWindow;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 #endif // _WX_UNIV_MENU_H_
diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index cee4897be9..281c919cc7 100644
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -121,7 +121,7 @@ protected:
             m_height;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif // _WX_UNIV_MENUITEM_H_
diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index ca32431ed8..0a2f8f7f95 100644
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -244,7 +244,7 @@ protected:
     // the padding
     wxSize m_sizePad;
 
-    DECLARE_DYNAMIC_CLASS(wxNotebook)
+    wxDECLARE_DYNAMIC_CLASS(wxNotebook);
 };
 
 #endif // _WX_UNIV_NOTEBOOK_H_
diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 0fa4c67635..7c1a7d9750 100644
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -146,7 +146,7 @@ protected:
     wxEvtHandler *m_evtRadioHook;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };
 
 #endif // _WX_UNIV_RADIOBOX_H_
diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index 6f17b9e94f..ba5eb9a702 100644
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -71,7 +71,7 @@ protected:
     virtual void SendEvent() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
 };
 
 #endif // _WX_UNIV_RADIOBUT_H_
diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 025ffaf938..4f4c3e1b57 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -194,8 +194,8 @@ private:
     friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods
     friend class wxStdScrollBarInputHandler; // for geometry methods
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index fb61ab8922..f6384faf4f 100644
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -220,8 +220,8 @@ private:
     // the state of the thumb (wxCONTROL_XXX constants sum)
     int m_thumbFlags;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 };
 
 #endif // _WX_UNIV_SLIDER_H_
diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h
index 4f2862d55f..8dbe81e94c 100644
--- a/include/wx/univ/spinbutt.h
+++ b/include/wx/univ/spinbutt.h
@@ -95,7 +95,7 @@ private:
     // the state (combination of wxCONTROL_XXX flags) of the arrows
     int m_arrowsState[wxScrollArrows::Arrow_Max];
 
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index d799643ac4..0515a4fed8 100644
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -67,7 +67,7 @@ private:
     // the bitmap which we show
     wxBitmap m_bitmap;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
 };
 
 #endif // _WX_UNIV_STATBMP_H_
diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h
index e2d1b69e27..ac6d8e8365 100644
--- a/include/wx/univ/statbox.h
+++ b/include/wx/univ/statbox.h
@@ -58,7 +58,7 @@ protected:
     wxRect GetBorderGeometry() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 };
 
 #endif // _WX_UNIV_STATBOX_H_
diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index acf3edfe21..63d3a096c2 100644
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -48,7 +48,7 @@ protected:
     virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // _WX_UNIV_STATLINE_H_
diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 4e13ca2393..891ad7cf60 100644
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -61,7 +61,7 @@ protected:
     virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
     virtual wxString DoGetLabel() const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticText);
 };
 
 #endif // _WX_UNIV_STATTEXT_H_
diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index a0557368b6..fe39b05f38 100644
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -90,8 +90,8 @@ private:
     // the absolute status fields widths
     wxArrayInt m_widthsAbs;
 
-    DECLARE_DYNAMIC_CLASS(wxStatusBarUniv)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxStatusBarUniv);
+    wxDECLARE_EVENT_TABLE();
     WX_DECLARE_INPUT_CONSUMER()
 };
 
diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 53f5262c53..0aa40a437d 100644
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -526,8 +526,8 @@ private:
     // the object to which we delegate our undo/redo implementation
     wxTextCtrlCommandProcessor *m_cmdProcessor;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
     friend class wxWrappedLineData;
 };
diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 0c6070066a..21ef58f22a 100644
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -59,7 +59,7 @@ private:
     // common part of all ctors
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
 };
 
 #endif // _WX_UNIV_TGLBTN_H_
diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index 5023981ae7..7ab15e4bb8 100644
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -132,7 +132,7 @@ private:
             m_maxHeight;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
 };
 
 #endif // _WX_UNIV_TOOLBAR_H_
diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 2438c787e9..94e1edf9ca 100644
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -187,8 +187,8 @@ protected:
     // currently pressed titlebar button
     long m_pressedButton;
 
-    DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxTopLevelWindow);
+    wxDECLARE_EVENT_TABLE();
     WX_DECLARE_INPUT_CONSUMER()
 };
 
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 5fcb9776bd..f60ab83e27 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -284,8 +284,8 @@ private:
     static wxWindow *ms_winLastAltPress;
 #endif // wxUSE_MENUS
 
-    DECLARE_DYNAMIC_CLASS(wxWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxWindow);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_UNIV_WINDOW_H_
diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h
index 95a0669c9c..5a321a2860 100644
--- a/include/wx/unix/glx11.h
+++ b/include/wx/unix/glx11.h
@@ -30,7 +30,7 @@ private:
 
     GLXContext m_glContext;
 
-    DECLARE_CLASS(wxGLContext)
+    wxDECLARE_CLASS(wxGLContext);
 };
 
 // ----------------------------------------------------------------------------
@@ -173,7 +173,7 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGLApp)
+    wxDECLARE_DYNAMIC_CLASS(wxGLApp);
 };
 
 #endif // _WX_UNIX_GLX11_H_
diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index ef7a5db223..a20c936d29 100644
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -17,8 +17,8 @@ class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
-        public:
+    wxDECLARE_DYNAMIC_CLASS(wxJoystick);
+public:
     /*
      * Public interface
      */
diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h
index 09d96c2518..ffd3e0435b 100644
--- a/include/wx/unix/taskbarx11.h
+++ b/include/wx/unix/taskbarx11.h
@@ -34,7 +34,7 @@ protected:
 private:
     void OnDestroy(wxWindowDestroyEvent&);
 
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxTaskBarIcon);
 };
 
 #endif // _WX_UNIX_TASKBAR_H_
diff --git a/include/wx/uri.h b/include/wx/uri.h
index 758bd72e27..7653fdaca4 100644
--- a/include/wx/uri.h
+++ b/include/wx/uri.h
@@ -180,7 +180,7 @@ protected:
 
     size_t m_fields;
 
-    DECLARE_DYNAMIC_CLASS(wxURI)
+    wxDECLARE_DYNAMIC_CLASS(wxURI);
 };
 
 #endif // _WX_URI_H_
diff --git a/include/wx/url.h b/include/wx/url.h
index 572cae8b11..0ff2fefb0f 100644
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -107,7 +107,7 @@ protected:
     friend class wxURLModule;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxURL)
+    wxDECLARE_DYNAMIC_CLASS(wxURL);
 };
 
 #endif // wxUSE_URL
diff --git a/include/wx/valgen.h b/include/wx/valgen.h
index 7ee3a71a45..995db4f86a 100644
--- a/include/wx/valgen.h
+++ b/include/wx/valgen.h
@@ -85,7 +85,7 @@ protected:
     double*     m_pDouble;
 
 private:
-    DECLARE_CLASS(wxGenericValidator)
+    wxDECLARE_CLASS(wxGenericValidator);
     wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);
 };
 
diff --git a/include/wx/validate.h b/include/wx/validate.h
index 44633f940c..477af1019a 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -90,7 +90,7 @@ protected:
 private:
     static bool ms_isSilent;
 
-    DECLARE_DYNAMIC_CLASS(wxValidator)
+    wxDECLARE_DYNAMIC_CLASS(wxValidator);
     wxDECLARE_NO_ASSIGN_CLASS(wxValidator);
 };
 
diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 2c63801fd8..7dbdec176f 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -98,8 +98,8 @@ protected:
 
 private:
     wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator);
-    DECLARE_DYNAMIC_CLASS(wxTextValidator)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxTextValidator);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif
diff --git a/include/wx/variant.h b/include/wx/variant.h
index 694a3ca1d7..49e387e369 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -389,7 +389,7 @@ protected:
     wxString        m_name;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxVariant)
+    wxDECLARE_DYNAMIC_CLASS(wxVariant);
 };
 
 
diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 16b178055d..2bee9267a1 100644
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -302,9 +302,9 @@ private:
     // the selection bg colour
     wxColour m_colBgSel;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxVListBox);
-    DECLARE_ABSTRACT_CLASS(wxVListBox)
+    wxDECLARE_ABSTRACT_CLASS(wxVListBox);
 };
 
 #endif // _WX_VLBOX_H_
diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index ecf4455b73..b7b9da6794 100644
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -732,7 +732,7 @@ protected:
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxVScrolledWindow);
-    DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
+    wxDECLARE_ABSTRACT_CLASS(wxVScrolledWindow);
 };
 
 
@@ -799,7 +799,7 @@ protected:
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxHScrolledWindow);
-    DECLARE_ABSTRACT_CLASS(wxHScrolledWindow)
+    wxDECLARE_ABSTRACT_CLASS(wxHScrolledWindow);
 };
 
 
@@ -864,7 +864,7 @@ protected:
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxHVScrolledWindow);
-    DECLARE_ABSTRACT_CLASS(wxHVScrolledWindow)
+    wxDECLARE_ABSTRACT_CLASS(wxHVScrolledWindow);
 };
 
 #endif // _WX_VSCROLL_H_
diff --git a/include/wx/window.h b/include/wx/window.h
index 97c015aa7c..b13da294ca 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1872,9 +1872,9 @@ private:
     unsigned int m_freezeCount;
 
 
-    DECLARE_ABSTRACT_CLASS(wxWindowBase)
+    wxDECLARE_ABSTRACT_CLASS(wxWindowBase);
     wxDECLARE_NO_COPY_CLASS(wxWindowBase);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
diff --git a/include/wx/wizard.h b/include/wx/wizard.h
index 71745015d5..0adffd253e 100644
--- a/include/wx/wizard.h
+++ b/include/wx/wizard.h
@@ -106,7 +106,7 @@ protected:
     wxBitmap m_bitmap;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPage)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPage);
 };
 
 // ----------------------------------------------------------------------------
@@ -180,7 +180,7 @@ private:
     wxWizardPage *m_prev,
                  *m_next;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPageSimple)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWizardPageSimple);
 };
 
 // ----------------------------------------------------------------------------
@@ -285,7 +285,7 @@ private:
     bool m_direction;
     wxWizardPage*    m_page;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWizardEvent)
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWizardEvent);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/wrapsizer.h b/include/wx/wrapsizer.h
index 2154de3b57..f401c260df 100644
--- a/include/wx/wrapsizer.h
+++ b/include/wx/wrapsizer.h
@@ -93,7 +93,7 @@ protected:
 
     wxBoxSizer m_rows;       // Sizer containing multiple rows of our items
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer);
 };
 
 #endif // _WX_WRAPSIZER_H_
diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 807786b498..ead852f334 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -99,7 +99,7 @@ protected:
     WXColormap            m_mainColormap;
     long                  m_maxRequestSize;
 
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 };
 
 #endif // _WX_X11_APP_H_
diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 23ac823faf..4652074402 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -56,7 +56,7 @@ private:
     wxSize m_size;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 };
 
 //-----------------------------------------------------------------------------
@@ -142,7 +142,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
 
 #endif // _WX_BITMAP_H_
diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h
index 1597ca57b3..6095b67210 100644
--- a/include/wx/x11/brush.h
+++ b/include/wx/x11/brush.h
@@ -57,7 +57,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_BRUSH_H_
diff --git a/include/wx/x11/clipbrd.h b/include/wx/x11/clipbrd.h
index 3778e98272..4b00655205 100644
--- a/include/wx/x11/clipbrd.h
+++ b/include/wx/x11/clipbrd.h
@@ -67,7 +67,7 @@ public:
     wxDataObject     *m_receivedData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 
 };
 
diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index c9a06e6c09..568cf07b37 100644
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -64,7 +64,7 @@ protected:
     virtual bool FromString(const wxString& str);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif // _WX_COLOUR_H_
diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index 63ddbf135f..36c8f0e839 100644
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -47,7 +47,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif // _WX_CURSOR_H_
diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index 0640f1c19a..418e87d3c0 100644
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/dc.h
@@ -45,7 +45,7 @@ protected:
     wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
 
 private:
-    DECLARE_CLASS(wxX11DCImpl)
+    wxDECLARE_CLASS(wxX11DCImpl);
 };
 
 #endif
diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index fbcdec11fa..eebc6181d8 100644
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -142,7 +142,7 @@ protected:
     void Destroy();
 
 private:
-    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_CLASS(wxWindowDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -159,7 +159,7 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
-    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_CLASS(wxClientDCImpl);
 };
 
 //-----------------------------------------------------------------------------
@@ -173,7 +173,7 @@ public:
     wxPaintDCImpl( wxDC *owner, wxWindow *win );
 
 private:
-    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_CLASS(wxPaintDCImpl);
 };
 
 #endif
diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index a912b85634..3b08cff085 100644
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -37,7 +37,7 @@ private:
     void Init();
 
 private:
-    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_CLASS(wxMemoryDCImpl);
 };
 
 #endif
diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h
index f1bce1873f..e28eec0ec2 100644
--- a/include/wx/x11/dcprint.h
+++ b/include/wx/x11/dcprint.h
@@ -16,7 +16,7 @@
 class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC
 {
 public:
-    DECLARE_CLASS(wxPrinterDC)
+    wxDECLARE_CLASS(wxPrinterDC);
 
     // Create a printer DC
     wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT);
diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index 2f1dbdca7e..d0bab6a2f9 100644
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/dcscreen.h
@@ -28,7 +28,7 @@ protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
-    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_CLASS(wxScreenDCImpl);
 };
 
 
diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index a0be4ea1c5..bd6100e4c4 100644
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -155,7 +155,7 @@ protected:
     void Unshare();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif
diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index b16b6beaea..84a8b14980 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -43,7 +43,7 @@ public:
 protected:
     virtual int GetColourIndex(const wxColour& col);
 
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_
diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h
index 8e9d4c433d..1b982bd3ac 100644
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/joystick.h
@@ -15,7 +15,7 @@
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
+    wxDECLARE_DYNAMIC_CLASS(wxJoystick);
 public:
 /*
 * Public interface
diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h
index 55d4699e40..db88eea5a3 100644
--- a/include/wx/x11/minifram.h
+++ b/include/wx/x11/minifram.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
 
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
     inline wxMiniFrame() {}
diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 4ee9beb5c3..9c1ca7f553 100644
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 // Palette for one display
 class wxXPalette : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxXPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxXPalette);
 
 public:
     wxXPalette();
@@ -48,7 +48,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxPalette);
 
 public:
     wxPalette();
diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 73e7e25de7..b71eb45cc7 100644
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -70,7 +70,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif // _WX_PEN_H_
diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 9038e79680..c1435a5ecb 100644
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -38,8 +38,8 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
 };
 
 #endif // __GTKPOPUPWINDOWH__
diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h
index 8f878dfa3e..82970f765f 100644
--- a/include/wx/x11/print.h
+++ b/include/wx/x11/print.h
@@ -19,7 +19,7 @@
 
 class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxPrinter);
 
 public:
     wxPrinter(wxPrintData *data = NULL);
@@ -37,7 +37,7 @@ public:
 
 class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
 {
-    DECLARE_CLASS(wxPrintPreview)
+    wxDECLARE_CLASS(wxPrintPreview);
 
 public:
     wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index f01b876b4b..62779bdcec 100644
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/region.h
@@ -80,7 +80,7 @@ protected:
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 // ----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ private:
     wxRegion m_region;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif
diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 5ed6683076..6d3a8e6e40 100644
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -307,8 +307,8 @@ protected:
     int                m_bracketY;
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index d17038204c..c0f0add91f 100644
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -190,9 +190,9 @@ private:
 
     wxString m_Label;
 
-    DECLARE_DYNAMIC_CLASS(wxWindowX11)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowX11);
     wxDECLARE_NO_COPY_CLASS(wxWindowX11);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 6a01ad311a..3fa5f8720d 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -148,8 +148,8 @@ public:
     }
 
     // Default copy ctor, assignment operator and dtor are ok (or would be if
-    // we didn't use DECLARE_NO_COPY_CLASS() for consistency with the xlocale
-    // version)
+    // we didn't use wxDECLARE_NO_COPY_CLASS() for consistency with the
+    // xlocale version)
 
 
     // Get the global "C" locale object
diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index 6187e12c35..ee47962616 100644
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -317,7 +317,7 @@ private:
 
     void DoCopy(const wxXmlDocument& doc);
 
-    DECLARE_CLASS(wxXmlDocument)
+    wxDECLARE_CLASS(wxXmlDocument);
 };
 
 #endif // wxUSE_XML
diff --git a/include/wx/xrc/xh_animatctrl.h b/include/wx/xrc/xh_animatctrl.h
index cd618b5b35..065db160b5 100644
--- 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();
diff --git a/include/wx/xrc/xh_bmp.h b/include/wx/xrc/xh_bmp.h
index ddc8cba440..600ce01d85 100644
--- 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();
diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h
index 7fcc100de0..5437993375 100644
--- 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();
diff --git a/include/wx/xrc/xh_bmpcbox.h b/include/wx/xrc/xh_bmpcbox.h
index 2e3e548cd1..f01f99f57d 100644
--- 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();
diff --git a/include/wx/xrc/xh_bttn.h b/include/wx/xrc/xh_bttn.h
index bc82924bec..d16503ab00 100644
--- 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();
diff --git a/include/wx/xrc/xh_cald.h b/include/wx/xrc/xh_cald.h
index 4507738a18..0670d921c3 100644
--- 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();
diff --git a/include/wx/xrc/xh_chckb.h b/include/wx/xrc/xh_chckb.h
index dba1dae4c9..54ef0e946a 100644
--- 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();
diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h
index 19725dde00..f1849f4e73 100644
--- 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();
diff --git a/include/wx/xrc/xh_choic.h b/include/wx/xrc/xh_choic.h
index e7115f8027..28971e4782 100644
--- 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();
diff --git a/include/wx/xrc/xh_choicbk.h b/include/wx/xrc/xh_choicbk.h
index 20c5346eb3..c0da48d796 100644
--- 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();
diff --git a/include/wx/xrc/xh_clrpicker.h b/include/wx/xrc/xh_clrpicker.h
index 9925ba0c41..2c721e8fd0 100644
--- 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();
diff --git a/include/wx/xrc/xh_collpane.h b/include/wx/xrc/xh_collpane.h
index f93c237174..64d3de3e8d 100644
--- 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
diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h
index df688a3361..b6a7e418e3 100644
--- 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();
diff --git a/include/wx/xrc/xh_comboctrl.h b/include/wx/xrc/xh_comboctrl.h
index a11c0276c8..7f721ce5e6 100644
--- 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();
diff --git a/include/wx/xrc/xh_datectrl.h b/include/wx/xrc/xh_datectrl.h
index e13c5c3676..842785719f 100644
--- 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();
diff --git a/include/wx/xrc/xh_dirpicker.h b/include/wx/xrc/xh_dirpicker.h
index b77540e36d..1e2486bee9 100644
--- 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();
diff --git a/include/wx/xrc/xh_dlg.h b/include/wx/xrc/xh_dlg.h
index 903f643181..546d2c6608 100644
--- 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();
diff --git a/include/wx/xrc/xh_editlbox.h b/include/wx/xrc/xh_editlbox.h
index 0baa85df89..81b2b56305 100644
--- 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
diff --git a/include/wx/xrc/xh_filectrl.h b/include/wx/xrc/xh_filectrl.h
index 97f9984ffb..f51bd52a5f 100644
--- 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
diff --git a/include/wx/xrc/xh_filepicker.h b/include/wx/xrc/xh_filepicker.h
index 31ab0a4c53..1e905fc30b 100644
--- 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();
diff --git a/include/wx/xrc/xh_fontpicker.h b/include/wx/xrc/xh_fontpicker.h
index 481adfb74e..8f114fa67d 100644
--- 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();
diff --git a/include/wx/xrc/xh_frame.h b/include/wx/xrc/xh_frame.h
index 16ee6aa484..69b23411e0 100644
--- 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();
diff --git a/include/wx/xrc/xh_gauge.h b/include/wx/xrc/xh_gauge.h
index 26eaa5b072..cd08cd03c3 100644
--- 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
diff --git a/include/wx/xrc/xh_gdctl.h b/include/wx/xrc/xh_gdctl.h
index bc746690fb..507d9f95ea 100644
--- 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();
diff --git a/include/wx/xrc/xh_grid.h b/include/wx/xrc/xh_grid.h
index 3d62705749..1e761a9966 100644
--- 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();
diff --git a/include/wx/xrc/xh_html.h b/include/wx/xrc/xh_html.h
index 2c08a4b98f..c2d668004b 100644
--- 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();
diff --git a/include/wx/xrc/xh_htmllbox.h b/include/wx/xrc/xh_htmllbox.h
index fb3539d9c5..b50ee7be67 100644
--- 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
diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h
index 4793668e35..5670c3e5a7 100644
--- 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.
diff --git a/include/wx/xrc/xh_listb.h b/include/wx/xrc/xh_listb.h
index c73c993de6..a29c7bca90 100644
--- 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();
diff --git a/include/wx/xrc/xh_listbk.h b/include/wx/xrc/xh_listbk.h
index 7aa2e0b2f3..0872588d86 100644
--- 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();
diff --git a/include/wx/xrc/xh_listc.h b/include/wx/xrc/xh_listc.h
index b2b927e1db..a2a867fb43 100644
--- 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
diff --git a/include/wx/xrc/xh_mdi.h b/include/wx/xrc/xh_mdi.h
index 6634318386..8d1d14eb06 100644
--- 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();
diff --git a/include/wx/xrc/xh_menu.h b/include/wx/xrc/xh_menu.h
index b06fee39fe..6bcae7b524 100644
--- 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();
diff --git a/include/wx/xrc/xh_notbk.h b/include/wx/xrc/xh_notbk.h
index aa24fc8716..04f510815e 100644
--- 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();
diff --git a/include/wx/xrc/xh_odcombo.h b/include/wx/xrc/xh_odcombo.h
index d639f4108a..ab78a7948b 100644
--- 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();
diff --git a/include/wx/xrc/xh_panel.h b/include/wx/xrc/xh_panel.h
index d5ee1a4542..a48084d19a 100644
--- 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();
diff --git a/include/wx/xrc/xh_propdlg.h b/include/wx/xrc/xh_propdlg.h
index 0be363f63e..02663b5bc2 100644
--- 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();
diff --git a/include/wx/xrc/xh_radbt.h b/include/wx/xrc/xh_radbt.h
index 7d21f99a3c..23365d9151 100644
--- 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();
diff --git a/include/wx/xrc/xh_radbx.h b/include/wx/xrc/xh_radbx.h
index 5df1ac1ac6..d9bb9669ca 100644
--- 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();
diff --git a/include/wx/xrc/xh_richtext.h b/include/wx/xrc/xh_richtext.h
index 1c52cbbcb1..69329c5b17 100644
--- 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();
diff --git a/include/wx/xrc/xh_scrol.h b/include/wx/xrc/xh_scrol.h
index 0599c5a9cd..c2a5876365 100644
--- 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
diff --git a/include/wx/xrc/xh_scwin.h b/include/wx/xrc/xh_scwin.h
index c2e370016f..901faec8c4 100644
--- 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();
diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index 3814962ad5..ce77dde617 100644
--- 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();
diff --git a/include/wx/xrc/xh_slidr.h b/include/wx/xrc/xh_slidr.h
index 0e209089f5..9026e737d7 100644
--- 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
diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h
index 7525ba4cd9..a2d9cec61a 100644
--- 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
diff --git a/include/wx/xrc/xh_split.h b/include/wx/xrc/xh_split.h
index 7f682dd73d..5c366be426 100644
--- 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();
diff --git a/include/wx/xrc/xh_srchctrl.h b/include/wx/xrc/xh_srchctrl.h
index 82f93538e0..0e7cf8ac18 100644
--- 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
diff --git a/include/wx/xrc/xh_statbar.h b/include/wx/xrc/xh_statbar.h
index 58c4ff4b42..68cd32c920 100644
--- 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();
diff --git a/include/wx/xrc/xh_stbmp.h b/include/wx/xrc/xh_stbmp.h
index 42a564fcdf..0c3cee7c7f 100644
--- 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();
diff --git a/include/wx/xrc/xh_stbox.h b/include/wx/xrc/xh_stbox.h
index 43f6c25ac6..4460d0d6ce 100644
--- 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();
diff --git a/include/wx/xrc/xh_stlin.h b/include/wx/xrc/xh_stlin.h
index 9efa3cb884..539a2f1be3 100644
--- 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();
diff --git a/include/wx/xrc/xh_sttxt.h b/include/wx/xrc/xh_sttxt.h
index 4d99ec25e7..979d0fd236 100644
--- 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();
diff --git a/include/wx/xrc/xh_text.h b/include/wx/xrc/xh_text.h
index 9a7649d37c..7aafac14bc 100644
--- 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();
diff --git a/include/wx/xrc/xh_tglbtn.h b/include/wx/xrc/xh_tglbtn.h
index cd68a91cfd..60c4940097 100644
--- 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();
diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h
index 6b936dcb29..cc5fd22d0d 100644
--- 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();
diff --git a/include/wx/xrc/xh_tree.h b/include/wx/xrc/xh_tree.h
index aa1b633b51..7f6616bfe9 100644
--- 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();
diff --git a/include/wx/xrc/xh_treebk.h b/include/wx/xrc/xh_treebk.h
index f5f11342f1..313b235078 100644
--- 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();
diff --git a/include/wx/xrc/xh_unkwn.h b/include/wx/xrc/xh_unkwn.h
index e417b4d39a..21cfd2ad74 100644
--- 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();
diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h
index 486cf5d963..7f9742f5f1 100644
--- 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();
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 5d05005de1..5cdc7adfe0 100644
--- 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)
diff --git a/include/wx/xti.h b/include/wx/xti.h
index 75f594f494..f8ddce9bbd 100644
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -369,7 +369,7 @@ protected:
     void Register();
     void Unregister();
 
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
+    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
 };
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 3506a7a6f6..da83986a49 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -261,7 +261,7 @@ private:
     friend class wxZipInputStream;
     friend class wxZipOutputStream;
 
-    DECLARE_DYNAMIC_CLASS(wxZipEntry)
+    wxDECLARE_DYNAMIC_CLASS(wxZipEntry);
 };
 
 
@@ -490,7 +490,7 @@ protected:
         { return NewStream(stream); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxZipClassFactory)
+    wxDECLARE_DYNAMIC_CLASS(wxZipClassFactory);
 };
 
 
diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 3c64f36cec..ec07bcb8ac 100644
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -114,7 +114,7 @@ public:
                                        = wxSTREAM_PROTOCOL) const wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxZlibClassFactory)
+    wxDECLARE_DYNAMIC_CLASS(wxZlibClassFactory);
 };
 
 class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory
@@ -135,7 +135,7 @@ public:
                                        = wxSTREAM_PROTOCOL) const wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGzipClassFactory)
+    wxDECLARE_DYNAMIC_CLASS(wxGzipClassFactory);
 };
 
 WXDLLIMPEXP_BASE wxVersionInfo wxGetZlibVersionInfo();
diff --git a/interface/wx/mediactrl.h b/interface/wx/mediactrl.h
index 8bcfada155..25ead7ee3d 100644
--- a/interface/wx/mediactrl.h
+++ b/interface/wx/mediactrl.h
@@ -223,7 +223,7 @@ public:
     wxMediaCtrl::CreateControl which does the actual creation of the control,
     in cases where a custom control is not needed you may simply call wxControl::Create().
 
-    You need to make sure to use the @c DECLARE_CLASS and @c IMPLEMENT_CLASS macros.
+    You need to make sure to use the @c wxDECLARE_CLASS and @c wxIMPLEMENT_CLASS macros.
 
     The only real tricky part is that you need to make sure the file in compiled in,
     which if there are just backends in there will not happen and you may need to
diff --git a/interface/wx/module.h b/interface/wx/module.h
index fe780fb6b7..a8b4767a93 100644
--- a/interface/wx/module.h
+++ b/interface/wx/module.h
@@ -65,10 +65,10 @@
           virtual void OnExit() { ... }
 
       private:
-          wxDECLARE_DYNAMIC_CLASS(MyModule2)
+          wxDECLARE_DYNAMIC_CLASS(MyModule2);
       };
 
-      wxIMPLEMENT_DYNAMIC_CLASS(MyModule2, wxModule)
+      wxIMPLEMENT_DYNAMIC_CLASS(MyModule2, wxModule);
     @endcode
 
     @library{wxbase}
diff --git a/interface/wx/msw/ole/activex.h b/interface/wx/msw/ole/activex.h
index 13776688b2..2e408f6d86 100644
--- a/interface/wx/msw/ole/activex.h
+++ b/interface/wx/msw/ole/activex.h
@@ -262,7 +262,7 @@ public:
         wxActiveXContainer* m_pAX;
         wxAutomationObject m_PDF;
 
-        wxDECLARE_DYNAMIC_CLASS(wxPDFMediaBackend)
+        wxDECLARE_DYNAMIC_CLASS(wxPDFMediaBackend);
     };
 
     wxIMPLEMENT_DYNAMIC_CLASS(wxPDFMediaBackend, wxMediaBackend);
diff --git a/interface/wx/object.h b/interface/wx/object.h
index 5635116895..9baa53eb3f 100644
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -41,7 +41,7 @@
         virtual wxObjectRefData *CreateRefData() const;
         virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-        wxDECLARE_DYNAMIC_CLASS(MyCar)
+        wxDECLARE_DYNAMIC_CLASS(MyCar);
     };
 
 
diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index 83b85fae24..71f8d9715d 100644
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@@ -149,7 +149,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index f452fbe3b3..085a5cb859 100644
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -43,7 +43,7 @@
 #endif
 
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ---------------------------------------------------------------------------
 // global variables
diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp
index 7757420166..9b2045164a 100644
--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@@ -82,7 +82,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_PlugProvider, MyFrame::OnPlugProvider)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 2b5c6f5be0..affb1a9248 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -45,8 +45,8 @@ public:
     bool OnInit() wxOVERRIDE;
 };
 
-DECLARE_APP(MyApp)
-IMPLEMENT_APP(MyApp)
+wxDECLARE_APP(MyApp);
+wxIMPLEMENT_APP(MyApp);
 
 
 class wxSizeReportCtrl;
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index ae841393c0..3e59483f1f 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -339,7 +339,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 32e636395b..f44f5c5392 100644
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -169,7 +169,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
@@ -294,7 +294,7 @@ void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event))
 // MyCanvas
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow);
 
 wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT(MyCanvas::OnPaint)
diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp
index a32d7cc4f0..27e2836e76 100644
--- a/samples/clipboard/clipboard.cpp
+++ b/samples/clipboard/clipboard.cpp
@@ -84,7 +84,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #endif
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp
index 04ba723b88..cbf3d213a5 100644
--- a/samples/collpane/collpane.cpp
+++ b/samples/collpane/collpane.cpp
@@ -132,7 +132,7 @@ private:
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 7b62b0bf00..ab51bae50b 100644
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -139,7 +139,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 91ee10cc6f..42e6213a64 100644
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -80,7 +80,7 @@ wxEND_EVENT_TABLE()
 // application
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index ce73f4a7c0..6ce5f135a6 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -376,7 +376,7 @@ static void SetListboxClientData(const wxChar *name, wxCheckListBox *control);
 static void SetChoiceClientData(const wxChar *name, wxChoice *control);
 #endif // wxUSE_CHOICE
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 //----------------------------------------------------------------------
 // MyApp
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 4f614f682f..1b536f92f2 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -233,7 +233,7 @@ private:
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp
index 75bf9ee439..235eafc227 100644
--- a/samples/debugrpt/debugrpt.cpp
+++ b/samples/debugrpt/debugrpt.cpp
@@ -206,7 +206,7 @@ private:
     wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 9922892584..7cd95f4fb2 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -120,7 +120,7 @@
     #include "wx/generic/fontdlgg.h"
 #endif // USE_FONTDLG_GENERIC
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT(MyCanvas::OnPaint)
@@ -2958,7 +2958,7 @@ void StdButtonSizerDialog::EnableDisableControls()
 // SettingsDialog
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog)
+wxIMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog);
 
 wxBEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog)
 wxEND_EVENT_TABLE()
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index f6d9ee1970..b6555ad2c2 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -311,7 +311,7 @@ private:
 // Property sheet dialog
 class SettingsDialog: public wxPropertySheetDialog
 {
-DECLARE_CLASS(SettingsDialog)
+    wxDECLARE_CLASS(SettingsDialog);
 public:
     SettingsDialog(wxWindow* parent, int dialogType);
     ~SettingsDialog();
@@ -334,7 +334,7 @@ protected:
 
     wxImageList*    m_imageList;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // USE_SETTINGS_DIALOG
diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 704c0f85b1..c8c38704b8 100644
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -140,7 +140,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index af0ab15441..c6c2f809e8 100644
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -154,7 +154,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp
index 490dc0aadb..ba269bc36d 100644
--- a/samples/dll/my_dll.cpp
+++ b/samples/dll/my_dll.cpp
@@ -172,7 +172,7 @@ void MyDllApp::OnTerminate(wxThreadEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 
 // we can't have WinMain() in a DLL and want to start the app ourselves
-IMPLEMENT_APP_NO_MAIN(MyDllApp)
+wxIMPLEMENT_APP_NO_MAIN(MyDllApp);
 
 namespace
 {
@@ -202,7 +202,7 @@ unsigned wxSTDCALL MyAppLauncher(void* event)
     if ( !hInstance )
         return 0; // failed to get DLL's handle
 
-    // IMPLEMENT_WXWIN_MAIN does this as the first thing
+    // wxIMPLEMENT_WXWIN_MAIN does this as the first thing
     wxDISABLE_DEBUG_SUPPORT();
 
     // We do this before wxEntry() explicitly, even though wxEntry() would
diff --git a/samples/dll/wx_exe.cpp b/samples/dll/wx_exe.cpp
index 135f8dc5ef..0f5f331dcc 100644
--- a/samples/dll/wx_exe.cpp
+++ b/samples/dll/wx_exe.cpp
@@ -140,4 +140,4 @@ int MainApp::OnExit()
 }
 
 
-IMPLEMENT_APP(MainApp)
+wxIMPLEMENT_APP(MainApp);
diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 6af533ec7e..cf9762240a 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -113,7 +113,7 @@ public:
     virtual bool OnInit() wxOVERRIDE;
 };
 
-IMPLEMENT_APP(DnDApp)
+wxIMPLEMENT_APP(DnDApp);
 
 #if wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD
 
diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 93a0a26363..4d75fa5c5e 100644
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -42,7 +42,7 @@
 // DrawingDocument implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
+wxIMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument);
 
 DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& ostream)
 {
@@ -184,7 +184,7 @@ DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
 // wxTextDocument: wxDocument and wxTextCtrl married
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxTextDocument, wxDocument)
+wxIMPLEMENT_CLASS(wxTextDocument, wxDocument);
 
 bool wxTextDocument::OnCreate(const wxString& path, long flags)
 {
@@ -250,7 +250,7 @@ void wxTextDocument::OnTextChange(wxCommandEvent& event)
 // TextEditDocument implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
+wxIMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument);
 
 wxTextCtrl* TextEditDocument::GetTextCtrl() const
 {
@@ -262,7 +262,7 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
 // ImageDocument and ImageDetailsDocument implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
+wxIMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument);
 
 bool ImageDocument::DoOpenDocument(const wxString& file)
 {
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index c06246e6a5..fc3f65acfa 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -70,7 +70,7 @@
 // MyApp implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 wxBEGIN_EVENT_TABLE(MyApp, wxApp)
     EVT_MENU(wxID_ABOUT, MyApp::OnAbout)
diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index a5eba7dfbf..12e9dbc86b 100644
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -87,6 +87,6 @@ private:
     wxDECLARE_NO_COPY_CLASS(MyApp);
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 #endif // _WX_SAMPLES_DOCVIEW_DOCVIEW_H_
diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index 9f20032069..ea2a372a9b 100644
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -32,7 +32,7 @@
 // DrawingView implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView)
+wxIMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView);
 
 wxBEGIN_EVENT_TABLE(DrawingView, wxView)
     EVT_MENU(wxID_CUT, DrawingView::OnCut)
@@ -144,7 +144,7 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 // TextEditView implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
+wxIMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView);
 
 wxBEGIN_EVENT_TABLE(TextEditView, wxView)
     EVT_MENU(wxID_COPY, TextEditView::OnCopy)
@@ -300,7 +300,7 @@ void ImageCanvas::OnDraw(wxDC& dc)
 // ImageView implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(ImageView, wxView)
+wxIMPLEMENT_DYNAMIC_CLASS(ImageView, wxView);
 
 ImageDocument* ImageView::GetDocument()
 {
diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 687d2b4f8d..983122685f 100644
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -42,11 +42,11 @@
 
 // main program
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // MyCanvas
 
-IMPLEMENT_CLASS(MyCanvas, wxScrolledWindow)
+wxIMPLEMENT_CLASS(MyCanvas, wxScrolledWindow);
 
 wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
@@ -305,7 +305,7 @@ DragShape* MyCanvas::FindShape(const wxPoint& pt) const
 }
 
 // MyFrame
-IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
+wxIMPLEMENT_DYNAMIC_CLASS(MyFrame, wxFrame);
 
 wxBEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (wxID_ABOUT, MyFrame::OnAbout)
diff --git a/samples/dragimag/dragimag.h b/samples/dragimag/dragimag.h
index d59435b0d3..c30bd3edba 100644
--- a/samples/dragimag/dragimag.h
+++ b/samples/dragimag/dragimag.h
@@ -64,10 +64,10 @@ protected:
     wxBitmap    m_background;
     bool        m_useScreen;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 #define TEST_USE_SCREEN   100
 
diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 9105d2f13f..018c407861 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -324,7 +324,7 @@ enum
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 31a47bb6ce..71b54e1b79 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -215,7 +215,7 @@ enum
 // the application class
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index fd5864b228..81d16ce456 100644
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -274,7 +274,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 8475a1ea49..b57adc208a 100644
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -269,7 +269,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // MyApp implementation
diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 35c462a3f5..53f8535d06 100644
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -402,7 +402,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/flash/flash.cpp b/samples/flash/flash.cpp
index a9c5ec83b6..bb96f45710 100644
--- a/samples/flash/flash.cpp
+++ b/samples/flash/flash.cpp
@@ -212,7 +212,7 @@ wxBEGIN_EVENT_TABLE(FlashFrame, wxFrame)
     EVT_ACTIVEX(wxID_ANY, FlashFrame::OnActiveXEvent)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(FlashApp)
+wxIMPLEMENT_APP(FlashApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index f774effb89..af83e881b3 100644
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -272,7 +272,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp
index 4bd50e768c..0c532a85ea 100644
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -129,7 +129,7 @@ private:
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 
 // ============================================================================
diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index eb139a6f39..20eb366c77 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -125,7 +125,7 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP( GridApp )
+wxIMPLEMENT_APP(GridApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index fe210ccbb5..26a1e6f8cb 100644
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -273,7 +273,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/help/doc/wxExtHelpController.html b/samples/help/doc/wxExtHelpController.html
index 68d3ec7678..88c6be4d9a 100644
--- a/samples/help/doc/wxExtHelpController.html
+++ b/samples/help/doc/wxExtHelpController.html
@@ -63,7 +63,7 @@ If the documentation itself contains a ';', only the part before
 that will be displayed in the listbox, but all of it used for search.<P>Lines starting with ';' will be ignored.<P>This confuses DOC++, so I leave it out for now:
 <TT>ifdef USE_HELP</TT>: public wxHelpControllerBase
 {
-DECLARE_CLASS(wxExtHelpController)
+wxDECLARE_CLASS(wxExtHelpController);
 <TT>else</TT>{
 <TT>endif
 
diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 258665ba76..1fd99bbbbd 100644
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -224,7 +224,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // MyFrame
@@ -557,7 +557,7 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
 // MyHtmlListBox
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(MyHtmlListBox, wxHtmlListBox)
+wxIMPLEMENT_DYNAMIC_CLASS(MyHtmlListBox, wxHtmlListBox);
 
 MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)
              : wxHtmlListBox(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 1a656fba77..87476b146e 100644
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -82,7 +82,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 7964f7fd13..a3746f333a 100644
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -100,7 +100,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 281d7ad13f..c71586577c 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -54,7 +54,7 @@ private:
 };
 
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 
 bool MyApp::OnInit()
diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 58dec162ac..d03fde2454 100644
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -115,7 +115,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index fdb6186f7d..7b38b65987 100644
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -122,7 +122,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 1707b8846c..4d462bdeea 100644
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -158,7 +158,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_HTML_CELL_CLICKED(wxID_ANY, MyFrame::OnHtmlCellClicked)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index efba6c9c6e..1d76e20e16 100644
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -148,7 +148,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index dbc2c94f04..2f3b0561dc 100644
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -141,7 +141,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 0ba7e30878..77be59c85d 100644
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -94,7 +94,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 1a0371c444..c29ddbc529 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -628,7 +628,7 @@ enum
     ID_SHOWTHUMBNAIL
 };
 
-IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
+wxIMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame );
 wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
     EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
@@ -964,7 +964,7 @@ void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) )
 // MyApp
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index af782da20a..5f2646f9fe 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -167,7 +167,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(INTERNAT_TEST_MSGBOX, MyFrame::OnTestMsgBox)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/ipc/baseclient.cpp b/samples/ipc/baseclient.cpp
index 0eaa375762..b128e032b8 100644
--- a/samples/ipc/baseclient.cpp
+++ b/samples/ipc/baseclient.cpp
@@ -107,7 +107,7 @@ private:
 // implementation
 // ============================================================================
 
-IMPLEMENT_APP_CONSOLE(MyApp)
+wxIMPLEMENT_APP_CONSOLE(MyApp);
 
 // ----------------------------------------------------------------------------
 // MyApp
diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp
index 06a58356ac..47a29085ce 100644
--- a/samples/ipc/baseserver.cpp
+++ b/samples/ipc/baseserver.cpp
@@ -131,13 +131,13 @@ protected:
     MyServer m_server;
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_APP_CONSOLE(MyApp)
+wxIMPLEMENT_APP_CONSOLE(MyApp);
 
 // ----------------------------------------------------------------------------
 // MyApp
diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index bb54389e1f..8e35baf475 100644
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -42,7 +42,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index fa6b413e2a..e9f9ba59de 100644
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -43,7 +43,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_CLOSE( MyFrame::OnClose )
diff --git a/samples/ipc/server.h b/samples/ipc/server.h
index d535adfcc1..7a88243e54 100644
--- a/samples/ipc/server.h
+++ b/samples/ipc/server.h
@@ -32,7 +32,7 @@ protected:
     MyFrame *m_frame;
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 // Define a new frame
 class MyFrame : public wxFrame
diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 479dc7df87..5e4631ca15 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -36,7 +36,7 @@
 
 MyFrame *frame = NULL;
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // For drawing lines in a canvas
 long xpos = -1;
diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index dd4fa981fa..59d4afb5e2 100644
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -25,7 +25,7 @@ public:
 #endif // wxUSE_SOUND
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 class MyCanvas: public wxScrolledWindow
 {
@@ -48,7 +48,7 @@ public:
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #define JOYTEST_QUIT        1
diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index 13efee9293..5629c7ffd1 100644
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -129,7 +129,7 @@ public:
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 
 // ============================================================================
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 8f036ec00e..35c08aed54 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -43,7 +43,7 @@
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index ef9ee66949..d91afe13a6 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -85,7 +85,7 @@ MyCompareFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr WXUNUSED(sortData))
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 2ff38c2209..e0195f0750 100644
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -56,7 +56,7 @@
 
 #include "mdi.h"
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ---------------------------------------------------------------------------
 // event tables
diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 6717e4b56a..6afbd8e02d 100644
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -410,11 +410,11 @@ const wxChar* wxGetMediaStateText(int nState)
 // handle of the application.  These routines in wx _DO NOT_ check to see if
 // the wxApp exists, and thus will crash the application if you try it.
 //
-// IMPLEMENT_APP does this, and also implements the platform-specific entry
-// routine, such as main or WinMain().  Use IMPLEMENT_APP_NO_MAIN if you do
+// wxIMPLEMENT_APP does this, and also implements the platform-specific entry
+// routine, such as main or WinMain().  Use wxIMPLEMENT_APP_NO_MAIN if you do
 // not desire this behaviour.
 // ----------------------------------------------------------------------------
-IMPLEMENT_APP(wxMediaPlayerApp)
+wxIMPLEMENT_APP(wxMediaPlayerApp);
 
 // ----------------------------------------------------------------------------
 // wxMediaPlayerApp command line parsing
diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 0d29a56db2..0673227c6e 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -47,10 +47,10 @@ class MyFrame: public wxFrame
     MyFrame(wxFrame *parent);
     void OnQuit(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 2b7ef8975a..6c239c4c7f 100644
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -414,7 +414,7 @@ wxEND_EVENT_TABLE()
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 2c838aa54f..d60b17fa4f 100644
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -125,10 +125,10 @@ public:
 #define HELLO_QUIT 1
 #define HELLO_NEW  2
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
-// notice use of IMPLEMENT_APP_NO_MAIN() instead of the usual IMPLEMENT_APP!
-IMPLEMENT_APP_NO_MAIN(MyApp)
+// Notice use of wxIMPLEMENT_APP_NO_MAIN() instead of the usual wxIMPLEMENT_APP!
+wxIMPLEMENT_APP_NO_MAIN(MyApp);
 
 #ifdef _UNICODE
 // In Unicode build MFC normally requires to manually change the entry point to
diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index e369f3b86c..076d88b9a7 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -105,7 +105,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 47442b4b9b..b2c431d124 100644
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -34,7 +34,7 @@
 
 
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit(void)
 {
diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 14e05fee44..34ee5da808 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -33,7 +33,7 @@
 // MyApp
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 8e23ab0e15..19894e8363 100644
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -29,7 +29,7 @@ public:
     bool OnInit() wxOVERRIDE;
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 
 class MyFrame : public wxFrame
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 1c2a2ba0e3..0e2973133c 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -111,7 +111,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index a716c35a81..5da6e7137f 100644
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -253,7 +253,7 @@ void TestGLContext::DrawRotatedCube(float xangle, float yangle)
 // MyApp: the application object
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 2511e9a4a0..41bd464936 100644
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -48,7 +48,7 @@ GLboolean g_lighting = GL_TRUE;
 // MyApp
 //---------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index 24524817b8..5af591be95 100644
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -60,7 +60,7 @@ bool MyApp::OnInit()
     return true;
 }
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ---------------------------------------------------------------------------
 // MyFrame
diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index 0678887faf..91f6df2369 100644
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -84,7 +84,7 @@ wxBEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame)
                 OwnerDrawnFrame::OnListboxDblClick)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(OwnerDrawnApp)
+wxIMPLEMENT_APP(OwnerDrawnApp);
 
 // init our app: create windows
 bool OwnerDrawnApp::OnInit(void)
diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 24afdab680..fc6ca0ef27 100644
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -96,7 +96,7 @@ private:
 //----------------------------------------------------------------------------
 // SimpleTransientPopup
 //----------------------------------------------------------------------------
-IMPLEMENT_CLASS(SimpleTransientPopup,wxPopupTransientWindow)
+wxIMPLEMENT_CLASS(SimpleTransientPopup,wxPopupTransientWindow);
 
 wxBEGIN_EVENT_TABLE(SimpleTransientPopup,wxPopupTransientWindow)
     EVT_MOUSE_EVENTS( SimpleTransientPopup::OnMouse )
@@ -304,7 +304,7 @@ public:
 // ----------------------------------------------------------------------------
 
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
diff --git a/samples/power/power.cpp b/samples/power/power.cpp
index 51d2c27d22..2821b0853a 100644
--- a/samples/power/power.cpp
+++ b/samples/power/power.cpp
@@ -274,4 +274,4 @@ public:
     }
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
diff --git a/samples/preferences/preferences.cpp b/samples/preferences/preferences.cpp
index 979cfe98ec..da1e3a1c0a 100644
--- a/samples/preferences/preferences.cpp
+++ b/samples/preferences/preferences.cpp
@@ -40,7 +40,7 @@ private:
     wxScopedPtr<wxPreferencesEditor> m_prefEditor;
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 
 class MyFrame : public wxFrame
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 23b266c102..52a5e68697 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -62,7 +62,7 @@ wxPageSetupDialogData* g_pageSetupData = NULL;
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit(void)
 {
diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 36a8e687c7..3720c27b66 100644
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -33,7 +33,7 @@ private:
     wxFont    m_testFont;
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 class MyCanvas;
 
 // Define a new canvas and frame
diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 610fb0c143..87d0e8d798 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -95,7 +95,7 @@ public:
                           wxEvent& event ) const wxOVERRIDE;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor);
 
 wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGrid,
                                                           wxPGProperty* property,
@@ -3070,7 +3070,7 @@ FormMain::~FormMain()
 
 // -----------------------------------------------------------------------
 
-IMPLEMENT_APP(cxApplication)
+wxIMPLEMENT_APP(cxApplication);
 
 bool cxApplication::OnInit()
 {
@@ -3274,7 +3274,7 @@ struct PropertyGridPopup : wxPopupWindow
     wxDECLARE_EVENT_TABLE();
 };
 
-IMPLEMENT_CLASS(PropertyGridPopup, wxPopupWindow)
+wxIMPLEMENT_CLASS(PropertyGridPopup, wxPopupWindow);
 wxBEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow)
     EVT_PG_ITEM_COLLAPSED(ID_POPUPGRID, PropertyGridPopup::OnCollapse)
     EVT_PG_ITEM_EXPANDED(ID_POPUPGRID, PropertyGridPopup::OnExpand)
diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h
index 2501ce5f13..473c8ed4bc 100644
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -276,7 +276,7 @@ private:
     FormMain    *Form1;
 };
 
-DECLARE_APP(cxApplication)
+wxDECLARE_APP(cxApplication);
 
 // -----------------------------------------------------------------------
 
diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index 76a44ee1fe..9508c9bd8a 100644
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -363,7 +363,7 @@ private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxArrayDoubleEditorDialog, wxPGArrayEditorDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxArrayDoubleEditorDialog, wxPGArrayEditorDialog);
 
 //
 // Array dialog array access and manipulation
diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index fd782a3a5d..645d40e913 100644
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -343,7 +343,7 @@ wxMenu *CreateRegistryMenu()
 // ----------------------------------------------------------------------------
 // application class
 // ----------------------------------------------------------------------------
-IMPLEMENT_APP(RegApp)
+wxIMPLEMENT_APP(RegApp);
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool RegApp::OnInit()
diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index 132d1727e8..08500f87c6 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -361,7 +361,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp
index 21eff8b6dd..9600a3ac90 100644
--- a/samples/ribbon/ribbondemo.cpp
+++ b/samples/ribbon/ribbondemo.cpp
@@ -39,8 +39,8 @@ public:
     bool OnInit() wxOVERRIDE;
 };
 
-DECLARE_APP(MyApp)
-IMPLEMENT_APP(MyApp)
+wxDECLARE_APP(MyApp);
+wxIMPLEMENT_APP(MyApp);
 
 // -- frame --
 
diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index 18f8dbc3d1..b9ca7a0549 100644
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -501,7 +501,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index beba94ec8f..40995578e8 100644
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -28,7 +28,7 @@
 MyFrame *frame = NULL;
 wxList my_children;
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // For drawing lines in a canvas
 long xpos = -1;
diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h
index 60a781099f..81e7a3c9ca 100644
--- a/samples/sashtest/sashtest.h
+++ b/samples/sashtest/sashtest.h
@@ -47,7 +47,7 @@ protected:
     wxSashLayoutWindow* m_leftWindow2;
     wxSashLayoutWindow* m_bottomWindow;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 class MyChild: public wxMDIChildFrame
@@ -59,7 +59,7 @@ class MyChild: public wxMDIChildFrame
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #define SASHTEST_QUIT        wxID_EXIT
diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index d132b3cc55..3428ab9317 100644
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -978,7 +978,7 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index 15422b5c99..3f2087a959 100644
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -217,7 +217,7 @@ private:
 // the application class
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp
index 91dfbc2737..3a63819b70 100644
--- a/samples/sockets/baseclient.cpp
+++ b/samples/sockets/baseclient.cpp
@@ -121,7 +121,7 @@ private:
     wxTimer mTimer;
 };
 
-DECLARE_APP(Client);
+wxDECLARE_APP(Client);
 
 class ThreadWorker : public wxThread
 {
@@ -164,7 +164,7 @@ private:
 };
 
 /******************* Implementation ******************/
-IMPLEMENT_APP_CONSOLE(Client);
+wxIMPLEMENT_APP_CONSOLE(Client);
 
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(TList);
diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp
index 44d2c8fb70..63cc592e1e 100644
--- a/samples/sockets/baseserver.cpp
+++ b/samples/sockets/baseserver.cpp
@@ -146,7 +146,7 @@ private:
     wxTimer mTimer;
 };
 
-DECLARE_APP(Server);
+wxDECLARE_APP(Server);
 
 // just some common things shared between ThreadWorker and EventWorker
 class WorkerBase
@@ -201,7 +201,7 @@ private:
 };
 
 /******************* Implementation ******************/
-IMPLEMENT_APP_CONSOLE(Server)
+wxIMPLEMENT_APP_CONSOLE(Server);
 
 #include <wx/listimpl.cpp>
 WX_DEFINE_LIST(TList);
diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 26fa74ec08..a3815d8ffa 100644
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -171,7 +171,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_SOCKET(SOCKET_ID,     MyFrame::OnSocketEvent)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ==========================================================================
 // implementation
diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 5b29814be9..f0bdb80161 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -142,7 +142,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_SOCKET(SOCKET_ID,  MyFrame::OnSocketEvent)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 
 // ==========================================================================
diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index e45b201a3b..3b3a6c79db 100644
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -148,7 +148,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index f4e0615b6c..d1024a8cf5 100644
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -109,7 +109,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index fde3ac5e4a..6397639b72 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -159,7 +159,7 @@ private:
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 2e81a74074..d6a51f6ad0 100644
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -289,7 +289,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // not wxApp)
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 2ad7ff4c76..e269f98a7b 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -108,7 +108,7 @@ protected:
 };
 
 // created dynamically by wxWidgets
-DECLARE_APP (App);
+wxDECLARE_APP(App);
 
 //----------------------------------------------------------------------------
 //! frame of the application APP_VENDOR-APP_NAME.
@@ -190,7 +190,7 @@ private:
 // implementation
 //============================================================================
 
-IMPLEMENT_APP (App)
+wxIMPLEMENT_APP(App);
 
 
 wxBEGIN_EVENT_TABLE(App, wxApp)
diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 5072bb4845..5adf547a9d 100644
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -149,7 +149,7 @@ wxEND_EVENT_TABLE()
 // MyApp
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp
index 1a6586af0f..0efaaa9a1c 100644
--- a/samples/taborder/taborder.cpp
+++ b/samples/taborder/taborder.cpp
@@ -166,7 +166,7 @@ private:
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 40fcb37fef..2b3dea7158 100644
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -52,7 +52,7 @@ static MyDialog *gs_dialog = NULL;
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index fdcc252f67..4e04e3510b 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -129,7 +129,7 @@ private:
     wxThumbBarButtons m_thumbBarButtons;
 };
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 70c3cfe63b..577b2a76ed 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -390,7 +390,7 @@ private:
 // main()
 //----------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 //----------------------------------------------------------------------
 // MyApp
diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 74b5b38cda..edc078efd7 100644
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -296,7 +296,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // Create a new application object
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 MyApp::MyApp()
 {
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index c85371c0c8..ffdbdf3b92 100644
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -289,7 +289,7 @@ wxEND_EVENT_TABLE()
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index f32bea9dd3..de35e1ea9b 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -188,7 +188,7 @@ wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
     EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
@@ -930,9 +930,9 @@ void MyFrame::OnSetBgColour(wxCommandEvent& WXUNUSED(event))
 
 // MyTreeCtrl implementation
 #if USE_GENERIC_TREECTRL
-IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxGenericTreeCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxGenericTreeCtrl);
 #else
-IMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(MyTreeCtrl, wxTreeCtrl);
 #endif
 
 MyTreeCtrl::MyTreeCtrl(wxWindow *parent, const wxWindowID id,
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 4708584c58..aede98a30f 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -46,9 +46,9 @@
 #include "wx/mstream.h"
 
 // Create a new application object
-IMPLEMENT_APP    (MyApp)
+wxIMPLEMENT_APP(MyApp);
 
-IMPLEMENT_DYNAMIC_CLASS    (MyApp, wxApp)
+wxIMPLEMENT_DYNAMIC_CLASS(MyApp, wxApp);
 
 wxBEGIN_EVENT_TABLE(MyApp, wxApp)
     EVT_MENU(TYPES_VARIANT,   MyApp::DoVariantDemo)
diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h
index 5d04f8f17c..ac6827d975 100644
--- a/samples/typetest/typetest.h
+++ b/samples/typetest/typetest.h
@@ -44,7 +44,7 @@ private:
     wxDECLARE_EVENT_TABLE();
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 // Define a new frame type
 class MyFrame: public wxFrame
diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index 4c14239023..c72da1851f 100644
--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@@ -104,7 +104,7 @@ wxEND_EVENT_TABLE()
 // the application class
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 159f3a6174..5ffc7f1af2 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -127,7 +127,7 @@ bool MyComboBoxValidator::TransferFromWindow()
 // MyApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index 04bafdf297..57491f2a3d 100644
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -461,7 +461,7 @@ wxEND_EVENT_TABLE()
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. VarScrollApp and
 // not wxApp)
-IMPLEMENT_APP(VarScrollApp)
+wxIMPLEMENT_APP(VarScrollApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 2a3ff50786..810aaf5322 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -207,7 +207,7 @@ public:
     SourceViewDialog(wxWindow* parent, wxString source);
 };
 
-IMPLEMENT_APP(WebApp)
+wxIMPLEMENT_APP(WebApp);
 
 // ============================================================================
 // implementation
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index b9b29ef360..d38c423d92 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -271,7 +271,7 @@ WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage);
 // misc macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(WidgetsApp)
+wxIMPLEMENT_APP(WidgetsApp);
 
 // ----------------------------------------------------------------------------
 // event tables
diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index 1764dc0f0f..9ee833e9ac 100644
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -355,7 +355,7 @@ wxBEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple)
     EVT_WIZARD_CANCEL(wxID_ANY, wxRadioboxPage::OnWizardCancel)
 wxEND_EVENT_TABLE()
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 // ----------------------------------------------------------------------------
 // the application class
diff --git a/samples/wrapsizer/wrapsizer.cpp b/samples/wrapsizer/wrapsizer.cpp
index d4512ae45f..6a13f310c6 100644
--- a/samples/wrapsizer/wrapsizer.cpp
+++ b/samples/wrapsizer/wrapsizer.cpp
@@ -80,7 +80,7 @@ public:
     }
 };
 
-IMPLEMENT_APP(WrapSizerApp);
+wxIMPLEMENT_APP(WrapSizerApp);
 
 
 // ----------------------------------------------------------------------------
diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp
index 64e9deba25..75e5c4d216 100644
--- a/samples/xrc/custclas.cpp
+++ b/samples/xrc/custclas.cpp
@@ -56,7 +56,7 @@ enum {
 // wxWidgets macro: implement dynamic class
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )
+wxIMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl );
 
 //-----------------------------------------------------------------------------
 // Event table: connect the events to the handler functions to process them
diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp
index 3351d29366..ba7e1fb475 100644
--- a/samples/xrc/xrcdemo.cpp
+++ b/samples/xrc/xrcdemo.cpp
@@ -59,7 +59,7 @@
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. the_app and
 // not wxApp).
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
 //-----------------------------------------------------------------------------
 // Public methods
diff --git a/samples/xti/classlist.cpp b/samples/xti/classlist.cpp
index e8daad15d4..5cc8f5dc78 100644
--- a/samples/xti/classlist.cpp
+++ b/samples/xti/classlist.cpp
@@ -30,7 +30,7 @@
     #error This sample requires XTI (eXtended RTTI) enabled
 #endif
 
-// IMPLEMENT_DYNAMIC_CLASS( ClassListDialog, wxDialog )  -- see the header
+// wxIMPLEMENT_DYNAMIC_CLASS(ClassListDialog, wxDialog);  -- see the header
 wxBEGIN_EVENT_TABLE( ClassListDialog, wxDialog )
     EVT_LISTBOX( ID_LISTBOX, ClassListDialog::OnListboxSelected )
     EVT_TREE_SEL_CHANGED( ID_TREECTRL, ClassListDialog::OnTreectrlSelChanged )
diff --git a/samples/xti/xti.cpp b/samples/xti/xti.cpp
index dd20ab78be..e9799d6ba6 100644
--- a/samples/xti/xti.cpp
+++ b/samples/xti/xti.cpp
@@ -244,7 +244,7 @@ MyFrame::MyFrame(const wxString& title)
 //      wxDECLARE_DYNAMIC_CLASS_NO_COPY(MyXTIFrame);
 //  };
 //
-//  IMPLEMENT_DYNAMIC_CLASS_XTI(MyXTIFrame, MyXTIFrame, "x.h")
+//  wxIMPLEMENT_DYNAMIC_CLASS_XTI(MyXTIFrame, MyXTIFrame, "x.h");
 //
 //  WX_BEGIN_PROPERTIES_TABLE(MyXTIFrame)
 //      WX_PROPERTY( Button, wxButton*, SetButton, GetButton, )
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 37413d8acf..45aa05f1ae 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -50,8 +50,8 @@ wxDEFINE_EVENT( wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
 wxDEFINE_EVENT( wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );
 
 
-IMPLEMENT_CLASS(wxAuiToolBar, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarEvent, wxEvent)
+wxIMPLEMENT_CLASS(wxAuiToolBar, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarEvent, wxEvent);
 
 
 // missing wxITEM_* items
@@ -790,7 +790,7 @@ static wxOrientation GetOrientation(long style)
     }
 }
 
-BEGIN_EVENT_TABLE(wxAuiToolBar, wxControl)
+wxBEGIN_EVENT_TABLE(wxAuiToolBar, wxControl)
     EVT_SIZE(wxAuiToolBar::OnSize)
     EVT_IDLE(wxAuiToolBar::OnIdle)
     EVT_ERASE_BACKGROUND(wxAuiToolBar::OnEraseBackground)
@@ -808,7 +808,7 @@ BEGIN_EVENT_TABLE(wxAuiToolBar, wxControl)
     EVT_LEAVE_WINDOW(wxAuiToolBar::OnLeaveWindow)
     EVT_MOUSE_CAPTURE_LOST(wxAuiToolBar::OnCaptureLost)
     EVT_SET_CURSOR(wxAuiToolBar::OnSetCursor)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxAuiToolBar::Init()
 {
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index a77b5af441..c5391e2d87 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -55,9 +55,9 @@ wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent);
 wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent);
 wxDEFINE_EVENT(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent);
 
-IMPLEMENT_CLASS(wxAuiNotebook, wxControl)
-IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent)
+wxIMPLEMENT_CLASS(wxAuiNotebook, wxControl);
+wxIMPLEMENT_CLASS(wxAuiTabCtrl, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookEvent, wxBookCtrlEvent);
 
 
 // -- wxAuiTabContainer class implementation --
@@ -970,7 +970,7 @@ void wxAuiTabContainer::DoShowHide()
 
 
 
-BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_PAINT(wxAuiTabCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground)
     EVT_SIZE(wxAuiTabCtrl::OnSize)
@@ -988,7 +988,7 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_KILL_FOCUS(wxAuiTabCtrl::OnKillFocus)
     EVT_CHAR(wxAuiTabCtrl::OnChar)
     EVT_MOUSE_CAPTURE_LOST(wxAuiTabCtrl::OnCaptureLost)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent,
@@ -1620,7 +1620,7 @@ const int wxAuiBaseTabCtrlId = 5380;
 #define EVT_AUI_RANGE(id1, id2, event, func) \
     wx__DECLARE_EVT2(event, id1, id2, wxAuiNotebookEventHandler(func))
 
-BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
+wxBEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
     EVT_SIZE(wxAuiNotebook::OnSize)
     EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook)
     EVT_AUI_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
@@ -1657,7 +1657,7 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
                       wxEVT_AUINOTEBOOK_BG_DCLICK,
                       wxAuiNotebook::OnTabBgDClick)
     EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxAuiNotebook::Init()
 {
diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 837c0a0aa5..fbbbc05560 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -35,7 +35,7 @@
 #include "wx/msw/private.h"
 #endif
 
-IMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
+wxIMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass);
 
 wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent,
                 wxAuiManager* owner_mgr,
@@ -352,14 +352,14 @@ bool wxAuiFloatingFrame::isMouseDown()
 }
 
 
-BEGIN_EVENT_TABLE(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
+wxBEGIN_EVENT_TABLE(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
     EVT_SIZE(wxAuiFloatingFrame::OnSize)
     EVT_MOVE(wxAuiFloatingFrame::OnMoveEvent)
     EVT_MOVING(wxAuiFloatingFrame::OnMoveEvent)
     EVT_CLOSE(wxAuiFloatingFrame::OnClose)
     EVT_IDLE(wxAuiFloatingFrame::OnIdle)
     EVT_ACTIVATE(wxAuiFloatingFrame::OnActivate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 #endif // wxUSE_AUI
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 4d4300d757..063715cbef 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -75,8 +75,8 @@ wxDEFINE_EVENT( wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent );
     #include "wx/msw/dc.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent)
-IMPLEMENT_CLASS(wxAuiManager, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent);
+wxIMPLEMENT_CLASS(wxAuiManager, wxEvtHandler);
 
 
 
@@ -203,20 +203,20 @@ private:
 
     wxRegion m_region;
 
-    DECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame);
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxPseudoTransparentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxPseudoTransparentFrame, wxFrame)
     EVT_PAINT(wxPseudoTransparentFrame::OnPaint)
     EVT_SIZE(wxPseudoTransparentFrame::OnSize)
 #ifdef __WXGTK__
     EVT_WINDOW_CREATE(wxPseudoTransparentFrame::OnWindowCreate)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 #else
@@ -289,10 +289,10 @@ protected:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame);
 
 #endif
  // __WXGTK20__
@@ -595,7 +595,7 @@ bool wxAuiPaneInfo::IsValid() const
 // -- wxAuiManager class implementation --
 
 
-BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
     EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton)
     EVT_AUI_RENDER(wxAuiManager::OnRender)
     EVT_PAINT(wxAuiManager::OnPaint)
@@ -609,7 +609,7 @@ BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
     EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost)
     EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
     EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags)
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 70c1a734e8..4d619c2a3f 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -51,14 +51,14 @@ enum MDI_MENU_ID
 // wxAuiMDIParentFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIParentFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIParentFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxAuiMDIParentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxAuiMDIParentFrame, wxFrame)
 #if wxUSE_MENUS
     EVT_MENU (wxID_ANY, wxAuiMDIParentFrame::DoHandleMenu)
     EVT_UPDATE_UI (wxID_ANY, wxAuiMDIParentFrame::DoHandleUpdateUI)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxAuiMDIParentFrame::wxAuiMDIParentFrame()
 {
@@ -423,13 +423,13 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
 // wxAuiMDIChildFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxPanel)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxPanel);
 
-BEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxPanel)
+wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxPanel)
     EVT_MENU_HIGHLIGHT_ALL(wxAuiMDIChildFrame::OnMenuHighlight)
     EVT_ACTIVATE(wxAuiMDIChildFrame::OnActivate)
     EVT_CLOSE(wxAuiMDIChildFrame::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxAuiMDIChildFrame::wxAuiMDIChildFrame()
 {
@@ -769,13 +769,13 @@ void wxAuiMDIChildFrame::ApplyMDIChildFrameRect()
 // wxAuiMDIClientWindow
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook);
 
-BEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
+wxBEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
     EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
     EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose)
     EVT_SIZE(wxAuiMDIClientWindow::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxAuiMDIClientWindow::wxAuiMDIClientWindow()
 {
diff --git a/src/common/animatecmn.cpp b/src/common/animatecmn.cpp
index c8fb083300..17c2a60b63 100644
--- a/src/common/animatecmn.cpp
+++ b/src/common/animatecmn.cpp
@@ -34,8 +34,8 @@ const char wxAnimationCtrlNameStr[] = "animationctrl";
 // global object
 wxAnimation wxNullAnimation;
 
-IMPLEMENT_ABSTRACT_CLASS(wxAnimationBase, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxAnimationCtrlBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationBase, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationCtrlBase, wxControl);
 
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/any.cpp b/src/common/any.cpp
index 93aa5258ed..8cb31713b3 100644
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -211,7 +211,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
 //
 class wxAnyValueTypeGlobalsManager : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager)
+    wxDECLARE_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager);
 public:
     wxAnyValueTypeGlobalsManager() : wxModule() { }
     virtual ~wxAnyValueTypeGlobalsManager() { }
@@ -227,7 +227,7 @@ public:
 private:
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager, wxModule);
 
 #endif // wxUSE_VARIANT
 
diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 360f22936c..fc85b55b03 100644
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -17,8 +17,8 @@
 
 #include "wx/archive.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase);
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 011ae0de38..e6d3736417 100644
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -124,7 +124,7 @@ wxArtProviderCache::ConstructHashID(const wxArtID& id,
 // wxArtProvider class
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxArtProvider, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxArtProvider, wxObject);
 
 wxArtProvidersList *wxArtProvider::sm_providers = NULL;
 wxArtProviderCache *wxArtProvider::sm_cache = NULL;
@@ -430,7 +430,7 @@ public:
         wxArtProvider::CleanUpProviders();
     }
 
-    DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
+    wxDECLARE_DYNAMIC_CLASS(wxArtProviderModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxArtProviderModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxArtProviderModule, wxModule);
diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 1a49f500e4..b04ffaddb9 100644
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -81,8 +81,8 @@ wxBitmap wxBitmapHelpers::NewFromPNGData(const void* data, size_t size)
 #endif // WX_PRECOMP
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject);
 
 wxList wxBitmapBase::sm_handlers;
 
@@ -163,14 +163,14 @@ void wxBitmapBase::CleanUpHandlers()
 
 class wxBitmapBaseModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapBaseModule);
 public:
     wxBitmapBaseModule() {}
     bool OnInit() wxOVERRIDE { wxBitmap::InitStandardHandlers(); return true; }
     void OnExit() wxOVERRIDE { wxBitmap::CleanUpHandlers(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule);
 
 #endif // wxUSE_BITMAP_BASE
 
diff --git a/src/common/bmpbtncmn.cpp b/src/common/bmpbtncmn.cpp
index 8760c70c09..cdedb2861a 100644
--- a/src/common/bmpbtncmn.cpp
+++ b/src/common/bmpbtncmn.cpp
@@ -68,7 +68,7 @@ wxBEGIN_FLAGS( wxBitmapButtonStyle )
     wxFLAGS_MEMBER(wxBU_BOTTOM)
 wxEND_FLAGS( wxBitmapButtonStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton, "wx/bmpbuttn.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton, "wx/bmpbuttn.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
     wxPROPERTY_FLAGS( WindowStyle, wxBitmapButtonStyle, long, \
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 1b745ac168..9ef5a23280 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -37,14 +37,14 @@
 // event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl);
 
-BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
+wxBEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
     EVT_SIZE(wxBookCtrlBase::OnSize)
 #if wxUSE_HELP
     EVT_HELP(wxID_ANY, wxBookCtrlBase::OnHelp)
 #endif // wxUSE_HELP
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // constructors and destructors
@@ -522,6 +522,6 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
     return oldSel;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent);
 
 #endif // wxUSE_BOOKCTRL
diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index cbbfd0f14e..912605ba5c 100644
--- a/src/common/btncmn.cpp
+++ b/src/common/btncmn.cpp
@@ -71,7 +71,7 @@ wxFLAGS_MEMBER(wxBU_BOTTOM)
 wxFLAGS_MEMBER(wxBU_EXACTFIT)
 wxEND_FLAGS( wxButtonStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxButton)
 wxEVENT_PROPERTY( Click, wxEVT_BUTTON, wxCommandEvent )
diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index ed057500f1..933a7b1974 100644
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -407,7 +407,7 @@ public:
     virtual void OnExit() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCairoModule)
+    wxDECLARE_DYNAMIC_CLASS(wxCairoModule);
 };
 
 bool wxCairoModule::OnInit()
@@ -420,6 +420,6 @@ void wxCairoModule::OnExit()
     wxCairo::CleanUp();
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxCairoModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCairoModule, wxModule);
 
 #endif // wxUSE_CAIRO
diff --git a/src/common/calctrlcmn.cpp b/src/common/calctrlcmn.cpp
index 2b869127b2..5ab2542251 100644
--- a/src/common/calctrlcmn.cpp
+++ b/src/common/calctrlcmn.cpp
@@ -18,7 +18,7 @@
 #if wxUSE_CALENDARCTRL || wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL
 
 #include "wx/dateevt.h"
-IMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDateEvent, wxCommandEvent);
 wxDEFINE_EVENT(wxEVT_DATE_CHANGED, wxDateEvent);
 wxDEFINE_EVENT(wxEVT_TIME_CHANGED, wxDateEvent);
 
@@ -72,7 +72,7 @@ wxFLAGS_MEMBER(wxCAL_SHOW_SURROUNDING_WEEKS)
 
 wxEND_FLAGS( wxCalendarCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl, "wx/calctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl, wxControl, "wx/calctrl.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxCalendarCtrl)
 wxEVENT_RANGE_PROPERTY( Updated, wxEVT_CALENDAR_SEL_CHANGED, \
@@ -96,7 +96,7 @@ wxCONSTRUCTOR_6( wxCalendarCtrl, wxWindow*, Parent, wxWindowID, Id, \
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCalendarEvent, wxDateEvent);
 
 wxDEFINE_EVENT( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEvent );
 wxDEFINE_EVENT( wxEVT_CALENDAR_PAGE_CHANGED, wxCalendarEvent );
diff --git a/src/common/checkboxcmn.cpp b/src/common/checkboxcmn.cpp
index b31d85338d..f081665877 100644
--- a/src/common/checkboxcmn.cpp
+++ b/src/common/checkboxcmn.cpp
@@ -64,7 +64,7 @@ wxBEGIN_FLAGS( wxCheckBoxStyle )
 
 wxEND_FLAGS( wxCheckBoxStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl, "wx/checkbox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl, "wx/checkbox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
     wxEVENT_PROPERTY( Click, wxEVT_CHECKBOX, wxCommandEvent )
diff --git a/src/common/checklstcmn.cpp b/src/common/checklstcmn.cpp
index be56ca3e17..58758ecfa3 100644
--- a/src/common/checklstcmn.cpp
+++ b/src/common/checklstcmn.cpp
@@ -83,7 +83,7 @@ wxBEGIN_FLAGS( wxCheckListBoxStyle )
 
 wxEND_FLAGS( wxCheckListBoxStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox, "wx/checklst.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox, "wx/checklst.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
     wxEVENT_PROPERTY( Toggle, wxEVT_CHECKLISTBOX, wxCommandEvent )
diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp
index 6ac940b424..7018527266 100644
--- a/src/common/choiccmn.cpp
+++ b/src/common/choiccmn.cpp
@@ -66,7 +66,7 @@ wxFLAGS_MEMBER(wxHSCROLL)
 
 wxEND_FLAGS( wxChoiceStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxChoice)
 wxEVENT_PROPERTY( Select, wxEVT_CHOICE, wxCommandEvent )
diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index ff72a135cf..bea674f526 100644
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -36,7 +36,7 @@
 // wxClipboardEvent
 // ---------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent);
 
 wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
 
@@ -103,9 +103,9 @@ public:
     void OnExit() wxOVERRIDE { wxDELETE(gs_clipboard); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboardModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule);
 
 #endif // wxUSE_CLIPBOARD
diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 8320178596..6f5f118c93 100644
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -39,8 +39,8 @@ const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
 // ============================================================================
 
 wxDEFINE_EVENT(wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent);
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent);
 
 // ----------------------------------------------------------------------------
 // wxColourPickerCtrl
diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 413c25b994..09fb2c8478 100644
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -36,8 +36,8 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_CLASS(wxCommand, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
+wxIMPLEMENT_CLASS(wxCommand, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxCommand
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 18b2ef927f..f4eff7fb2a 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -44,9 +44,9 @@
 #include "wx/paper.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject);
 
 // ============================================================================
 // implementation
diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 71e7bb188c..fb193c3898 100644
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -75,9 +75,9 @@ wxEMPTY_HANDLERS_TABLE(wxColour)
 #else
 
 #if wxCOLOUR_IS_GDIOBJECT
-wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject);
 #else
-wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject);
 #endif
 
 #endif
diff --git a/src/common/colourdata.cpp b/src/common/colourdata.cpp
index 3569c50514..1748076863 100644
--- a/src/common/colourdata.cpp
+++ b/src/common/colourdata.cpp
@@ -20,7 +20,7 @@
 // wxColourData
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject);
 
 wxColourData::wxColourData()
 {
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 8fb1354720..406e68ebc5 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -72,7 +72,7 @@ wxFLAGS_MEMBER(wxCB_DROPDOWN)
 
 wxEND_FLAGS( wxComboBoxStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 wxEVENT_PROPERTY( Select, wxEVT_COMBOBOX, wxCommandEvent )
@@ -353,10 +353,10 @@ protected:
     wxComboCtrlBase*     m_combo;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
     EVT_IDLE(wxComboFrameEventHandler::OnIdle)
     EVT_LEFT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
     EVT_RIGHT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
@@ -366,7 +366,7 @@ BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
     EVT_MENU_OPEN(wxComboFrameEventHandler::OnMenuEvent)
     EVT_ACTIVATE(wxComboFrameEventHandler::OnActivate)
     EVT_CLOSE(wxComboFrameEventHandler::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )
     : wxEvtHandler()
@@ -520,7 +520,7 @@ void wxComboPopupWindow::OnDismiss()
 {
     wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
     wxASSERT_MSG( wxDynamicCast(combo, wxComboCtrlBase),
-                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+                  wxT("parent might not be wxComboCtrl, but check wxIMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     combo->OnPopupDismiss(true);
 }
@@ -551,11 +551,11 @@ public:
 private:
     wxComboCtrlBase*    m_combo;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
     EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
     EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
     EVT_CHAR(wxComboPopupWindowEvtHandler::OnKeyEvent)
@@ -563,7 +563,7 @@ BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
     EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
 #endif
     EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
@@ -727,17 +727,17 @@ protected:
     wxComboCtrlBase*   m_combo;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
     EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
     EVT_KEY_UP(wxComboBoxExtraInputHandler::OnKey)
     EVT_CHAR(wxComboBoxExtraInputHandler::OnKey)
     EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
     EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
@@ -821,13 +821,13 @@ protected:
     bool                m_blockEventsToPopup;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-BEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler)
     EVT_MOUSE_EVENTS(wxComboPopupEvtHandler::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxComboPopupEvtHandler::OnMouseEvent( wxMouseEvent& event )
@@ -960,7 +960,7 @@ public:
 // ----------------------------------------------------------------------------
 
 
-BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
+wxBEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
     EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
     EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
     EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
@@ -969,10 +969,10 @@ BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
     EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
     EVT_CHAR(wxComboCtrlBase::OnCharEvent)
     EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl);
 
 void wxComboCtrlBase::Init()
 {
diff --git a/src/common/config.cpp b/src/common/config.cpp
index 688f5c2330..330682b0ca 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -72,7 +72,7 @@ wxConfigBase *wxAppTraitsBase::CreateConfig()
 // ----------------------------------------------------------------------------
 // wxConfigBase
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject);
 
 // Not all args will always be used by derived classes, but including them all
 // in each class ensures compatibility.
diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index c3c0c6b9ce..67e7860947 100644
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -73,7 +73,7 @@ public:
  */
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject);
 
 wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
 {
@@ -267,11 +267,11 @@ static const char * csquery_xpm[] = {
 "            "};
 
 
-IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
+wxIMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton);
 
-BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
+wxBEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
     EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxContextHelpButton::Create(wxWindow* parent,
                                          wxWindowID id,
@@ -476,10 +476,10 @@ public:
     void OnExit() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxHelpProviderModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHelpProviderModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHelpProviderModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHelpProviderModule, wxModule);
 
 bool wxHelpProviderModule::OnInit()
 {
diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 81a5a39a93..afba9ce85b 100644
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -30,7 +30,7 @@
     #include "wx/arrstr.h"
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl);
 
 // ============================================================================
 // wxItemContainerImmutable implementation
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 0cd0907fa3..53252c08e8 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -63,7 +63,7 @@ private:
     bool                    m_focusOnIdle;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 } // anonymous namespace
@@ -637,7 +637,7 @@ unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUN
 // wxDataViewIconText
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject);
 
 IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
 
@@ -645,7 +645,7 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
 // wxDataViewRendererBase
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject);
 
 wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 wxDataViewCellMode WXUNUSED(mode),
@@ -952,12 +952,12 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
 // wxDataViewEditorCtrlEvtHandler
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
     EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
     EVT_TEXT_ENTER     (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
 {
@@ -1030,7 +1030,7 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl);
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
@@ -1480,7 +1480,7 @@ void wxDataViewCtrlBase::StartEditor(const wxDataViewItem& item, unsigned int co
 // wxDataViewEvent
 // ---------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent);
 
 wxDEFINE_EVENT( wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
 
@@ -1887,11 +1887,11 @@ bool wxDataViewListStore::SetValueByRow( const wxVariant &value, unsigned int ro
 // wxDataViewListCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewListCtrl,wxDataViewCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewListCtrl,wxDataViewCtrl);
 
-BEGIN_EVENT_TABLE(wxDataViewListCtrl,wxDataViewCtrl)
+wxBEGIN_EVENT_TABLE(wxDataViewListCtrl,wxDataViewCtrl)
    EVT_SIZE( wxDataViewListCtrl::OnSize )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxDataViewListCtrl::wxDataViewListCtrl()
 {
@@ -2413,13 +2413,13 @@ wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const
 // wxDataViewTreeCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl);
 
-BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
+wxBEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
    EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded)
    EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed)
    EVT_SIZE( wxDataViewTreeCtrl::OnSize )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 588f2f8067..9fb404e77c 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -137,10 +137,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule);
 
 // ----------------------------------------------------------------------------
 // constants
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 229552468a..c14e560312 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -114,10 +114,10 @@ public:
     virtual void OnExit() wxOVERRIDE { wxDCFactory::Set(NULL); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDCFactoryCleanupModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDCFactoryCleanupModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDCFactoryCleanupModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDCFactoryCleanupModule, wxModule);
 
 //-----------------------------------------------------------------------------
 // wxNativeDCFactory
@@ -186,7 +186,7 @@ wxDCImpl *wxNativeDCFactory::CreatePrinterDC( wxPrinterDC *owner, const wxPrintD
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDC, wxDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDC, wxDC);
 
 wxWindowDC::wxWindowDC(wxWindow *win)
           : wxDC(wxDCFactory::Get()->CreateWindowDC(this, win))
@@ -197,7 +197,7 @@ wxWindowDC::wxWindowDC(wxWindow *win)
 // wxClientDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDC, wxWindowDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDC, wxWindowDC);
 
 wxClientDC::wxClientDC(wxWindow *win)
           : wxWindowDC(wxDCFactory::Get()->CreateClientDC(this, win))
@@ -208,7 +208,7 @@ wxClientDC::wxClientDC(wxWindow *win)
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC);
 
 wxMemoryDC::wxMemoryDC()
           : wxDC(wxDCFactory::Get()->CreateMemoryDC(this))
@@ -262,7 +262,7 @@ wxBitmap& wxMemoryDC::GetSelectedBitmap()
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDC, wxClientDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDC, wxClientDC);
 
 wxPaintDC::wxPaintDC(wxWindow *win)
          : wxClientDC(wxDCFactory::Get()->CreatePaintDC(this, win))
@@ -273,7 +273,7 @@ wxPaintDC::wxPaintDC(wxWindow *win)
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC);
 
 wxScreenDC::wxScreenDC()
           : wxDC(wxDCFactory::Get()->CreateScreenDC(this))
@@ -286,7 +286,7 @@ wxScreenDC::wxScreenDC()
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-IMPLEMENT_DYNAMIC_CLASS(wxPrinterDC, wxDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrinterDC, wxDC);
 
 wxPrinterDC::wxPrinterDC()
            : wxDC(wxDCFactory::Get()->CreatePrinterDC(this, wxPrintData()))
@@ -314,7 +314,7 @@ int wxPrinterDC::GetResolution() const
 // wxDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDCImpl, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDCImpl, wxObject);
 
 wxDCImpl::wxDCImpl( wxDC *owner )
         : m_window(NULL)
@@ -1051,7 +1051,7 @@ void wxDCImpl::DoGetFontMetrics(int *height,
 // wxDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject);
 
 void wxDC::CopyAttributes(const wxDC& dc)
 {
diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
index ca100fa308..90f5b11355 100644
--- a/src/common/dcbufcmn.cpp
+++ b/src/common/dcbufcmn.cpp
@@ -33,8 +33,8 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC,wxMemoryDC)
-IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC,wxBufferedDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC);
+wxIMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC);
 
 // ----------------------------------------------------------------------------
 // wxSharedDCBufferManager: helper class maintaining backing store bitmap
@@ -90,13 +90,13 @@ private:
     static wxBitmap *ms_buffer;
     static bool ms_usingSharedBuffer;
 
-    DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
+    wxDECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager);
 };
 
 wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
 bool wxSharedDCBufferManager::ms_usingSharedBuffer = false;
 
-IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule);
 
 // ============================================================================
 // wxBufferedDC
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index f40b2ff2d4..f989d0c374 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -80,7 +80,7 @@ static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function)
 // wxDC bridge class
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC);
 
 wxGCDC::wxGCDC(const wxWindowDC& dc) :
   wxDC( new wxGCDCImpl( this, dc ) )
@@ -135,7 +135,7 @@ void wxGCDC::SetGraphicsContext( wxGraphicsContext* ctx )
     gc_impl->SetGraphicsContext( ctx );
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl);
 
 wxGCDCImpl::wxGCDCImpl( wxDC *owner ) :
    wxDCImpl( owner )
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 2c5075669d..64025aa884 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -213,7 +213,7 @@ void wxSVGFileDC::SetBitmapHandler(wxSVGBitmapHandler* handler)
 // wxSVGFileDCImpl
 // ----------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC);
 
 wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
                     int width, int height, double dpi ) :
diff --git a/src/common/dirctrlcmn.cpp b/src/common/dirctrlcmn.cpp
index 617875f1f7..34215a83ad 100644
--- a/src/common/dirctrlcmn.cpp
+++ b/src/common/dirctrlcmn.cpp
@@ -62,7 +62,7 @@ wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
     wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
 wxEND_FLAGS( wxGenericDirCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
     wxHIDE_PROPERTY( Children )
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index dcc2cb09c9..3324b6f0e9 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -88,7 +88,7 @@ wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
 wxFLAGS_MEMBER(wxMINIMIZE_BOX)
 wxEND_FLAGS( wxDialogStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow, "wx/dialog.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow, "wx/dialog.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxDialog)
 wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
@@ -108,13 +108,13 @@ wxCONSTRUCTOR_6( wxDialog, wxWindow*, Parent, wxWindowID, Id, \
 // wxDialogBase
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
+wxBEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
     EVT_BUTTON(wxID_ANY, wxDialogBase::OnButton)
 
     EVT_CLOSE(wxDialogBase::OnCloseWindow)
 
     EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
 bool wxDialogBase::sm_layoutAdaptation = false;
@@ -507,7 +507,7 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 
-IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent);
 
 void wxDialogBase::ShowWindowModal ()
 {
@@ -632,9 +632,9 @@ wxDialogLayoutAdapter* wxDialogBase::SetLayoutAdapter(wxDialogLayoutAdapter* ada
  * Standard adapter
  */
 
-IMPLEMENT_CLASS(wxDialogLayoutAdapter, wxObject)
+wxIMPLEMENT_CLASS(wxDialogLayoutAdapter, wxObject);
 
-IMPLEMENT_CLASS(wxStandardDialogLayoutAdapter, wxDialogLayoutAdapter)
+wxIMPLEMENT_CLASS(wxStandardDialogLayoutAdapter, wxDialogLayoutAdapter);
 
 // Allow for caption size on wxWidgets < 2.9
 #if defined(__WXGTK__) && !wxCHECK_VERSION(2,9,0)
@@ -1004,11 +1004,11 @@ bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxWindo
 
 class wxDialogLayoutAdapterModule: public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule);
 public:
     wxDialogLayoutAdapterModule() {}
     virtual void OnExit() wxOVERRIDE { delete wxDialogBase::SetLayoutAdapter(NULL); }
     virtual bool OnInit() wxOVERRIDE { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule);
diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index ffdf7e6247..97d7bafff6 100644
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -19,8 +19,8 @@
 
 #include "wx/docmdi.h"
 
-IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
-IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
+wxIMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame);
+wxIMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame);
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 939eb1f390..5d4badad55 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -79,15 +79,15 @@
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler);
+wxIMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler);
+wxIMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler);
+wxIMPLEMENT_CLASS(wxDocChildFrame, wxFrame);
+wxIMPLEMENT_CLASS(wxDocParentFrame, wxFrame);
 
 #if wxUSE_PRINTING_ARCHITECTURE
-    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout);
 #endif
 
 // ============================================================================
@@ -942,7 +942,7 @@ wxView *wxDocTemplate::DoCreateView()
 // wxDocManager
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
     EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)
@@ -978,7 +978,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     // NB: we keep "Print setup" menu item always enabled as it can be used
     //     even without an active document
 #endif // wxUSE_PRINTING_ARCHITECTURE
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxDocManager* wxDocManager::sm_docManager = NULL;
 
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index 0d93fd6ccb..ecc744d4aa 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -100,10 +100,10 @@ public:
         wxDELETE(gs_factory);
     }
 
-    DECLARE_DYNAMIC_CLASS(wxDisplayModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDisplayModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule);
 
 // ============================================================================
 // wxDisplay implementation
diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 9c3ff74d81..8aff4fed50 100644
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -65,10 +65,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
+    wxDECLARE_DYNAMIC_CLASS(wxPluginLibraryModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule);
 
 
 wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index 55a40be7ec..7b3f3b8cb5 100644
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -30,7 +30,7 @@
  * wxEffectsImpl: various 3D effects
  */
 
-IMPLEMENT_CLASS(wxEffectsImpl, wxObject)
+wxIMPLEMENT_CLASS(wxEffectsImpl, wxObject);
 
 // Assume system colours
 wxEffectsImpl::wxEffectsImpl()
diff --git a/src/common/event.cpp b/src/common/event.cpp
index ab6b0f137f..9d9eb18a95 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -60,49 +60,49 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_BASE
-    IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-    IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxEvent)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject);
+    wxIMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxEvent);
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
-    IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureLostEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureLostEvent, wxEvent);
+    wxIMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent);
 #endif // wxUSE_GUI
 
 #if wxUSE_BASE
@@ -136,10 +136,10 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit() { wxEventHashTable::ClearAll(); }
 
-    DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
+    wxDECLARE_DYNAMIC_CLASS(wxEventTableEntryModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule);
 
 #endif // wxUSE_MEMORY_TRACING
 
diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp
index fb97796a0b..8392753ddd 100644
--- a/src/common/fddlgcmn.cpp
+++ b/src/common/fddlgcmn.cpp
@@ -34,7 +34,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_FIND, wxFindDialogEvent );
 wxDEFINE_EVENT( wxEVT_FIND_NEXT, wxFindDialogEvent );
diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp
index 4a71593ba5..6f0be00973 100644
--- a/src/common/fdiodispatcher.cpp
+++ b/src/common/fdiodispatcher.cpp
@@ -139,7 +139,7 @@ public:
     virtual void OnExit() wxOVERRIDE { wxDELETE(gs_dispatcher); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFDIODispatcherModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFDIODispatcherModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFDIODispatcherModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFDIODispatcherModule, wxModule);
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index d3988e62f8..0b782d707f 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -316,7 +316,7 @@ wxFileName wxFileConfig::GetLocalFile(const wxString& szFile, int style)
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase);
 
 void wxFileConfig::Init()
 {
diff --git a/src/common/filectrlcmn.cpp b/src/common/filectrlcmn.cpp
index eb8e054a8c..144d0f2ec4 100644
--- a/src/common/filectrlcmn.cpp
+++ b/src/common/filectrlcmn.cpp
@@ -29,7 +29,7 @@ wxDEFINE_EVENT( wxEVT_FILECTRL_FILEACTIVATED, wxFileCtrlEvent );
 wxDEFINE_EVENT( wxEVT_FILECTRL_FOLDERCHANGED, wxFileCtrlEvent );
 wxDEFINE_EVENT( wxEVT_FILECTRL_FILTERCHANGED, wxFileCtrlEvent );
 
-IMPLEMENT_DYNAMIC_CLASS( wxFileCtrlEvent, wxCommandEvent )
+wxIMPLEMENT_DYNAMIC_CLASS( wxFileCtrlEvent, wxCommandEvent );
 
 // some helper functions
 
diff --git a/src/common/filehistorycmn.cpp b/src/common/filehistorycmn.cpp
index 75bf1118b5..4654188081 100644
--- a/src/common/filehistorycmn.cpp
+++ b/src/common/filehistorycmn.cpp
@@ -59,7 +59,7 @@ wxString GetMRUEntryLabel(int n, const wxString& path)
 // File history (a.k.a. MRU, most recently used, files list)
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject);
 
 wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase)
 {
diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index a58b4adfec..ad3be2a644 100644
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -45,7 +45,7 @@ const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");
 
 wxDEFINE_EVENT( wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
 wxDEFINE_EVENT( wxEVT_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
-IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent);
 
 // ----------------------------------------------------------------------------
 // wxFileDirPickerCtrlBase
@@ -175,7 +175,7 @@ void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev)
 
 #if wxUSE_FILEPICKERCTRL
 
-IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase);
 
 bool wxFilePickerCtrl::Create(wxWindow *parent,
                               wxWindowID id,
@@ -214,7 +214,7 @@ wxString wxFilePickerCtrl::GetTextCtrlValue() const
 // ----------------------------------------------------------------------------
 
 #if wxUSE_DIRPICKERCTRL
-IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase);
 
 bool wxDirPickerCtrl::Create(wxWindow *parent,
                              wxWindowID id,
diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index fadcec62ae..5c92e36b81 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -49,7 +49,7 @@ const wxString& wxFSFile::GetMimeType() const
 // wxFileSystemHandler
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject);
 
 
 /* static */
@@ -293,8 +293,8 @@ wxString wxLocalFSHandler::FindNext()
 // wxFileSystem
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject);
 
 
 wxList wxFileSystem::m_Handlers;
@@ -726,7 +726,7 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
 
 class wxFileSystemModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFileSystemModule);
 
     public:
         wxFileSystemModule() :
@@ -753,7 +753,7 @@ class wxFileSystemModule : public wxModule
 
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule);
 
 //// wxFSInputStream
 
diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 33f691b084..5bbe74356a 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -41,7 +41,7 @@ extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] =
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog);
 
 void wxFileDialogBase::Init()
 {
diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 465cdd1fc8..9bef0110dc 100644
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -381,10 +381,10 @@ public:
         wxFontMapperBase::Reset();
     }
 
-    DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFontMapperModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule);
 
 
 // ============================================================================
diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index b0e175ca56..9256c7a5f0 100644
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -97,7 +97,7 @@ wxENUM_MEMBER( wxFONTWEIGHT_LIGHT )
 wxENUM_MEMBER( wxFONTWEIGHT_BOLD )
 wxEND_ENUM( wxFontWeight )
 
-wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject, "wx/font.h")
+wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject, "wx/font.h");
 
 //WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxFont>)
 
diff --git a/src/common/fontdata.cpp b/src/common/fontdata.cpp
index deef52ce2a..6417eb8bb8 100644
--- a/src/common/fontdata.cpp
+++ b/src/common/fontdata.cpp
@@ -15,7 +15,7 @@
 
 #include "wx/fontdata.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject);
 
 wxFontData::wxFontData()
 {
diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index bed2d90b42..3e7e1f849c 100644
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -42,8 +42,8 @@ const char wxFontPickerCtrlNameStr[] = "fontpicker";
 const char wxFontPickerWidgetNameStr[] = "fontpickerwidget";
 
 wxDEFINE_EVENT(wxEVT_FONTPICKER_CHANGED, wxFontPickerEvent);
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent);
 
 // ----------------------------------------------------------------------------
 // wxFontPickerCtrl
diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index a44ff50bb4..cad5d0eab5 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -43,12 +43,12 @@ extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
 #if wxUSE_MENUS
 
 #if wxUSE_STATUSBAR
-BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
+wxBEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 #endif // wxUSE_STATUSBAR
 
 /* static */
@@ -121,7 +121,7 @@ wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
 wxFLAGS_MEMBER(wxFRAME_SHAPED)
 wxEND_FLAGS( wxFrameStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxFrame)
 wxEVENT_PROPERTY( Menu, wxEVT_MENU, wxCommandEvent)
diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp
index 35c072fb37..14f3134b5f 100644
--- a/src/common/fs_arc.cpp
+++ b/src/common/fs_arc.cpp
@@ -305,7 +305,7 @@ wxArchiveFSCacheData *wxArchiveFSCache::Get(const wxString& name)
 // wxArchiveFSHandler
 //----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxArchiveFSHandler, wxFileSystemHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxArchiveFSHandler, wxFileSystemHandler);
 
 wxArchiveFSHandler::wxArchiveFSHandler()
  :  wxFileSystemHandler()
diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 03f3cc0b53..6f3ff4fc56 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -135,7 +135,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
 
 class wxFileSystemInternetModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule);
 
     public:
         wxFileSystemInternetModule() :
@@ -160,6 +160,6 @@ class wxFileSystemInternetModule : public wxModule
         wxFileSystemHandler* m_handler;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule);
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_INET
diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp
index 7fe86d1915..133aaa5a2d 100644
--- a/src/common/fswatchercmn.cpp
+++ b/src/common/fswatchercmn.cpp
@@ -61,7 +61,7 @@ static wxString GetFSWEventChangeTypeName(int type)
 // wxFileSystemWatcherEvent implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystemWatcherEvent, wxEvent);
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileSystemWatcherEvent, wxEvent);
 
 wxString wxFileSystemWatcherEvent::ToString() const
 {
diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index dc159f5571..596dc8cc34 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -60,7 +60,7 @@ static const size_t LEN_CODE = 3;
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol);
 IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), true)
 
 // ============================================================================
diff --git a/src/common/gaugecmn.cpp b/src/common/gaugecmn.cpp
index b26dc1ea68..f617e2cf7d 100644
--- a/src/common/gaugecmn.cpp
+++ b/src/common/gaugecmn.cpp
@@ -82,7 +82,7 @@ wxFLAGS_MEMBER(wxGA_SMOOTH)
 wxFLAGS_MEMBER(wxGA_PROGRESS)
 wxEND_FLAGS( wxGaugeStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl, "wx/gauge.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl, "wx/gauge.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxGauge)
 wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 88a6394175..3b291872a4 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -21,8 +21,8 @@
 
 //---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGBSizerItem, wxSizerItem)
-IMPLEMENT_CLASS(wxGridBagSizer, wxFlexGridSizer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGBSizerItem, wxSizerItem);
+wxIMPLEMENT_CLASS(wxGridBagSizer, wxFlexGridSizer);
 
 const wxGBSpan wxDefaultSpan;
 
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index b2912bfe61..f135a24c33 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -34,7 +34,7 @@
 #endif
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject);
 
 
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index ff9372bd50..c83273e4a1 100644
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -34,7 +34,7 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxGL")
 
-IMPLEMENT_CLASS(wxGLApp, wxApp)
+wxIMPLEMENT_CLASS(wxGLApp, wxApp);
 
 // ============================================================================
 // implementation
diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index c6d431f0a1..a9db8b48d9 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -36,7 +36,7 @@
 // wxGraphicsObject
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject);
 
 wxGraphicsObjectRefData::wxGraphicsObjectRefData( wxGraphicsRenderer* renderer )
 {
@@ -100,10 +100,10 @@ wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) con
 // pens etc.
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject);
 
 WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
 WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
@@ -114,7 +114,7 @@ WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
 // matrix
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject);
 WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
 
 // concatenates the matrix
@@ -205,7 +205,7 @@ void * wxGraphicsMatrix::GetNativeMatrix() const
 // path
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject);
 WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;
 
 // convenience functions, for using wxPoint2DDouble etc
@@ -524,7 +524,7 @@ void * wxGraphicsBitmap::GetNativeBitmap() const
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject);
 
 
 wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :
@@ -922,6 +922,6 @@ wxGraphicsContext* wxGraphicsContext::Create()
 // wxGraphicsRenderer
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject);
 
 #endif // wxUSE_GRAPHICS_CONTEXT
diff --git a/src/common/gridcmn.cpp b/src/common/gridcmn.cpp
index 0b88fd8ca2..3431bfc93f 100644
--- a/src/common/gridcmn.cpp
+++ b/src/common/gridcmn.cpp
@@ -67,7 +67,7 @@ wxBEGIN_FLAGS( wxGridStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 wxEND_FLAGS( wxGridStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow, "wx/grid.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGrid, wxScrolledWindow, "wx/grid.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxGrid)
     wxHIDE_PROPERTY( Children )
diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp
index 1b8701595b..54bb90119e 100644
--- a/src/common/headerctrlcmn.cpp
+++ b/src/common/headerctrlcmn.cpp
@@ -75,12 +75,12 @@ public:
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl";
 
-BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
+wxBEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
     EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick)
 #if wxUSE_MENUS
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
 #endif // wxUSE_MENUS
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxHeaderCtrlBase::ScrollWindow(int dx,
                                     int WXUNUSED_UNLESS_DEBUG(dy),
@@ -470,7 +470,7 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
 // wxHeaderCtrlEvent implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent);
 
 wxDEFINE_EVENT( wxEVT_HEADER_CLICK, wxHeaderCtrlEvent);
 wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp
index 91b0e674d6..fe64f7a694 100644
--- a/src/common/helpbase.cpp
+++ b/src/common/helpbase.cpp
@@ -22,6 +22,6 @@
 
 #include "wx/helpbase.h"
 
-IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
+wxIMPLEMENT_CLASS(wxHelpControllerBase, wxObject);
 
 #endif // wxUSE_HELP
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 15738669ce..73fddbb3ae 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -38,7 +38,7 @@
 // wxHTTP
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol);
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)
 
 wxHTTP::wxHTTP()
diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp
index 8cac751b03..aacbec2149 100644
--- a/src/common/hyperlnkcmn.cpp
+++ b/src/common/hyperlnkcmn.cpp
@@ -76,9 +76,9 @@ wxFLAGS_MEMBER(wxHL_ALIGN_RIGHT)
 wxFLAGS_MEMBER(wxHL_ALIGN_CENTRE)
 wxEND_FLAGS( wxHyperlinkStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI( wxHyperlinkCtrl, wxControl, "wx/hyperlink.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI( wxHyperlinkCtrl, wxControl, "wx/hyperlink.h");
 
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent);
 wxDEFINE_EVENT( wxEVT_HYPERLINK, wxHyperlinkEvent );
 
 wxBEGIN_PROPERTIES_TABLE(wxHyperlinkCtrl)
diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 4bb49e82bf..4bd39fa665 100644
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -30,7 +30,7 @@
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 
-IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject);
 
 #define M_ICONBUNDLEDATA static_cast<wxIconBundleRefData*>(m_refData)
 
diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index e29385a0e0..4696f85eec 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -54,7 +54,7 @@ static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType);
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler);
 
 #if wxUSE_STREAMS
 
@@ -1237,7 +1237,7 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 // wxICOHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler);
 
 #if wxUSE_STREAMS
 
@@ -1725,7 +1725,7 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream)
 // wxCURHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler);
 
 #if wxUSE_STREAMS
 
@@ -1740,7 +1740,7 @@ bool wxCURHandler::DoCanRead(wxInputStream& stream)
 // wxANIHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 2e906ac76a..79a076338f 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -130,7 +130,7 @@ wxImageRefData::~wxImageRefData()
 
 #define M_IMGDATA static_cast<wxImageRefData*>(m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject);
 
 bool wxImage::Create(const char* const* xpmData)
 {
@@ -3109,7 +3109,7 @@ void wxImage::RotateHue(double angle)
 // wxImageHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxImageHandler, wxObject);
 
 #if wxUSE_STREAMS
 int wxImageHandler::GetImageCount( wxInputStream& stream )
@@ -3650,14 +3650,14 @@ wxImage wxImage::Rotate(double angle,
 
 class wxImageModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxImageModule)
+    wxDECLARE_DYNAMIC_CLASS(wxImageModule);
 public:
     wxImageModule() {}
     bool OnInit() wxOVERRIDE { wxImage::InitStandardHandlers(); return true; }
     void OnExit() wxOVERRIDE { wxImage::CleanUpHandlers(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule);
 
 
 #endif // wxUSE_IMAGE
diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index ba2f3bbc0d..d2345861f4 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -68,7 +68,7 @@ struct GifHashTableType
     wxUint32 HTable[HT_SIZE];
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler);
 
 //----------------------------------------------------------------------------
 // Forward declarations
diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index 6bf0aa92cf..0b5558d5bd 100644
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -718,7 +718,7 @@ int wxIFFDecoder::ReadIFF()
 // wxIFFHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 44a3af81d2..cb4a319fc5 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -79,7 +79,7 @@ typedef boolean wxjpeg_boolean;
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 2d4d18c1b2..15bb97daf4 100644
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -33,7 +33,7 @@
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index bbd90b5b3d..41d032ee32 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -90,7 +90,7 @@ bool IsTransparent(unsigned char a)
 // wxPNGHandler implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d853912087..b244dc2aaf 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -28,7 +28,7 @@
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp
index ec0362192e..893107ba07 100644
--- a/src/common/imagtga.cpp
+++ b/src/common/imagtga.cpp
@@ -73,7 +73,7 @@ enum
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxTGAHandler, wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTGAHandler, wxImageHandler);
 
 #if wxUSE_STREAMS
 
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index e74c184a79..ed8cb22fd4 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -95,7 +95,7 @@ TIFFwxErrorHandler(const char* module, const char *fmt, va_list ap)
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler);
 
 wxTIFFHandler::wxTIFFHandler()
 {
diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index d8b5bb2c69..7379c6064d 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -81,7 +81,7 @@ license is as follows:
 #include "wx/xpmdecod.h"
 #include "wx/filename.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler);
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
diff --git a/src/common/init.cpp b/src/common/init.cpp
index 1bfbaf37ae..7e47e6007b 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -308,8 +308,8 @@ bool wxEntryStart(int& argc, wxChar **argv)
     wxAppPtr app(wxTheApp);
     if ( !app.get() )
     {
-        // if not, he might have used IMPLEMENT_APP() to give us a function to
-        // create it
+        // if not, he might have used wxIMPLEMENT_APP() to give us a
+        // function to create it
         wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction();
 
         if ( fnCreate )
@@ -321,8 +321,8 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     if ( !app.get() )
     {
-        // either IMPLEMENT_APP() was not used at all or it failed -- in any
-        // case we still need something
+        // either wxIMPLEMENT_APP() was not used at all or it failed -- in
+        // any case we still need something
         app.Set(new wxDummyConsoleApp);
     }
 
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index ed6f4e0919..c81c516806 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1885,7 +1885,7 @@ wxLocale *wxSetLocale(wxLocale *pLocale)
 
 class wxLocaleModule: public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxLocaleModule)
+    wxDECLARE_DYNAMIC_CLASS(wxLocaleModule);
     public:
         wxLocaleModule() {}
 
@@ -1900,6 +1900,6 @@ class wxLocaleModule: public wxModule
         }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule);
 
 #endif // wxUSE_INTL
diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index 9d23b46116..1e4f0e01d2 100644
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -36,8 +36,8 @@
 #endif
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject);
 
 
 inline void wxGetAsIs(wxWindowBase* win, int* w, int* h)
diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 2afe3f1b7b..45a4ea82aa 100644
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -86,7 +86,7 @@ wxFLAGS_MEMBER(wxLB_NEEDED_SB)
 wxFLAGS_MEMBER(wxLB_SORT)
 wxEND_FLAGS( wxListBoxStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxListBox)
 wxEVENT_PROPERTY( Select, wxEVT_LISTBOX, wxCommandEvent )
diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp
index a8c01f9466..0b4ddf6a5e 100644
--- a/src/common/listctrlcmn.cpp
+++ b/src/common/listctrlcmn.cpp
@@ -104,9 +104,9 @@ wxFLAGS_MEMBER(wxLC_VIRTUAL)
 wxEND_FLAGS( wxListCtrlStyle )
 
 #if ((!defined(__WXMSW__) && !defined(__WXQT__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h");
 #else
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h");
 #endif
 
 wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
@@ -127,9 +127,9 @@ wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \
  (see NotebookPageInfo)
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent);
 
 // ----------------------------------------------------------------------------
 // wxListCtrlBase implementation
diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp
index d8f0b2c747..27299d41a2 100644
--- a/src/common/mediactrlcmn.cpp
+++ b/src/common/mediactrlcmn.cpp
@@ -43,12 +43,12 @@
 // RTTI and Event implementations
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-IMPLEMENT_CLASS(wxMediaCtrl, wxControl)
+wxIMPLEMENT_CLASS(wxMediaCtrl, wxControl);
 wxDEFINE_EVENT( wxEVT_MEDIA_STATECHANGED, wxMediaEvent );
 wxDEFINE_EVENT( wxEVT_MEDIA_PLAY, wxMediaEvent );
 wxDEFINE_EVENT( wxEVT_MEDIA_PAUSE, wxMediaEvent );
-IMPLEMENT_CLASS(wxMediaBackend, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent)
+wxIMPLEMENT_CLASS(wxMediaBackend, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent);
 wxDEFINE_EVENT( wxEVT_MEDIA_FINISHED, wxMediaEvent );
 wxDEFINE_EVENT( wxEVT_MEDIA_LOADED, wxMediaEvent );
 wxDEFINE_EVENT( wxEVT_MEDIA_STOP, wxMediaEvent );
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 031ba7e5e3..a70ef29618 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -56,7 +56,7 @@ wxBEGIN_FLAGS( wxMenuStyle )
 wxFLAGS_MEMBER(wxMENU_TEAROFF)
 wxEND_FLAGS( wxMenuStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h");
 wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
 
 #if wxUSE_EXTENDED_RTTI    
@@ -108,7 +108,7 @@ wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
 #if wxUSE_EXTENDED_RTTI    
 WX_DEFINE_LIST( wxMenuInfoHelperList )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfoHelper, wxObject, "wx/menu.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfoHelper, wxObject, "wx/menu.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxMenuInfoHelper)
 wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \
diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index a14433b816..7571f5b78c 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -750,9 +750,9 @@ public:
         }
     }
 
-    DECLARE_DYNAMIC_CLASS(wxMimeTypeCmnModule)
+    wxDECLARE_DYNAMIC_CLASS(wxMimeTypeCmnModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule);
 
 #endif // wxUSE_MIMETYPE
diff --git a/src/common/mousemanager.cpp b/src/common/mousemanager.cpp
index b000c1b468..e6a14b290e 100644
--- a/src/common/mousemanager.cpp
+++ b/src/common/mousemanager.cpp
@@ -33,12 +33,12 @@
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxMouseEventsManager, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxMouseEventsManager, wxEvtHandler)
     EVT_MOUSE_CAPTURE_LOST(wxMouseEventsManager::OnCaptureLost)
     EVT_LEFT_DOWN(wxMouseEventsManager::OnLeftDown)
     EVT_LEFT_UP(wxMouseEventsManager::OnLeftUp)
     EVT_MOTION(wxMouseEventsManager::OnMove)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxMouseEventsManager implementation
diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 5e5c6495ce..f6332c1fa3 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -41,7 +41,7 @@
 // wxMemoryInputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream);
 
 wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
 {
@@ -152,7 +152,7 @@ wxFileOffset wxMemoryInputStream::OnSysTell() const
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream);
 
 wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
 {
diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index 3ee7af5f60..42de7672f3 100644
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -87,7 +87,7 @@ wxEND_FLAGS( wxNotebookStyle )
 
 WX_DEFINE_LIST( wxNotebookPageInfoList )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject, "wx/notebook.h" )
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject, "wx/notebook.h");
 
 wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo *, wxNotebookPageInfoList );
 
@@ -137,7 +137,7 @@ const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
 
 #endif
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h");
 wxBEGIN_PROPERTIES_TABLE(wxNotebook)
 wxEVENT_PROPERTY( PageChanging, wxEVT_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
 wxEVENT_PROPERTY( PageChanged, wxEVT_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
diff --git a/src/common/object.cpp b/src/common/object.cpp
index d36bf02b17..52ff0adb76 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -65,7 +65,7 @@ wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 
 // when using XTI, this method is already implemented inline inside
-// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
+// wxDECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
 // non-inline because this allows us to have a non-inline virtual function in
 // all wx classes and this solves linking problems for HP-UX native toolchain
 // and possibly others (we could make dtor non-inline as well but it's more
@@ -228,7 +228,7 @@ void wxClassInfo::Register()
         classTable = sm_classTable;
     }
 
-    // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
+    // Using wxIMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
     // link any object module twice mistakenly, or link twice against wx shared
     // library) will break this function because it will enter an infinite loop
     // and eventually die with "out of memory" - as this is quite hard to
@@ -236,7 +236,7 @@ void wxClassInfo::Register()
     wxASSERT_MSG( classTable->Get(m_className) == NULL,
         wxString::Format
         (
-            wxT("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
+            wxT("Class \"%s\" already in RTTI table - have you used wxIMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
             m_className
         )
     );
diff --git a/src/common/panelcmn.cpp b/src/common/panelcmn.cpp
index c12e1950a3..cf13d70b91 100644
--- a/src/common/panelcmn.cpp
+++ b/src/common/panelcmn.cpp
@@ -67,7 +67,7 @@ wxBEGIN_FLAGS( wxPanelStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 wxEND_FLAGS( wxPanelStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow, "wx/panel.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow, "wx/panel.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxPanel)
     wxPROPERTY_FLAGS( WindowStyle, wxPanelStyle, long, \
diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index dd566653fd..e1f8b20957 100644
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -39,8 +39,8 @@
 #endif
  // End __WXMSW__
 
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
-// IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject);
+// wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList);
 
 /*
  * Paper size database for all platforms
@@ -350,14 +350,14 @@ wxPrintPaperType* wxPrintPaperDatabase::Item(size_t index) const
 
 class WXDLLEXPORT wxPrintPaperModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxPrintPaperModule)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintPaperModule);
 public:
     wxPrintPaperModule() {}
     bool OnInit() wxOVERRIDE;
     void OnExit() wxOVERRIDE;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule);
 
 /*
  * Initialization/cleanup module
diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index b68d7b1c90..a435a0598a 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -40,7 +40,7 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl);
 
 // ----------------------------------------------------------------------------
 // wxPickerBase
diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 014ae9d8ce..395397c924 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -54,11 +54,11 @@
     #include "wx/x11/private.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow);
+wxIMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow);
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
-    IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow);
 #endif
 
 // ----------------------------------------------------------------------------
@@ -80,7 +80,7 @@ protected:
 private:
     wxPopupTransientWindow *m_popup;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);
 };
 
@@ -96,7 +96,7 @@ protected:
 private:
     wxPopupTransientWindow *m_popup;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);
 };
 
@@ -104,21 +104,21 @@ private:
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler)
     EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown)
     EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
     EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
     EVT_CHAR(wxPopupFocusHandler::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
+wxBEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
 #if defined(__WXMSW__) || (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
     EVT_IDLE(wxPopupTransientWindow::OnIdle)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
@@ -495,9 +495,9 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 // wxPopupComboWindow
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
+wxBEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent)
                   : wxPopupTransientWindow(parent)
diff --git a/src/common/powercmn.cpp b/src/common/powercmn.cpp
index fe1cb28de5..a546a4d00a 100644
--- a/src/common/powercmn.cpp
+++ b/src/common/powercmn.cpp
@@ -38,7 +38,7 @@
     wxDEFINE_EVENT( wxEVT_POWER_SUSPEND_CANCEL, wxPowerEvent );
     wxDEFINE_EVENT( wxEVT_POWER_RESUME, wxPowerEvent );
 
-    IMPLEMENT_DYNAMIC_CLASS(wxPowerEvent, wxEvent)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxPowerEvent, wxEvent);
 #endif
 
 // Provide stubs for systems without power resource management functions
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index d91b99706c..92eca0d259 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -284,7 +284,7 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
 // wxPrintNativeDataBase
 //----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject);
 
 wxPrintNativeDataBase::wxPrintNativeDataBase()
 {
@@ -303,16 +303,16 @@ public:
     void OnExit() wxOVERRIDE { wxPrintFactory::SetPrintFactory( NULL ); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintFactoryModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule);
 
 //----------------------------------------------------------------------------
 // wxPrinterBase
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPrinterBase, wxObject)
+wxIMPLEMENT_CLASS(wxPrinterBase, wxObject);
 
 wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
 {
@@ -351,7 +351,7 @@ wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const
 // wxPrinter
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPrinter, wxPrinterBase)
+wxIMPLEMENT_CLASS(wxPrinter, wxPrinterBase);
 
 wxPrinter::wxPrinter(wxPrintDialogData *data)
 {
@@ -410,7 +410,7 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const
 // wxPrintDialogBase: the dialog for printing.
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog);
 
 wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
                                      wxWindowID id,
@@ -427,7 +427,7 @@ wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
 // wxPrintDialog: the dialog for printing
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPrintDialog, wxObject)
+wxIMPLEMENT_CLASS(wxPrintDialog, wxObject);
 
 wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data)
 {
@@ -468,7 +468,7 @@ wxDC *wxPrintDialog::GetPrintDC()
 // wxPageSetupDialogBase: the page setup dialog
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog);
 
 wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
                                      wxWindowID id,
@@ -485,7 +485,7 @@ wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
 // wxPageSetupDialog: the page setup dialog
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPageSetupDialog, wxObject)
+wxIMPLEMENT_CLASS(wxPageSetupDialog, wxObject);
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data )
 {
@@ -517,9 +517,9 @@ wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData()
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxPrintAbortDialog::wxPrintAbortDialog(wxWindow *parent,
                                        const wxString& documentTitle,
@@ -570,7 +570,7 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 // wxPrintout
 //----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject);
 
 wxPrintout::wxPrintout(const wxString& title)
 {
@@ -854,9 +854,9 @@ void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
 // wxPreviewCanvas
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxPreviewCanvas, wxWindow);
 
-BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
+wxBEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_CHAR(wxPreviewCanvas::OnChar)
     EVT_IDLE(wxPreviewCanvas::OnIdle)
@@ -864,7 +864,7 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
 #if wxUSE_MOUSEWHEEL
     EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // VZ: the current code doesn't refresh properly without
 //     wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
@@ -1224,9 +1224,9 @@ private:
 // wxPreviewControlBar
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
+wxIMPLEMENT_CLASS(wxPreviewControlBar, wxWindow);
 
-BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
+wxBEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
     EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
     EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrintButton)
     EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
@@ -1246,7 +1246,7 @@ BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
     EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoomChoice)
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
                                          wxWindow *parent, const wxPoint& pos, const wxSize& size,
@@ -1631,12 +1631,12 @@ int wxPreviewControlBar::GetZoomControl()
 * Preview frame
 */
 
-IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
+wxIMPLEMENT_CLASS(wxPreviewFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
     EVT_CHAR_HOOK(wxPreviewFrame::OnChar)
     EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxPreviewFrame::OnChar(wxKeyEvent &event)
 {
@@ -1778,7 +1778,7 @@ void wxPreviewFrame::CreateControlBar()
 * Print preview
 */
 
-IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
+wxIMPLEMENT_CLASS(wxPrintPreviewBase, wxObject);
 
 wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
                                        wxPrintout *printoutForPrinting,
@@ -2129,7 +2129,7 @@ void wxPrintPreviewBase::SetOk(bool ok)
 // wxPrintPreview
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
+wxIMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase);
 
 wxPrintPreview::wxPrintPreview(wxPrintout *printout,
                    wxPrintout *printoutForPrinting,
diff --git a/src/common/process.cpp b/src/common/process.cpp
index 4c4bbc8bfd..dfe1ad3c02 100644
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -31,8 +31,8 @@
 
 wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent );
 
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler);
+wxIMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent);
 
 // ============================================================================
 // wxProcess implementation
diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 74662adb8a..8572d834f4 100644
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -33,7 +33,7 @@
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxProtoInfo, wxObject)
+wxIMPLEMENT_CLASS(wxProtoInfo, wxObject);
 
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
@@ -56,9 +56,9 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
 // ----------------------------------------------------------------------------
 
 #if wxUSE_SOCKETS
-IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
+wxIMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient);
 #else
-IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject);
 #endif
 
 wxProtocol::wxProtocol()
diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp
index 0d3824ddd3..76801b7649 100644
--- a/src/common/quantize.cpp
+++ b/src/common/quantize.cpp
@@ -1397,7 +1397,7 @@ prepare_range_limit_table (j_decompress_ptr cinfo)
  * wxQuantize
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxQuantize, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxQuantize, wxObject);
 
 void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows,
     unsigned char *palette, int desiredNoColours)
diff --git a/src/common/radiobtncmn.cpp b/src/common/radiobtncmn.cpp
index 5fe82fe1c7..dc2bd09240 100644
--- a/src/common/radiobtncmn.cpp
+++ b/src/common/radiobtncmn.cpp
@@ -71,7 +71,7 @@ wxBEGIN_FLAGS( wxRadioButtonStyle )
     wxFLAGS_MEMBER(wxRB_GROUP)
 wxEND_FLAGS( wxRadioButtonStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl, "wx/radiobut.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl, "wx/radiobut.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
     wxEVENT_PROPERTY( Click, wxEVT_RADIOBUTTON, wxCommandEvent )
diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp
index ab683b1cb7..b25ac61036 100644
--- a/src/common/radiocmn.cpp
+++ b/src/common/radiocmn.cpp
@@ -86,7 +86,7 @@ wxFLAGS_MEMBER(wxRA_VERTICAL)
 
 wxEND_FLAGS( wxRadioBoxStyle )
 
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl, "wx/radiobox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
 wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent )
diff --git a/src/common/rearrangectrl.cpp b/src/common/rearrangectrl.cpp
index ebea20dc4c..98cddb55fc 100644
--- a/src/common/rearrangectrl.cpp
+++ b/src/common/rearrangectrl.cpp
@@ -39,9 +39,9 @@
 extern
 WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[] = "wxRearrangeList";
 
-BEGIN_EVENT_TABLE(wxRearrangeList, wxCheckListBox)
+wxBEGIN_EVENT_TABLE(wxRearrangeList, wxCheckListBox)
     EVT_CHECKLISTBOX(wxID_ANY, wxRearrangeList::OnCheck)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxRearrangeList::Create(wxWindow *parent,
                              wxWindowID id,
@@ -192,13 +192,13 @@ void wxRearrangeList::OnCheck(wxCommandEvent& event)
 // wxRearrangeCtrl implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxRearrangeCtrl, wxPanel)
+wxBEGIN_EVENT_TABLE(wxRearrangeCtrl, wxPanel)
     EVT_UPDATE_UI(wxID_UP, wxRearrangeCtrl::OnUpdateButtonUI)
     EVT_UPDATE_UI(wxID_DOWN, wxRearrangeCtrl::OnUpdateButtonUI)
 
     EVT_BUTTON(wxID_UP, wxRearrangeCtrl::OnButton)
     EVT_BUTTON(wxID_DOWN, wxRearrangeCtrl::OnButton)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxRearrangeCtrl::Init()
 {
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 062ef04147..0388132fb8 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -59,14 +59,14 @@
 // wxRTTI macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress)
-IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress)
+wxIMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress);
+wxIMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress);
 #if wxUSE_IPV6
-IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress);
 #endif
 #if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__)
-IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
+wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
 #endif
 
 // ============================================================================
diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 4b7b6cee1c..75971e4ba2 100644
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -29,7 +29,7 @@
 // wxFileProto
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol);
 IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
 
 wxFileProto::wxFileProto()
diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 9d91a900ba..14da6e7439 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -126,7 +126,7 @@ public:
 private:
     void HandleDisconnect(wxTCPConnection *connection);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTCPEventHandler);
 };
 
@@ -161,11 +161,11 @@ public:
 private:
     static wxTCPEventHandler *ms_handler;
 
-    DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)
+    wxDECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule);
     wxDECLARE_NO_COPY_CLASS(wxTCPEventHandlerModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule);
 
 wxTCPEventHandler *wxTCPEventHandlerModule::ms_handler = NULL;
 
@@ -349,9 +349,9 @@ private:
 // implementation
 // ==========================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
-IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase);
+wxIMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase);
 
 // --------------------------------------------------------------------------
 // wxTCPClient
@@ -683,10 +683,10 @@ bool wxTCPConnection::DoAdvise(const wxString& item,
 // wxTCPEventHandler (private class)
 // --------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTCPEventHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxTCPEventHandler, wxEvtHandler)
     EVT_SOCKET(_CLIENT_ONREQUEST_ID, wxTCPEventHandler::Client_OnRequest)
     EVT_SOCKET(_SERVER_ONREQUEST_ID, wxTCPEventHandler::Server_OnRequest)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxTCPEventHandler::HandleDisconnect(wxTCPConnection *connection)
 {
diff --git a/src/common/scrolbarcmn.cpp b/src/common/scrolbarcmn.cpp
index 65db8fb2de..2646be8076 100644
--- a/src/common/scrolbarcmn.cpp
+++ b/src/common/scrolbarcmn.cpp
@@ -63,7 +63,7 @@ wxBEGIN_FLAGS( wxScrollBarStyle )
     wxFLAGS_MEMBER(wxSB_VERTICAL)
 wxEND_FLAGS( wxScrollBarStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl, "wx/scrolbar.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl, "wx/scrolbar.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
     wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, \
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 2c2a4377ce..b52aa6f0b8 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -37,16 +37,16 @@
 
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxSizerItem, wxObject)
-IMPLEMENT_CLASS(wxSizer, wxObject)
-IMPLEMENT_CLASS(wxGridSizer, wxSizer)
-IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer)
-IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
+wxIMPLEMENT_CLASS(wxSizerItem, wxObject);
+wxIMPLEMENT_CLASS(wxSizer, wxObject);
+wxIMPLEMENT_CLASS(wxGridSizer, wxSizer);
+wxIMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer);
+wxIMPLEMENT_CLASS(wxBoxSizer, wxSizer);
 #if wxUSE_STATBOX
-IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
+wxIMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer);
 #endif
 #if wxUSE_BUTTON
-IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
+wxIMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer);
 #endif
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
diff --git a/src/common/slidercmn.cpp b/src/common/slidercmn.cpp
index 8da1506d72..d5ce262db3 100644
--- a/src/common/slidercmn.cpp
+++ b/src/common/slidercmn.cpp
@@ -76,7 +76,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
     wxFLAGS_MEMBER(wxSL_INVERSE)
 wxEND_FLAGS( wxSliderStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl, "wx/slider.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl, "wx/slider.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxScrollEvent )
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 2a39f71d71..24214b1859 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -122,11 +122,11 @@ wxDEFINE_EVENT(wxEVT_SOCKET, wxSocketEvent);
 // wxWin macros
 // --------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxSocketBase, wxObject)
-IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
+wxIMPLEMENT_CLASS(wxSocketBase, wxObject);
+wxIMPLEMENT_CLASS(wxSocketServer, wxSocketBase);
+wxIMPLEMENT_CLASS(wxSocketClient, wxSocketBase);
+wxIMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent);
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -2145,10 +2145,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSocketModule)
+    wxDECLARE_DYNAMIC_CLASS(wxSocketModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule);
 
 #if defined(wxUSE_SELECT_DISPATCHER) && wxUSE_SELECT_DISPATCHER
 // NOTE: we need to force linking against socketiohandler.cpp otherwise in
diff --git a/src/common/spinbtncmn.cpp b/src/common/spinbtncmn.cpp
index 9f2de77485..050b85db40 100644
--- a/src/common/spinbtncmn.cpp
+++ b/src/common/spinbtncmn.cpp
@@ -70,7 +70,7 @@ wxBEGIN_FLAGS( wxSpinButtonStyle )
     wxFLAGS_MEMBER(wxSP_WRAP)
 wxEND_FLAGS( wxSpinButtonStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbutt.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbutt.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
     wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
@@ -92,7 +92,7 @@ wxEMPTY_HANDLERS_TABLE(wxSpinButton)
 wxCONSTRUCTOR_5( wxSpinButton, wxWindow*, Parent, wxWindowID, Id, \
                  wxPoint, Position, wxSize, Size, long, WindowStyle )
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent);
 
 
 #endif // wxUSE_SPINBTN
diff --git a/src/common/spinctrlcmn.cpp b/src/common/spinctrlcmn.cpp
index 4a0596b663..87b9f64776 100644
--- a/src/common/spinctrlcmn.cpp
+++ b/src/common/spinctrlcmn.cpp
@@ -69,7 +69,7 @@ wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
 wxFLAGS_MEMBER(wxSP_WRAP)
 wxEND_FLAGS( wxSpinCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
 wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 4746f7bd94..20ad5fe020 100644
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -106,7 +106,7 @@ bool wxStatusBarPane::PopText()
 // wxStatusBarBase implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow);
 
 #include "wx/arrimpl.cpp" // This is a magic incantation which must be done!
 WX_DEFINE_EXPORTED_OBJARRAY(wxStatusBarPaneArray)
diff --git a/src/common/statbmpcmn.cpp b/src/common/statbmpcmn.cpp
index 5768c6c515..0b424c083a 100644
--- a/src/common/statbmpcmn.cpp
+++ b/src/common/statbmpcmn.cpp
@@ -64,7 +64,7 @@ wxBEGIN_FLAGS( wxStaticBitmapStyle )
 
 wxEND_FLAGS( wxStaticBitmapStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
     wxPROPERTY_FLAGS( WindowStyle, wxStaticBitmapStyle, long, \
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 5f0f05cbeb..3539c3c356 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -70,7 +70,7 @@ wxBEGIN_FLAGS( wxStaticBoxStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 wxEND_FLAGS( wxStaticBoxStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl, "wx/statbox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl, "wx/statbox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
     wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
diff --git a/src/common/statlinecmn.cpp b/src/common/statlinecmn.cpp
index ce311dfccf..e4bda36055 100644
--- a/src/common/statlinecmn.cpp
+++ b/src/common/statlinecmn.cpp
@@ -65,7 +65,7 @@ wxBEGIN_FLAGS( wxStaticLineStyle )
     wxFLAGS_MEMBER(wxLI_VERTICAL)
 wxEND_FLAGS( wxStaticLineStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl, "wx/statline.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl, "wx/statline.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
     wxPROPERTY_FLAGS( WindowStyle, wxStaticLineStyle, long, SetWindowStyleFlag, \
diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index 1e9b2bd98c..f2960c928b 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -81,7 +81,7 @@ wxFLAGS_MEMBER(wxALIGN_RIGHT)
 wxFLAGS_MEMBER(wxALIGN_CENTRE)
 wxEND_FLAGS( wxStaticTextStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl, "wx/stattext.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl, "wx/stattext.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticText)
 wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 654a352e17..97ba7588e7 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -676,7 +676,7 @@ wxFileOffset wxStreamBuffer::Tell() const
 // wxStreamBase
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxStreamBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxStreamBase, wxObject);
 
 wxStreamBase::wxStreamBase()
 {
@@ -714,7 +714,7 @@ wxFileOffset wxStreamBase::OnSysTell() const
 // wxInputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxStreamBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxStreamBase);
 
 wxInputStream::wxInputStream()
 {
@@ -1037,7 +1037,7 @@ wxFileOffset wxInputStream::TellI() const
 // wxOutputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxStreamBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxStreamBase);
 
 wxOutputStream::wxOutputStream()
 {
@@ -1121,7 +1121,7 @@ void wxOutputStream::Sync()
 // wxCountingOutputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream);
 
 wxCountingOutputStream::wxCountingOutputStream ()
 {
@@ -1186,7 +1186,7 @@ wxFileOffset wxCountingOutputStream::OnSysTell() const
 // wxFilterInputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxFilterInputStream, wxInputStream)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFilterInputStream, wxInputStream);
 
 wxFilterInputStream::wxFilterInputStream()
  :  m_parent_i_stream(NULL),
@@ -1216,7 +1216,7 @@ wxFilterInputStream::~wxFilterInputStream()
 // wxFilterOutputStream
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxFilterOutputStream, wxOutputStream)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFilterOutputStream, wxOutputStream);
 
 wxFilterOutputStream::wxFilterOutputStream()
  :  m_parent_o_stream(NULL),
@@ -1254,7 +1254,7 @@ wxFilterOutputStream::~wxFilterOutputStream()
 // wxFilterClassFactoryBase
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject);
 
 wxString wxFilterClassFactoryBase::PopExtension(const wxString& location) const
 {
@@ -1290,7 +1290,7 @@ bool wxFilterClassFactoryBase::CanHandle(const wxString& protocol,
 // wxFilterClassFactory
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase);
 
 wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL;
 
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index ef74c3d8ef..ad1cff5e23 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -85,8 +85,8 @@ static const char *USTAR_VERSION = "00";
 static const char *GNU_MAGIC     = "ustar ";
 static const char *GNU_VERION    = " ";
 
-IMPLEMENT_DYNAMIC_CLASS(wxTarEntry, wxArchiveEntry)
-IMPLEMENT_DYNAMIC_CLASS(wxTarClassFactory, wxArchiveClassFactory)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTarEntry, wxArchiveEntry);
+wxIMPLEMENT_DYNAMIC_CLASS(wxTarClassFactory, wxArchiveClassFactory);
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 54133a57df..5a8a7728d4 100644
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -41,9 +41,9 @@ wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent );
 
 
-BEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler)
     EVT_TASKBAR_CLICK(wxTaskBarIconBase::OnRightButtonDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event))
 {
diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index c4b486cc0f..a5b9192dac 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -43,8 +43,8 @@ extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar";
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
+wxEND_EVENT_TABLE()
 
 #include "wx/listimpl.cpp"
 
@@ -58,7 +58,7 @@ WX_DEFINE_LIST(wxToolBarToolsList)
 // wxToolBarToolBase
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject);
 
 wxToolBarToolBase::~wxToolBarToolBase()
 {
diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 2ee51c6fe6..baefa1c8c6 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -99,7 +99,7 @@ wxFLAGS_MEMBER(wxTE_CHARWRAP)
 wxFLAGS_MEMBER(wxTE_WORDWRAP)
 wxEND_FLAGS( wxTextCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
 wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
@@ -122,14 +122,14 @@ wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \
                 long, WindowStyle)
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_TEXT, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_TEXT_ENTER, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_TEXT_URL, wxTextUrlEvent );
 wxDEFINE_EVENT( wxEVT_TEXT_MAXLEN, wxCommandEvent );
 
-IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl);
 
 // ============================================================================
 // wxTextAttr implementation
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index f117f9aaf0..79104c1acb 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -38,7 +38,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent);
 
 wxDEFINE_EVENT(wxEVT_TIMER, wxTimerEvent);
 
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index ef693690c5..0bdbe8ad3c 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -35,16 +35,16 @@
 // event table
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
+wxBEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
     EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
     EVT_SIZE(wxTopLevelWindowBase::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow);
 
 // ----------------------------------------------------------------------------
 // construction/destruction
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index c3e3aa2462..fde7cdc585 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -2041,8 +2041,8 @@ wxArrayString wxResourceTranslationsLoader::GetAvailableTranslations(const wxStr
 
 class wxTranslationsModule: public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxTranslationsModule)
-    public:
+    wxDECLARE_DYNAMIC_CLASS(wxTranslationsModule);
+public:
         wxTranslationsModule() {}
 
         bool OnInit() wxOVERRIDE
@@ -2059,6 +2059,6 @@ class wxTranslationsModule: public wxModule
         }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule);
 
 #endif // wxUSE_INTL
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 7ca9427e7b..b2cfd7960a 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -107,7 +107,7 @@ wxFLAGS_MEMBER(wxTR_EXTENDED)
 wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
 wxEND_FLAGS( wxTreeCtrlStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
 wxEVENT_PROPERTY( TextUpdated, wxEVT_TEXT, wxCommandEvent )
@@ -128,7 +128,7 @@ wxCONSTRUCTOR_5( wxTreeCtrl, wxWindow*, Parent, wxWindowID, Id, \
 // Tree event
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent);
 
 wxTreeEvent::wxTreeEvent(wxEventType commandType,
                          wxTreeCtrlBase *tree,
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index d6279eed2b..c237c1dd6a 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -34,7 +34,7 @@
 // definitions
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxURI, wxObject)
+wxIMPLEMENT_CLASS(wxURI, wxObject);
 
 // ===========================================================================
 // wxURI implementation
diff --git a/src/common/url.cpp b/src/common/url.cpp
index a914001dc8..9bea231c5b 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <ctype.h>
 
-IMPLEMENT_CLASS(wxURL, wxURI)
+wxIMPLEMENT_CLASS(wxURL, wxURI);
 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
@@ -454,10 +454,10 @@ public:
     virtual void OnExit() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxURLModule)
+    wxDECLARE_DYNAMIC_CLASS(wxURLModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule);
 
 wxURLModule::wxURLModule()
 {
diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 19c26df510..3f09530cd8 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -49,7 +49,7 @@
 
 #include "wx/valgen.h"
 
-IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
+wxIMPLEMENT_CLASS(wxGenericValidator, wxValidator);
 
 wxGenericValidator::wxGenericValidator(bool *val)
 {
diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index 306cac028d..bfe7f66287 100644
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -25,7 +25,7 @@
 
 const wxValidator wxDefaultValidator;
 
-IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler);
 
 // VZ: personally, I think true would be more appropriate - these bells are
 //     _annoying_
diff --git a/src/common/valnum.cpp b/src/common/valnum.cpp
index 4b12bbf531..bb483502a6 100644
--- a/src/common/valnum.cpp
+++ b/src/common/valnum.cpp
@@ -36,10 +36,10 @@
 // wxNumValidatorBase implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxNumValidatorBase, wxValidator)
+wxBEGIN_EVENT_TABLE(wxNumValidatorBase, wxValidator)
     EVT_CHAR(wxNumValidatorBase::OnChar)
     EVT_KILL_FOCUS(wxNumValidatorBase::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 int wxNumValidatorBase::GetFormatFlags() const
 {
diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 70bf904009..04f85840e2 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -56,10 +56,10 @@ static bool wxIsNumeric(const wxString& val)
 // wxTextValidator
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
-BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator);
+wxBEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
     EVT_CHAR(wxTextValidator::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTextValidator::wxTextValidator(long style, wxString *val)
 {
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index a12f1db709..a8693207dd 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -53,7 +53,7 @@ WX_DEFINE_LIST(wxVariantList)
  * wxVariant
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject);
 
 wxVariant::wxVariant()
     : wxObject()
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 6b22314729..d00f11c1e1 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -108,13 +108,13 @@ static const int BASELINE_DPI = 96;
 // ----------------------------------------------------------------------------
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler);
 
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
     EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
     EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
@@ -124,7 +124,7 @@ BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
 #endif // wxUSE_HELP
 
     EVT_SIZE(wxWindowBase::InternalOnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation of the common functionality of the wxWindow class
@@ -257,7 +257,7 @@ wxCONSTRUCTOR_DUMMY(wxWindow)
 #else
 
 #ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase);
 #endif
 
 #endif
diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp
index e1b112bed5..a726f26065 100644
--- a/src/common/wrapsizer.cpp
+++ b/src/common/wrapsizer.cpp
@@ -67,7 +67,7 @@ private:
 // wxWrapSizer implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer);
 
 wxWrapSizer::wxWrapSizer(int orient, int flags)
            : wxBoxSizer(orient),
diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index 4cbbb69422..ae58f3de56 100644
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -57,10 +57,10 @@ public:
     virtual bool OnInit() wxOVERRIDE { return true; }
     virtual void OnExit() wxOVERRIDE { wxDELETE(gs_cLocale); }
 
-    DECLARE_DYNAMIC_CLASS(wxXLocaleModule)
+    wxDECLARE_DYNAMIC_CLASS(wxXLocaleModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxXLocaleModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXLocaleModule, wxModule);
 
 
 // ============================================================================
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 4b952f4fd5..abc8f5051a 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -73,8 +73,8 @@ enum {
     SUMS_OFFSET  = 14
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
-IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
+wxIMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry);
+wxIMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory);
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index e10e3d774e..bf4c53cf3d 100644
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -63,7 +63,7 @@ wxVersionInfo wxGetZlibVersionInfo()
 /////////////////////////////////////////////////////////////////////////////
 // Zlib Class factory
 
-IMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory)
+wxIMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory);
 
 static wxZlibClassFactory g_wxZlibClassFactory;
 
@@ -91,7 +91,7 @@ wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const
 /////////////////////////////////////////////////////////////////////////////
 // Gzip Class factory
 
-IMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory);
 
 static wxGzipClassFactory g_wxGzipClassFactory;
 
diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index b21cc57f51..c1d4f134a0 100644
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -25,7 +25,7 @@
 // wxApp initialization
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 
 wxApp::wxApp()
 {
diff --git a/src/dfb/bitmap.cpp b/src/dfb/bitmap.cpp
index 097064bdca..7a5d75beb3 100644
--- a/src/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -391,7 +391,7 @@ public:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxBitmapBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxBitmapBase);
 
 bool wxBitmap::Create(const wxIDirectFBSurfacePtr& surface)
 {
diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index 7cb0df8735..d8ffb6c5a3 100644
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -61,7 +61,7 @@ public:
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject);
 
 wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
 {
diff --git a/src/dfb/cursor.cpp b/src/dfb/cursor.cpp
index 96e25b4c2d..b7661f43f4 100644
--- a/src/dfb/cursor.cpp
+++ b/src/dfb/cursor.cpp
@@ -49,7 +49,7 @@ public:
 // wxCursor
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject);
 
 void wxCursor::InitFromStock(wxStockCursor cursorId)
 {
diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 429c7b7a4b..a8458e58ea 100644
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -43,7 +43,7 @@
 // wxDFBDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDFBDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDFBDCImpl, wxDCImpl);
 
 void wxDFBDCImpl::DFBInit(const wxIDirectFBSurfacePtr& surface)
 {
diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp
index c5b89fbfc2..a2c934d6cc 100644
--- a/src/dfb/dcclient.cpp
+++ b/src/dfb/dcclient.cpp
@@ -94,7 +94,7 @@ wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
 // wxWindowDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDFBDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDFBDCImpl);
 
 wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *win)
               : wxDFBDCImpl(owner)
@@ -229,7 +229,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
 // wxClientDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
               : wxWindowDCImpl(owner, win)
@@ -244,4 +244,4 @@ wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl);
diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index 9be66d9460..546549e693 100644
--- a/src/dfb/dcmemory.cpp
+++ b/src/dfb/dcmemory.cpp
@@ -36,7 +36,7 @@
 
 #warning "FIXME: verify/fix that wxMemoryDCImpl works correctly with mono bitmaps"
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxDFBDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxDFBDCImpl);
 
 void wxMemoryDCImpl::Init()
 {
diff --git a/src/dfb/dcscreen.cpp b/src/dfb/dcscreen.cpp
index ddf5c26669..21c8510c1b 100644
--- a/src/dfb/dcscreen.cpp
+++ b/src/dfb/dcscreen.cpp
@@ -58,7 +58,7 @@
 //        The surface, as obtained from GetPrimarySurface(), is double-buffered
 //        for the sole purpose of silencing the warning from 3) above.
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxDFBDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxDFBDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner)
               : wxDFBDCImpl(owner)
diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index b714d2c8fd..e36ed6dde0 100644
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -58,7 +58,7 @@ public:
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)
 {
diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index 0d7f6e34cc..b9dcf2dfe4 100644
--- a/src/dfb/region.cpp
+++ b/src/dfb/region.cpp
@@ -16,8 +16,8 @@
 
 #include "wx/region.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData
diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp
index 8b8c84ef68..a4e31a4e9b 100644
--- a/src/dfb/window.cpp
+++ b/src/dfb/window.cpp
@@ -66,10 +66,10 @@ WX_DEFINE_ARRAY_PTR(wxOverlayImpl*, wxDfbOverlaysList);
 // ---------------------------------------------------------------------------
 
 // in wxUniv this class is abstract because it doesn't have DoPopupMenu()
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDFB, wxWindowBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDFB, wxWindowBase);
 
-BEGIN_EVENT_TABLE(wxWindowDFB, wxWindowBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxWindowDFB, wxWindowBase)
+wxEND_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------
 // global functions
diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index e540ec9c03..10288b59cf 100644
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -78,7 +78,7 @@ public:
 // wxAcceleratorTable ctors
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject);
 
 wxAcceleratorTable::wxAcceleratorTable()
 {
diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index c833d34ee1..1d95134114 100644
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -40,7 +40,7 @@ wxAnimationDecoderList wxAnimation::sm_handlers;
 // wxAnimation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase);
 #define M_ANIMDATA      static_cast<wxAnimationDecoder*>(m_refData)
 
 wxSize wxAnimation::GetSize() const
@@ -250,26 +250,26 @@ void wxAnimation::CleanUpHandlers()
 
 class wxAnimationModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxAnimationModule)
+    wxDECLARE_DYNAMIC_CLASS(wxAnimationModule);
 public:
     wxAnimationModule() {}
     bool OnInit() wxOVERRIDE { wxAnimation::InitStandardHandlers(); return true; }
     void OnExit() wxOVERRIDE { wxAnimation::CleanUpHandlers(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule);
 
 
 // ----------------------------------------------------------------------------
 // wxAnimationCtrl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxAnimationCtrl, wxAnimationCtrlBase)
-BEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase)
+wxIMPLEMENT_CLASS(wxAnimationCtrl, wxAnimationCtrlBase);
+wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase)
     EVT_PAINT(wxAnimationCtrl::OnPaint)
     EVT_SIZE(wxAnimationCtrl::OnSize)
     EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxAnimationCtrl::Init()
 {
diff --git a/src/generic/bannerwindow.cpp b/src/generic/bannerwindow.cpp
index f5452cd886..15c2719b67 100644
--- a/src/generic/bannerwindow.cpp
+++ b/src/generic/bannerwindow.cpp
@@ -36,10 +36,10 @@ const int MARGIN_Y = 5;
 
 const char wxBannerWindowNameStr[] = "bannerwindow";
 
-BEGIN_EVENT_TABLE(wxBannerWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxBannerWindow, wxWindow)
     EVT_SIZE(wxBannerWindow::OnSize)
     EVT_PAINT(wxBannerWindow::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxBannerWindow::Init()
 {
diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp
index 9a948eed8c..4c48db8922 100644
--- a/src/generic/bmpcboxg.cpp
+++ b/src/generic/bmpcboxg.cpp
@@ -49,12 +49,12 @@
 // ============================================================================
 
 
-BEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox)
+wxBEGIN_EVENT_TABLE(wxBitmapComboBox, wxOwnerDrawnComboBox)
     EVT_SIZE(wxBitmapComboBox::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxOwnerDrawnComboBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxOwnerDrawnComboBox);
 
 void wxBitmapComboBox::Init()
 {
diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index a2529b0091..c67ddd4d16 100644
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -95,13 +95,13 @@ private:
 // wxButtonToolBar implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxButtonToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxButtonToolBar, wxControl);
 
-BEGIN_EVENT_TABLE(wxButtonToolBar, wxControl)
+wxBEGIN_EVENT_TABLE(wxButtonToolBar, wxControl)
     EVT_BUTTON(wxID_ANY, wxButtonToolBar::OnCommand)
     EVT_PAINT(wxButtonToolBar::OnPaint)
     EVT_LEFT_UP(wxButtonToolBar::OnLeftUp)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxButtonToolBar creation
diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp
index 352f867412..cbe6a0501b 100644
--- a/src/generic/calctrlg.cpp
+++ b/src/generic/calctrlg.cpp
@@ -48,11 +48,11 @@
 
 #ifdef wxHAS_NATIVE_CALENDARCTRL
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl,"wx/calctrl.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl, "wx/calctrl.h");
 
 #endif
 
-BEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
     EVT_PAINT(wxGenericCalendarCtrl::OnPaint)
 
     EVT_CHAR(wxGenericCalendarCtrl::OnChar)
@@ -61,7 +61,7 @@ BEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
     EVT_LEFT_DCLICK(wxGenericCalendarCtrl::OnDClick)
 
     EVT_SYS_COLOUR_CHANGED(wxGenericCalendarCtrl::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index a5c34cb0da..06dfcd5140 100644
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -39,14 +39,14 @@
 // event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase);
 
 wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
-BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
     EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxChoicebook implementation
diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 9b9cb923e0..dd72ed89a4 100644
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -410,7 +410,7 @@ wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, lon
 // wxSingleChoiceDialog
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
 #ifndef __SMARTPHONE__
     EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
@@ -418,9 +418,9 @@ BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
 #ifdef __WXWINCE__
     EVT_JOY_BUTTON_DOWN(wxSingleChoiceDialog::OnJoystickButtonDown)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog);
 
 bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
@@ -504,7 +504,7 @@ void wxSingleChoiceDialog::DoChoice()
 // wxMultiChoiceDialog
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog);
 
 bool wxMultiChoiceDialog::Create( wxWindow *parent,
                                   const wxString& message,
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index b76115f04a..e7df508057 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -35,7 +35,7 @@
 // ============================================================================
 
 wxColourData wxGenericColourButton::ms_data;
-IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxBitmapButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxBitmapButton);
 
 // ----------------------------------------------------------------------------
 // wxGenericColourButton
diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 1dc4e47e6e..b3b7bcf297 100644
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -50,13 +50,13 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 //-----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
-IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent);
 
-BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
+wxBEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGenericCollapsiblePane::Init()
 {
diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 5cd6446955..2d1d5449c7 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -37,9 +37,9 @@
 #include "wx/colourdata.h"
 #include "wx/generic/colrdlgg.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
     EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
 #if wxUSE_SLIDER
     EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
@@ -49,7 +49,7 @@ BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
     EVT_PAINT(wxGenericColourDialog::OnPaint)
     EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
     EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 /*
diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index e4453c4cbe..0e79b2cdf7 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -94,13 +94,13 @@
 // wxGenericComboCtrl
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericComboCtrl, wxComboCtrlBase)
+wxBEGIN_EVENT_TABLE(wxGenericComboCtrl, wxComboCtrlBase)
     EVT_PAINT(wxGenericComboCtrl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxGenericComboCtrl::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericComboCtrl, wxComboCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericComboCtrl, wxComboCtrlBase);
 
 void wxGenericComboCtrl::Init()
 {
@@ -491,7 +491,7 @@ bool wxGenericComboCtrl::PerformAction(const wxControlAction& action,
 // If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 #ifndef _WX_COMBOCONTROL_H_
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboCtrl);
 #endif
 
 #endif // !wxCOMBOCONTROL_FULLY_FEATURED
diff --git a/src/generic/commandlinkbuttong.cpp b/src/generic/commandlinkbuttong.cpp
index 8a8d001c2e..1a995349cd 100644
--- a/src/generic/commandlinkbuttong.cpp
+++ b/src/generic/commandlinkbuttong.cpp
@@ -23,7 +23,7 @@
 #include "wx/commandlinkbutton.h"
 #include "wx/artprov.h"
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h");
 
 wxDEFINE_FLAGS( wxCommandLinkButtonStyle )
 wxBEGIN_FLAGS( wxCommandLinkButtonStyle )
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index eaf519d80d..6eccb3fff4 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -375,11 +375,11 @@ private:
                         event.GetNewOrder());
     }
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow);
 };
 
-BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
+wxBEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick)
 
@@ -387,7 +387,7 @@ BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl)
     EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize)
 
     EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------
 // wxDataViewRenameTimer
@@ -919,8 +919,8 @@ private:
     wxDataViewRenderer* m_editorRenderer;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxDataViewMainWindow);
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ---------------------------------------------------------
@@ -953,7 +953,7 @@ public:
 // wxDataViewRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase);
 
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype,
                                         wxDataViewCellMode mode,
@@ -999,7 +999,7 @@ int wxDataViewRenderer::GetAlignment() const
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer);
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
@@ -1011,7 +1011,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer);
 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
                                                 wxDataViewCellMode mode, int align ) :
@@ -1067,7 +1067,7 @@ wxSize wxDataViewTextRenderer::GetSize() const
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer);
 
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :
@@ -1114,7 +1114,7 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer);
 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode, int align ) :
@@ -1190,7 +1190,7 @@ wxSize wxDataViewToggleRenderer::GetSize() const
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer);
 
 wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode, int align ) :
@@ -1242,7 +1242,7 @@ wxSize wxDataViewProgressRenderer::GetSize() const
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer);
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
 const wxString &varianttype, wxDataViewCellMode mode, int align ) :
@@ -1477,16 +1477,16 @@ void wxDataViewRenameTimer::Notify()
 static void BuildTreeHelper( const wxDataViewModel * model,  const wxDataViewItem & item,
                              wxDataViewTreeNode * node);
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow);
 
-BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
+wxBEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow)
     EVT_PAINT         (wxDataViewMainWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxDataViewMainWindow::OnMouse)
     EVT_SET_FOCUS     (wxDataViewMainWindow::OnSetFocus)
     EVT_KILL_FOCUS    (wxDataViewMainWindow::OnKillFocus)
     EVT_CHAR_HOOK     (wxDataViewMainWindow::OnCharHook)
     EVT_CHAR          (wxDataViewMainWindow::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id,
     const wxPoint &pos, const wxSize &size, const wxString &name ) :
@@ -4553,10 +4553,10 @@ void wxDataViewMainWindow::UpdateColumnSizes()
 
 WX_DEFINE_LIST(wxDataViewColumnList)
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
-BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase);
+wxBEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
     EVT_SIZE(wxDataViewCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 320c7929d4..8b1f51c896 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -279,30 +279,30 @@ private:
     wxSize          m_useSize;
     wxString        m_format;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-BEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
+wxBEGIN_EVENT_TABLE(wxCalendarComboPopup, wxCalendarCtrl)
     EVT_KEY_DOWN(wxCalendarComboPopup::OnCalKey)
     EVT_CALENDAR_SEL_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
     EVT_CALENDAR_PAGE_CHANGED(wxID_ANY, wxCalendarComboPopup::OnSelChange)
     EVT_CALENDAR(wxID_ANY, wxCalendarComboPopup::OnSelChange)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 // ============================================================================
 // wxDatePickerCtrlGeneric implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
+wxBEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
     EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
     EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)
     EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL
-    IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl);
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index 7e8c3773d3..30f72a3a07 100644
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -141,17 +141,17 @@ private:
     void OnBrowse(wxCommandEvent& event);
 #endif // wxUSE_FILEDLG
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxDumpOpenExternalDlg);
 };
 
-BEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog)
+wxBEGIN_EVENT_TABLE(wxDumpOpenExternalDlg, wxDialog)
 
 #if wxUSE_FILEDLG
     EVT_BUTTON(wxID_MORE, wxDumpOpenExternalDlg::OnBrowse)
 #endif
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxDumpOpenExternalDlg::wxDumpOpenExternalDlg(wxWindow *parent,
@@ -275,7 +275,7 @@ private:
 
     wxArrayString m_files;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxDebugReportDialog);
 };
 
@@ -283,12 +283,12 @@ private:
 // wxDebugReportDialog implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxDebugReportDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxDebugReportDialog, wxDialog)
     EVT_BUTTON(wxID_VIEW_DETAILS, wxDebugReportDialog::OnView)
     EVT_UPDATE_UI(wxID_VIEW_DETAILS, wxDebugReportDialog::OnViewUpdate)
     EVT_BUTTON(wxID_OPEN, wxDebugReportDialog::OnOpen)
     EVT_UPDATE_UI(wxID_OPEN, wxDebugReportDialog::OnViewUpdate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 1c3de08114..32b6830eca 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -235,7 +235,7 @@ static const char wxPostScriptHeaderReencodeISO2[] =
 //-------------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC);
 
 wxPostScriptDC::wxPostScriptDC()
               : wxDC(new wxPostScriptDCImpl(this))
@@ -258,7 +258,7 @@ static const double DEV2PS = 72.0 / 600.0;
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl);
 
 //-------------------------------------------------------------------------------
 
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 0f356fba00..de483960a3 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -363,7 +363,7 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
   EVT_TREE_BEGIN_LABEL_EDIT   (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem)
@@ -371,7 +371,7 @@ BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_SEL_CHANGED        (wxID_TREECTRL, wxGenericDirCtrl::OnTreeSelChange)
   EVT_TREE_ITEM_ACTIVATED     (wxID_TREECTRL, wxGenericDirCtrl::OnItemActivated)
   EVT_SIZE                    (wxGenericDirCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGenericDirCtrl::wxGenericDirCtrl(void)
 {
@@ -1286,11 +1286,11 @@ wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent,
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice)
+wxIMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice);
 
-BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
+wxBEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
     EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
                                  const wxWindowID treeid,
@@ -1447,7 +1447,7 @@ wxFileIconsTable* wxTheFileIconsTable = NULL;
 
 class wxFileIconsTableModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFileIconsTableModule);
 public:
     wxFileIconsTableModule() {}
     bool OnInit() wxOVERRIDE { wxTheFileIconsTable = new wxFileIconsTable; return true; }
@@ -1457,7 +1457,7 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule);
 
 class wxFileIconEntry : public wxObject
 {
diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 80ddf5ca5e..40a92ef814 100644
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -48,9 +48,9 @@ static const int ID_GO_HOME = 1006;
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
     EVT_CLOSE                (wxGenericDirDialog::OnCloseWindow)
     EVT_BUTTON               (wxID_OK,        wxGenericDirDialog::OnOK)
     EVT_BUTTON               (ID_NEW,         wxGenericDirDialog::OnNew)
@@ -59,7 +59,7 @@ BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
     EVT_TREE_SEL_CHANGED     (wxID_ANY,       wxGenericDirDialog::OnTreeSelected)
     EVT_TEXT_ENTER           (ID_TEXTCTRL,    wxGenericDirDialog::OnOK)
     EVT_CHECKBOX             (ID_SHOW_HIDDEN, wxGenericDirDialog::OnShowHidden)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
                                        const wxString& defaultPath, long style,
diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index 2a18deb1b0..270717a63b 100644
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -46,7 +46,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDragImage, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDragImage, wxObject);
 
 // ============================================================================
 // implementation
diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index a236e62f59..bf54142507 100644
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -176,7 +176,7 @@ public:
     }
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void OnSize(wxSizeEvent& event)
     {
         SizeColumns();
@@ -184,16 +184,16 @@ private:
     }
 };
 
-BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
+wxBEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
    EVT_SIZE(CleverListCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 // ----------------------------------------------------------------------------
 // wxEditableListBox
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
+wxIMPLEMENT_CLASS(wxEditableListBox, wxPanel);
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
 //     they could cause XRCCTRL() failures in XRC-based dialogs
@@ -204,7 +204,7 @@ const wxWindowIDRef wxID_ELB_UP = wxWindow::NewControlId();
 const wxWindowIDRef wxID_ELB_DOWN = wxWindow::NewControlId();
 const wxWindowIDRef wxID_ELB_LISTCTRL = wxWindow::NewControlId();
 
-BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
+wxBEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
     EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit)
     EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem)
@@ -212,7 +212,7 @@ BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem)
     EVT_BUTTON(wxID_ELB_EDIT, wxEditableListBox::OnEditItem)
     EVT_BUTTON(wxID_ELB_DELETE, wxEditableListBox::OnDelItem)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id,
                           const wxString& label,
diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index af1ebb03ef..c1eed43257 100644
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -49,9 +49,9 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFindReplaceDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFindReplaceDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxGenericFindReplaceDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericFindReplaceDialog, wxDialog)
     EVT_BUTTON(wxID_FIND, wxGenericFindReplaceDialog::OnFind)
     EVT_BUTTON(wxID_REPLACE, wxGenericFindReplaceDialog::OnReplace)
     EVT_BUTTON(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnReplaceAll)
@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(wxGenericFindReplaceDialog, wxDialog)
     EVT_UPDATE_UI(wxID_REPLACE_ALL, wxGenericFindReplaceDialog::OnUpdateFindUI)
 
     EVT_CLOSE(wxGenericFindReplaceDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxGenericFindReplaceDialog
diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index adc3be4d96..d9ee5a7d5d 100644
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -393,14 +393,14 @@ void wxFileData::MakeItem( wxListItem &item )
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl);
 
-BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
+wxBEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileListCtrl::OnListDeleteItem)
     EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileListCtrl::OnListDeleteAllItems)
     EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileListCtrl::OnListEndLabelEdit)
     EVT_LIST_COL_CLICK(wxID_ANY, wxFileListCtrl::OnListColClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxFileListCtrl::wxFileListCtrl()
@@ -889,16 +889,16 @@ wxFileListCtrl::~wxFileListCtrl()
 // wxGenericFileCtrl implementation
 ///////////////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
+wxIMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> );
 
-BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
+wxBEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
     EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
     EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
     EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
     EVT_TEXT_ENTER( ID_TEXT, wxGenericFileCtrl::OnTextEnter )
     EVT_TEXT( ID_TEXT, wxGenericFileCtrl::OnTextChange )
     EVT_CHECKBOX( ID_CHECK, wxGenericFileCtrl::OnCheck )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxGenericFileCtrl::Create( wxWindow *parent,
                                 wxWindowID id,
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5c2e65da86..78014be3f2 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -97,9 +97,9 @@
 #define  ID_NEW_DIR       (wxID_FILEDLGG + 4)
 #define  ID_FILE_CTRL     (wxID_FILEDLGG + 5)
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase);
 
-BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
     EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList)
     EVT_BUTTON(ID_REPORT_MODE, wxGenericFileDialog::OnReport)
     EVT_BUTTON(ID_UP_DIR, wxGenericFileDialog::OnUp)
@@ -112,7 +112,7 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
 #if defined(__DOS__) || defined(__WINDOWS__)
     EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
 #endif // defined(__DOS__) || defined(__WINDOWS__)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 bool wxGenericFileDialog::ms_lastShowHidden = false;
@@ -417,7 +417,7 @@ void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event)
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 
 #endif // wxHAS_GENERIC_FILEDIALOG
 
diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index 225da729d2..20f6f77e82 100644
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -35,8 +35,8 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton)
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFileButton, wxButton);
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton);
 
 // ----------------------------------------------------------------------------
 // wxGenericFileButton
diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index d7b2aed416..4908035680 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -57,12 +57,12 @@ public:
 
 private:
     void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxFontPreviewer, wxWindow)
+wxBEGIN_EVENT_TABLE(wxFontPreviewer, wxWindow)
     EVT_PAINT(wxFontPreviewer::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
@@ -184,9 +184,9 @@ static wxFontWeight wxFontWeightStringToInt(const wxString& weight)
 // wxGenericFontDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
     EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
@@ -199,7 +199,7 @@ BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
     EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
 #endif
     EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 #define NUM_COLS 48
diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp
index 3636c82598..6c74756fd8 100644
--- a/src/generic/fontpickerg.cpp
+++ b/src/generic/fontpickerg.cpp
@@ -34,7 +34,7 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFontButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericFontButton, wxButton);
 
 // ----------------------------------------------------------------------------
 // wxGenericFontButton
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 19722f23de..bafb4af36e 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -2476,14 +2476,14 @@ public :
     virtual wxString GetName() const wxOVERRIDE;
     virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer);
 } ;
 
 //-----------------------------------------------------------------------------
 // wxCairoRenderer implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer);
 
 static wxCairoRenderer gs_cairoGraphicsRenderer;
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a49ed0836a..b271878957 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -166,15 +166,15 @@ namespace
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGridCellEditorEvtHandler, wxEvtHandler);
 
-BEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
+wxBEGIN_EVENT_TABLE( wxGridCellEditorEvtHandler, wxEvtHandler )
     EVT_KILL_FOCUS( wxGridCellEditorEvtHandler::OnKillFocus )
     EVT_KEY_DOWN( wxGridCellEditorEvtHandler::OnKeyDown )
     EVT_CHAR( wxGridCellEditorEvtHandler::OnChar )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
+wxBEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
     EVT_HEADER_CLICK(wxID_ANY, wxGridHeaderCtrl::OnClick)
     EVT_HEADER_DCLICK(wxID_ANY, wxGridHeaderCtrl::OnDoubleClick)
     EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxGridHeaderCtrl::OnRightClick)
@@ -185,7 +185,7 @@ BEGIN_EVENT_TABLE(wxGridHeaderCtrl, wxHeaderCtrl)
 
     EVT_HEADER_BEGIN_REORDER(wxID_ANY, wxGridHeaderCtrl::OnBeginReorder)
     EVT_HEADER_END_REORDER(wxID_ANY, wxGridHeaderCtrl::OnEndReorder)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGridOperations& wxGridRowOperations::Dual() const
 {
@@ -997,7 +997,7 @@ const wxGridCornerHeaderRenderer& wxGridCellAttrProvider::GetCornerRenderer()
 // wxGridTableBase
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS( wxGridTableBase, wxObject )
+wxIMPLEMENT_ABSTRACT_CLASS(wxGridTableBase, wxObject);
 
 wxGridTableBase::wxGridTableBase()
 {
@@ -1254,7 +1254,7 @@ wxGridTableMessage::wxGridTableMessage( wxGridTableBase *table, int id,
 
 WX_DEFINE_OBJARRAY(wxGridStringArray)
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridStringTable, wxGridTableBase )
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridStringTable, wxGridTableBase);
 
 wxGridStringTable::wxGridStringTable()
         : wxGridTableBase()
@@ -1602,20 +1602,20 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
     EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
 {
     m_owner->CancelMouseCapture();
 }
 
-BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
+wxBEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
     EVT_PAINT( wxGridRowLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGridRowLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
@@ -1649,11 +1649,11 @@ void wxGridRowLabelWindow::OnMouseWheel( wxMouseEvent& event )
 
 //////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
+wxBEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
     EVT_PAINT( wxGridColLabelWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
@@ -1687,11 +1687,11 @@ void wxGridColLabelWindow::OnMouseWheel( wxMouseEvent& event )
 
 //////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
+wxBEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
     EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
     EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGridCornerLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
@@ -1713,7 +1713,7 @@ void wxGridCornerLabelWindow::OnMouseWheel( wxMouseEvent& event )
 
 //////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
+wxBEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
     EVT_PAINT( wxGridWindow::OnPaint )
     EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
     EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
@@ -1723,7 +1723,7 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
     EVT_SET_FOCUS( wxGridWindow::OnFocus )
     EVT_KILL_FOCUS( wxGridWindow::OnFocus )
     EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
@@ -2115,7 +2115,7 @@ void wxGridWindow::OnFocus(wxFocusEvent& event)
 
 /////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
+wxBEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_PAINT( wxGrid::OnPaint )
     EVT_SIZE( wxGrid::OnSize )
     EVT_KEY_DOWN( wxGrid::OnKeyDown )
@@ -2123,7 +2123,7 @@ BEGIN_EVENT_TABLE( wxGrid, wxScrolledWindow )
     EVT_CHAR ( wxGrid::OnChar )
     EVT_ERASE_BACKGROUND( wxGrid::OnEraseBackground )
     EVT_COMMAND(wxID_ANY, wxEVT_GRID_HIDE_EDITOR, wxGrid::OnHideEditor )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxGrid::Create(wxWindow *parent, wxWindowID id,
                           const wxPoint& pos, const wxSize& size,
@@ -9113,7 +9113,7 @@ void wxGrid::SetDropTarget(wxDropTarget *dropTarget)
 // grid event classes
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridEvent, wxNotifyEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridEvent, wxNotifyEvent);
 
 wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
                           int row, int col, int x, int y, bool sel,
@@ -9126,7 +9126,7 @@ wxGridEvent::wxGridEvent( int id, wxEventType type, wxObject* obj,
     SetEventObject(obj);
 }
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridSizeEvent, wxNotifyEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridSizeEvent, wxNotifyEvent);
 
 wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
                                   int rowOrCol, int x, int y,
@@ -9140,7 +9140,7 @@ wxGridSizeEvent::wxGridSizeEvent( int id, wxEventType type, wxObject* obj,
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxGridRangeSelectEvent, wxNotifyEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridRangeSelectEvent, wxNotifyEvent);
 
 wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,
                                                const wxGridCellCoords& topLeft,
@@ -9156,7 +9156,7 @@ wxGridRangeSelectEvent::wxGridRangeSelectEvent(int id, wxEventType type, wxObjec
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridEditorCreatedEvent, wxCommandEvent);
 
 wxGridEditorCreatedEvent::wxGridEditorCreatedEvent(int id, wxEventType type,
                                                    wxObject* obj, int row,
diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 6dcccfdce8..cc720c8617 100644
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -465,7 +465,7 @@ void wxHeaderCtrl::DoMoveCol(unsigned int idx, unsigned int pos)
 // wxHeaderCtrl event handlers
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxHeaderCtrl, wxHeaderCtrlBase)
+wxBEGIN_EVENT_TABLE(wxHeaderCtrl, wxHeaderCtrlBase)
     EVT_PAINT(wxHeaderCtrl::OnPaint)
 
     EVT_MOUSE_EVENTS(wxHeaderCtrl::OnMouse)
@@ -473,7 +473,7 @@ BEGIN_EVENT_TABLE(wxHeaderCtrl, wxHeaderCtrlBase)
     EVT_MOUSE_CAPTURE_LOST(wxHeaderCtrl::OnCaptureLost)
 
     EVT_KEY_DOWN(wxHeaderCtrl::OnKeyDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index b39aed8e69..59931d9516 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -62,7 +62,7 @@
 // Is browser a netscape browser?
 #define WXEXTHELP_ENVVAR_BROWSERISNETSCAPE  wxT("WX_HELPBROWSER_NS")
 
-IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)
+wxIMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase);
 
 wxExtHelpController::wxExtHelpController(wxWindow* parentWindow)
                    : wxHelpControllerBase(parentWindow)
diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index 48b8b511cf..be91056881 100644
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -196,17 +196,17 @@ private:
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxHtmlListBox, wxVListBox)
+wxBEGIN_EVENT_TABLE(wxHtmlListBox, wxVListBox)
     EVT_SIZE(wxHtmlListBox::OnSize)
     EVT_MOTION(wxHtmlListBox::OnMouseMove)
     EVT_LEFT_DOWN(wxHtmlListBox::OnLeftDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlListBox, wxVListBox)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlListBox, wxVListBox);
 
 
 // ----------------------------------------------------------------------------
@@ -598,7 +598,7 @@ void wxHtmlListBox::OnLeftDown(wxMouseEvent& event)
 // wxSimpleHtmlListBox
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxSimpleHtmlListBox, wxHtmlListBox)
+wxIMPLEMENT_ABSTRACT_CLASS(wxSimpleHtmlListBox, wxHtmlListBox);
 
 
 bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp
index eb8485955d..1d0bb412d7 100644
--- a/src/generic/hyperlinkg.cpp
+++ b/src/generic/hyperlinkg.cpp
@@ -83,7 +83,7 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
 
     // connect our event handlers:
     // NOTE: since this class is the base class of the GTK+'s native implementation
-    //       of wxHyperlinkCtrl, we cannot use the static macros in BEGIN/END_EVENT_TABLE
+    //       of wxHyperlinkCtrl, we cannot use the static macros in wxBEGIN/wxEND_EVENT_TABLE
     //       blocks, otherwise the GTK+'s native impl of wxHyperlinkCtrl would not
     //       behave correctly (as we intercept events doing things which interfere
     //       with GTK+'s native handling):
diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp
index ffe0335ad0..53b1c80fee 100644
--- a/src/generic/icon.cpp
+++ b/src/generic/icon.cpp
@@ -21,7 +21,7 @@
 // wxIcon
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
 
 wxIcon::wxIcon(const char* const* bits) :
     wxBitmap( bits )
diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 52f294e699..14c8127a80 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -27,8 +27,8 @@
 //  wxImageList
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList);
 
 wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
 {
diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp
index 0d49b8d218..2ca258faf9 100644
--- a/src/generic/infobar.cpp
+++ b/src/generic/infobar.cpp
@@ -39,9 +39,9 @@
 #include "wx/artprov.h"
 #include "wx/scopeguard.h"
 
-BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
+wxBEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
     EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 5cb58f3f6a..b77f26bb5b 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -26,8 +26,8 @@
 #include "wx/mdi.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent);
+wxIMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent);
 
 wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent );
 wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent );
@@ -38,11 +38,11 @@ wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent );
 // ----------------------------------------------------------------------------
 
 #if wxUSE_SASH
-IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
-BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
+wxIMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow);
+wxBEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxSashLayoutWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
         const wxSize& size, long style, const wxString& name)
diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 7e4c59afd0..9f29e7423b 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -39,15 +39,15 @@
 // event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase);
 
 wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
-BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
     EVT_LIST_ITEM_SELECTED(wxID_ANY, wxListbook::OnListSelected)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxListbook implementation
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index b02d3207c4..e8915afe9e 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -931,10 +931,10 @@ void wxListLineData::ReverseHighlight( void )
 //  wxListHeaderWindow
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
+wxBEGIN_EVENT_TABLE(wxListHeaderWindow,wxWindow)
     EVT_PAINT         (wxListHeaderWindow::OnPaint)
     EVT_MOUSE_EVENTS  (wxListHeaderWindow::OnMouse)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxListHeaderWindow::Init()
 {
@@ -1388,11 +1388,11 @@ void wxListFindTimer::Notify()
 // wxListTextCtrlWrapper (internal)
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxListTextCtrlWrapper, wxEvtHandler)
     EVT_CHAR           (wxListTextCtrlWrapper::OnChar)
     EVT_KEY_UP         (wxListTextCtrlWrapper::OnKeyUp)
     EVT_KILL_FOCUS     (wxListTextCtrlWrapper::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
                                              wxTextCtrl *text,
@@ -1548,7 +1548,7 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
 //  wxListMainWindow
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxListMainWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxListMainWindow, wxWindow)
   EVT_PAINT          (wxListMainWindow::OnPaint)
   EVT_MOUSE_EVENTS   (wxListMainWindow::OnMouse)
   EVT_CHAR_HOOK      (wxListMainWindow::OnCharHook)
@@ -1559,7 +1559,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow, wxWindow)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
   EVT_CHILD_FOCUS    (wxListMainWindow::OnChildFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxListMainWindow::Init()
 {
@@ -4537,12 +4537,12 @@ wxListMainWindow::PrefixFindItem(size_t idParent,
 // wxGenericListCtrl
 // -------------------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericListCtrl, wxControl);
 
-BEGIN_EVENT_TABLE(wxGenericListCtrl,wxListCtrlBase)
+wxBEGIN_EVENT_TABLE(wxGenericListCtrl,wxListCtrlBase)
   EVT_SIZE(wxGenericListCtrl::OnSize)
   EVT_SCROLLWIN(wxGenericListCtrl::OnScroll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGenericListCtrl::Init()
 {
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 902845f7f4..9641c67791 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -156,11 +156,11 @@ private:
     // the maximum length of the log message
     static size_t ms_maxLength;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxLogDialog);
 };
 
-BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
 #if wxUSE_CLIPBOARD
     EVT_BUTTON(wxID_COPY,   wxLogDialog::OnCopy)
@@ -169,7 +169,7 @@ BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
 #endif // CAN_SAVE_FILES
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG
 
@@ -479,11 +479,11 @@ private:
     wxTextCtrl  *m_pTextCtrl;
     wxLogWindow *m_log;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxLogFrame);
 };
 
-BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     // wxLogWindow menu events
     EVT_MENU(Menu_Close, wxLogFrame::OnClose)
 #if CAN_SAVE_FILES
@@ -492,7 +492,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle)
           : wxFrame(pParent, wxID_ANY, szTitle)
diff --git a/src/generic/mask.cpp b/src/generic/mask.cpp
index 504a462855..27fbbc6e96 100644
--- a/src/generic/mask.cpp
+++ b/src/generic/mask.cpp
@@ -33,7 +33,7 @@
 // wxMask implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
 
 void wxMask::FreeData()
 {
diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index c4a9a21f7b..a4f2117104 100644
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -51,14 +51,14 @@ enum MDI_MENU_ID
 // wxGenericMDIParentFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)
     EVT_CLOSE(wxGenericMDIParentFrame::OnClose)
 #if wxUSE_MENUS
     EVT_MENU(wxID_ANY, wxGenericMDIParentFrame::OnWindowMenu)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGenericMDIParentFrame::Init()
 {
@@ -379,13 +379,13 @@ bool wxGenericMDIParentFrame::ProcessEvent(wxEvent& event)
 // wxGenericMDIChildFrame
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIChildFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIChildFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxGenericMDIChildFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxGenericMDIChildFrame, wxFrame)
     EVT_MENU_HIGHLIGHT_ALL(wxGenericMDIChildFrame::OnMenuHighlight)
 
     EVT_CLOSE(wxGenericMDIChildFrame::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGenericMDIChildFrame::Init()
 {
@@ -525,7 +525,7 @@ bool wxGenericMDIChildFrame::TryAfter(wxEvent& event)
 // wxGenericMDIClientWindow
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIClientWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericMDIClientWindow, wxWindow);
 
 bool
 wxGenericMDIClientWindow::CreateGenericClient(wxWindow *parent)
diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index a85840e720..c18e4eb040 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -71,14 +71,14 @@ protected:
 // icons
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
         EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
         EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
         EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp)
         EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog);
 
 wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                                                 const wxString& message,
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 8caf0cda1e..01c4e29fdb 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -48,14 +48,14 @@
 // event table
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_PAINT(wxNotebook::OnPaint)
     EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
@@ -74,7 +74,7 @@ WX_DECLARE_HASH_MAP(wxNotebookPage*, int, wxPointerHash, wxPointerEqual,
 // This reuses wxTabView to draw the tabs.
 class WXDLLEXPORT wxNotebookTabView: public wxTabView
 {
-DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
+    wxDECLARE_DYNAMIC_CLASS(wxNotebookTabView);
 public:
     wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
     virtual ~wxNotebookTabView(void);
@@ -673,7 +673,7 @@ wxRect wxNotebook::GetAvailableClientSize()
  * wxNotebookTabView
  */
 
-IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
+wxIMPLEMENT_CLASS(wxNotebookTabView, wxTabView);
 
 wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style)
     : wxTabView(style), m_nextid(1)
diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp
index c941cfa39b..01329c05ea 100644
--- a/src/generic/notifmsgg.cpp
+++ b/src/generic/notifmsgg.cpp
@@ -83,7 +83,7 @@ private:
     wxTimer m_timer;
 
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxNotificationMessageDialog);
 };
 
@@ -91,11 +91,11 @@ private:
 // wxNotificationMessageDialog implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxNotificationMessageDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxNotificationMessageDialog, wxDialog)
     EVT_CLOSE(wxNotificationMessageDialog::OnClose)
 
     EVT_TIMER(wxID_ANY, wxNotificationMessageDialog::OnTimer)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxNotificationMessageDialog::wxNotificationMessageDialog(wxWindow *parent,
                                                          const wxString& text,
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 1ef55d1d26..17c15f8788 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -61,12 +61,12 @@
 // wxNumberEntryDialog
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxNumberEntryDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxNumberEntryDialog::OnOK)
     EVT_BUTTON(wxID_CANCEL, wxNumberEntryDialog::OnCancel)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxNumberEntryDialog, wxDialog);
 
 bool wxNumberEntryDialog::Create(wxWindow *parent,
                                          const wxString& message,
diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index d48bf5a085..c1ef5b461f 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -50,12 +50,12 @@
 // ----------------------------------------------------------------------------
 
 
-BEGIN_EVENT_TABLE(wxVListBoxComboPopup, wxVListBox)
+wxBEGIN_EVENT_TABLE(wxVListBoxComboPopup, wxVListBox)
     EVT_MOTION(wxVListBoxComboPopup::OnMouseMove)
     EVT_KEY_DOWN(wxVListBoxComboPopup::OnKey)
     EVT_CHAR(wxVListBoxComboPopup::OnChar)
     EVT_LEFT_UP(wxVListBoxComboPopup::OnLeftClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxVListBoxComboPopup::Init()
@@ -877,8 +877,8 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 // ----------------------------------------------------------------------------
 
 
-BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
+wxEND_EVENT_TABLE()
 
 void wxOwnerDrawnComboBox::Init()
 {
diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 746f3cedc3..41de19195a 100644
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -61,7 +61,7 @@ wxPaletteRefData::~wxPaletteRefData()
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject);
 
 wxPalette::wxPalette()
 {
diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index 00de8a9666..cedf7278f7 100644
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -48,8 +48,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
-    IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase);
+    wxIMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase);
 
 // ============================================================================
 // implementation
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 41d3dda771..5140283de9 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -82,7 +82,7 @@ extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 // wxPostScriptNativeData
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase)
+wxIMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase);
 
 wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 {
@@ -129,13 +129,13 @@ bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &WXUNUSED(data
 // Generic print dialog for non-Windows printing use.
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGenericPrintDialog, wxPrintDialogBase)
+wxIMPLEMENT_CLASS(wxGenericPrintDialog, wxPrintDialogBase);
 
-BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxPrintDialogBase)
+wxBEGIN_EVENT_TABLE(wxGenericPrintDialog, wxPrintDialogBase)
     EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
     EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
     EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
@@ -439,11 +439,11 @@ wxDC *wxGenericPrintDialog::GetPrintDC()
 // Generic print setup dialog
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog)
     EVT_LIST_ITEM_ACTIVATED(wxPRINTID_PRINTER, wxGenericPrintSetupDialog::OnPrinter)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
 wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
@@ -815,11 +815,11 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()
 // Generic page setup dialog
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase)
+wxIMPLEMENT_CLASS(wxGenericPageSetupDialog, wxPageSetupDialogBase);
 
-BEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase)
+wxBEGIN_EVENT_TABLE(wxGenericPageSetupDialog, wxPageSetupDialogBase)
     EVT_BUTTON(wxPRINTID_SETUP, wxGenericPageSetupDialog::OnPrinter)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
                                                     wxPageSetupDialogData* data)
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 2cf55d0b17..03616c83d7 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -69,12 +69,12 @@ static const int wxID_SKIP = 32000;  // whatever
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericProgressDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxGenericProgressDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxGenericProgressDialog::OnCancel)
     EVT_BUTTON(wxID_SKIP, wxGenericProgressDialog::OnSkip)
 
     EVT_CLOSE(wxGenericProgressDialog::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxGenericProgressDialog implementation
diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d33530a831..aac91de2ce 100644
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -50,12 +50,12 @@
 // wxPropertySheetDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
     EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
     EVT_IDLE(wxPropertySheetDialog::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,
                                        const wxPoint& pos, const wxSize& sz, long style,
diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index e9d08aeb5d..8249dcf0b3 100644
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -238,7 +238,7 @@ private:
 // ========================================================================
 // wxRegionGeneric
 // ========================================================================
-//IMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject)
+//wxIMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject);
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
@@ -400,7 +400,7 @@ wxRegionContain wxRegionGeneric::DoContainsRect(const wxRect& rect) const
 // ========================================================================
 // wxRegionIteratorGeneric
 // ========================================================================
-//IMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric,wxObject)
+//wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric, wxObject);
 
 wxRegionIteratorGeneric::wxRegionIteratorGeneric()
 {
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index a865311c21..8209f5e1ab 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -837,11 +837,11 @@ void wxRendererGeneric::DrawGauge(wxWindow* win,
 
 class wxGenericRendererModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGenericRendererModule);
 public:
     wxGenericRendererModule() {}
     bool OnInit() wxOVERRIDE { return true; }
     void OnExit() wxOVERRIDE { wxRendererGeneric::Cleanup(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule);
diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index 397cfd051a..c74e380f57 100644
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -31,10 +31,10 @@ wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog)
 // Events and handlers
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericRichMessageDialog, wxRichMessageDialogBase)
+wxBEGIN_EVENT_TABLE(wxGenericRichMessageDialog, wxRichMessageDialogBase)
     EVT_COLLAPSIBLEPANE_CHANGED(wxID_ANY,
                                 wxGenericRichMessageDialog::OnPaneChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxGenericRichMessageDialog::OnPaneChanged(wxCollapsiblePaneEvent& event)
 {
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index a26595a652..c5ba834f32 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -36,10 +36,10 @@
 
 wxDEFINE_EVENT( wxEVT_SASH_DRAGGED, wxSashEvent );
 
-IMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSashWindow, wxWindow);
+wxIMPLEMENT_DYNAMIC_CLASS(wxSashEvent, wxCommandEvent);
 
-BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_PAINT(wxSashWindow::OnPaint)
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
@@ -47,7 +47,7 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
 #endif // __WXMSW__ || __WXMAC__
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxSashWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
     const wxSize& size, long style, const wxString& name)
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 08c9d8592b..4bff9d94a7 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1565,4 +1565,4 @@ WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc)
 
 // NB: skipping wxScrolled<T> in wxRTTI information because being a templte,
 //     it doesn't and can't implement wxRTTI support
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
+wxIMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel);
diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 1a577dcde7..f48ff32c2d 100644
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -32,7 +32,7 @@
 
 #if wxUSE_SPINCTRL
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent);
 
 // There are port-specific versions for the wxSpinCtrl, so exclude the
 // contents of this file in those cases
@@ -110,10 +110,10 @@ public:
     wxSpinCtrlGenericBase *m_spin;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
+wxBEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
     EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
 
     // Forward the text events to wxSpinCtrl itself adjusting them slightly in
@@ -126,7 +126,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
     EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent)
 
     EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlButtonGeneric: spin button used by spin control
@@ -156,13 +156,13 @@ public:
     wxSpinCtrlGenericBase *m_spin;
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSpinCtrlButtonGeneric, wxSpinButton)
+wxBEGIN_EVENT_TABLE(wxSpinCtrlButtonGeneric, wxSpinButton)
     EVT_SPIN_UP(  wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton)
     EVT_SPIN_DOWN(wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxSpinCtrlGenericBase
@@ -366,10 +366,10 @@ bool wxSpinCtrlGenericBase::SetBackgroundColour(const wxColour& colour)
 // Handle sub controls events
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase)
+wxBEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase)
     EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar)
     EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 {
@@ -664,7 +664,7 @@ wxString wxSpinCtrl::DoValueToText(double val)
 // wxSpinCtrlDouble
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase);
 
 void wxSpinCtrlDouble::DoSendEvent()
 {
diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 10f8b10449..9d52d9aad4 100644
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -35,11 +35,11 @@
 
 #define wxSPLASH_TIMER_ID       9999
 
-IMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame)
-BEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSplashScreen, wxFrame);
+wxBEGIN_EVENT_TABLE(wxSplashScreen, wxFrame)
     EVT_TIMER(wxSPLASH_TIMER_ID, wxSplashScreen::OnNotify)
     EVT_CLOSE(wxSplashScreen::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxSplashScreen::Init()
 {
@@ -133,12 +133,12 @@ void wxSplashScreen::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 // wxSplashScreenWindow
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxSplashScreenWindow, wxWindow)
 #ifdef __WXGTK__
     EVT_PAINT(wxSplashScreenWindow::OnPaint)
 #endif
     EVT_ERASE_BACKGROUND(wxSplashScreenWindow::OnEraseBackground)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxSplashScreenWindow::wxSplashScreenWindow(const wxBitmap& bitmap, wxWindow* parent,
                                            wxWindowID id, const wxPoint& pos,
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 826b92a7d8..b0bb0c62a0 100644
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -43,7 +43,7 @@ wxDEFINE_EVENT( wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
 wxDEFINE_EVENT( wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
 wxDEFINE_EVENT( wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent );
 
-IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow);
 
 /*
     TODO PROPERTIES
@@ -54,9 +54,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
         orientation
 */
 
-IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent);
 
-BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
@@ -65,7 +65,7 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
     EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor)
 #endif // wxMSW
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 static bool IsLive(wxSplitterWindow* wnd)
 {
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 6d4785fc53..65f463c15a 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -144,15 +144,15 @@ protected:
 private:
     wxSearchCtrl* m_search;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
+wxBEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
     EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxSearchButton: search button used by search control
@@ -231,21 +231,21 @@ private:
     wxEventType   m_eventType;
     wxBitmap      m_bmp;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSearchButton, wxControl)
+wxBEGIN_EVENT_TABLE(wxSearchButton, wxControl)
     EVT_LEFT_UP(wxSearchButton::OnLeftUp)
     EVT_PAINT(wxSearchButton::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
+wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
     EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
     EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
     EVT_SIZE(wxSearchCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase);
 
 // ============================================================================
 // implementation
diff --git a/src/generic/statbmpg.cpp b/src/generic/statbmpg.cpp
index a21ef57e0b..e219d79b9c 100644
--- a/src/generic/statbmpg.cpp
+++ b/src/generic/statbmpg.cpp
@@ -40,7 +40,7 @@ void wxGenericStaticBitmap::OnPaint(wxPaintEvent& WXUNUSED(event))
 // under OSX_cocoa is a define, avoid duplicate info
 #ifndef wxGenericStaticBitmap
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase);
 
 #endif
 
diff --git a/src/generic/stattextg.cpp b/src/generic/stattextg.cpp
index a794fd30a3..a8b4b5c150 100644
--- a/src/generic/stattextg.cpp
+++ b/src/generic/stattextg.cpp
@@ -27,7 +27,7 @@
     #include "wx/generic/private/markuptext.h"
 #endif // wxUSE_MARKUP
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticText, wxStaticTextBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericStaticText, wxStaticTextBase);
 
 
 bool wxGenericStaticText::Create(wxWindow *parent,
diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 1351308649..cbd2f95cb1 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -34,13 +34,13 @@
 
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
 // standard wxStatusBar class, if wxStatusBarGeneric is the same as
-// wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
+// wxStatusBar, then the corresponding wxIMPLEMENT_DYNAMIC_CLASS is already in
 // common/statbar.cpp
 #if defined(__WXMAC__) || \
     (defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR)
     #include "wx/generic/statusbr.h"
 
-    IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow);
 #endif // wxUSE_NATIVE_STATUSBAR
 
 // Default status border dimensions
@@ -87,7 +87,7 @@ gboolean statusbar_query_tooltip(GtkWidget*   WXUNUSED(widget),
 // wxStatusBarGeneric
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
+wxBEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_PAINT(wxStatusBarGeneric::OnPaint)
     EVT_SIZE(wxStatusBarGeneric::OnSize)
 #ifdef __WXGTK20__
@@ -95,7 +95,7 @@ BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown)
 #endif
     EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxStatusBarGeneric::Init()
 {
diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 7d4dbdf09b..2580a9aece 100644
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -35,9 +35,9 @@ WX_DEFINE_LIST(wxTabLayerList)
 // defined: use new, rounded tab implementation (doesn't colour in tabs)
 // #define wxUSE_NEW_METHOD
 
-IMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTabControl, wxObject);
 
-// IMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList)
+// wxIMPLEMENT_DYNAMIC_CLASS(wxTabLayer, wxList);
 
 wxTabControl::wxTabControl(wxTabView *v)
 {
@@ -501,7 +501,7 @@ bool wxTabControl::HitTest(int x, int y) const
     return false;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTabView, wxObject);
 
 wxTabView::wxTabView(long style)
 {
@@ -1135,13 +1135,13 @@ int wxTabView::CalculateTabWidth(int noTabs, bool adjustView)
  * wxTabbedDialog
  */
 
-IMPLEMENT_CLASS(wxTabbedDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxTabbedDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxTabbedDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxTabbedDialog, wxDialog)
     EVT_CLOSE(wxTabbedDialog::OnCloseWindow)
     EVT_MOUSE_EVENTS(wxTabbedDialog::OnMouseEvent)
     EVT_PAINT(wxTabbedDialog::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTabbedDialog::wxTabbedDialog(wxWindow *parent, wxWindowID id,
     const wxString& title,
@@ -1180,12 +1180,12 @@ void wxTabbedDialog::OnPaint(wxPaintEvent& WXUNUSED(event) )
  * wxTabbedPanel
  */
 
-IMPLEMENT_CLASS(wxTabbedPanel, wxPanel)
+wxIMPLEMENT_CLASS(wxTabbedPanel, wxPanel);
 
-BEGIN_EVENT_TABLE(wxTabbedPanel, wxPanel)
+wxBEGIN_EVENT_TABLE(wxTabbedPanel, wxPanel)
     EVT_MOUSE_EVENTS(wxTabbedPanel::OnMouseEvent)
     EVT_PAINT(wxTabbedPanel::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTabbedPanel::wxTabbedPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos,
    const wxSize& size, long windowStyle, const wxString& name):
@@ -1216,7 +1216,7 @@ void wxTabbedPanel::OnPaint(wxPaintEvent& WXUNUSED(event) )
  * wxPanelTabView
  */
 
-IMPLEMENT_CLASS(wxPanelTabView, wxTabView)
+wxIMPLEMENT_CLASS(wxPanelTabView, wxTabView);
 
 wxPanelTabView::wxPanelTabView(wxPanel *pan, long style)
     : wxTabView(style)
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 78c6093982..ce24c6fd59 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -58,11 +58,11 @@ static const int wxID_TEXT = 3000;
 // wxTextEntryDialog
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxTextEntryDialog, wxDialog);
 
 bool wxTextEntryDialog::Create(wxWindow *parent,
                                      const wxString& message,
@@ -187,7 +187,7 @@ void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
 // wxPasswordEntryDialog
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPasswordEntryDialog, wxTextEntryDialog)
+wxIMPLEMENT_CLASS(wxPasswordEntryDialog, wxTextEntryDialog);
 
 bool wxPasswordEntryDialog::Create(wxWindow *parent,
                                    const wxString& message,
diff --git a/src/generic/timectrlg.cpp b/src/generic/timectrlg.cpp
index 50f27bc4d9..a6fa14549c 100644
--- a/src/generic/timectrlg.cpp
+++ b/src/generic/timectrlg.cpp
@@ -43,7 +43,7 @@
 #include "wx/spinbutt.h"
 
 #ifndef wxHAS_NATIVE_TIMEPICKERCTRL
-    IMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl);
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 0f0ccd1601..b037400524 100644
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -232,14 +232,14 @@ void wxGenericTimerImpl::Stop()
 // A module to deallocate memory properly:
 class wxTimerModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxTimerModule)
+    wxDECLARE_DYNAMIC_CLASS(wxTimerModule);
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }
     void OnExit() { wxDELETE(gs_scheduler); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule);
 
 // ----------------------------------------------------------------------------
 // wxGUIAppTraits
diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 021080d62a..ef80be20d7 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -127,7 +127,7 @@ private:
     wxTextCtrl *m_text;
     wxCheckBox *m_checkbox;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTipDialog);
 };
 
@@ -205,9 +205,9 @@ wxString wxFileTipProvider::GetTip()
 // wxTipDialog
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
     EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,
                          wxTipProvider *tipProvider,
diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 7ab7e77ee0..abe66b3275 100644
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -69,7 +69,7 @@ private:
     long m_creationTime;
 #endif // !wxUSE_POPUPWIN
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
 };
 
@@ -81,7 +81,7 @@ private:
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTipWindow, wxTipWindowBase)
+wxBEGIN_EVENT_TABLE(wxTipWindow, wxTipWindowBase)
     EVT_LEFT_DOWN(wxTipWindow::OnMouseClick)
     EVT_RIGHT_DOWN(wxTipWindow::OnMouseClick)
     EVT_MIDDLE_DOWN(wxTipWindow::OnMouseClick)
@@ -90,9 +90,9 @@ BEGIN_EVENT_TABLE(wxTipWindow, wxTipWindowBase)
     EVT_KILL_FOCUS(wxTipWindow::OnKillFocus)
     EVT_ACTIVATE(wxTipWindow::OnActivate)
 #endif // !wxUSE_POPUPWIN
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxTipWindowView, wxWindow)
+wxBEGIN_EVENT_TABLE(wxTipWindowView, wxWindow)
     EVT_PAINT(wxTipWindowView::OnPaint)
 
     EVT_LEFT_DOWN(wxTipWindowView::OnMouseClick)
@@ -104,7 +104,7 @@ BEGIN_EVENT_TABLE(wxTipWindowView, wxWindow)
 #if !wxUSE_POPUPWIN
     EVT_KILL_FOCUS(wxTipWindowView::OnKillFocus)
 #endif // !wxUSE_POPUPWIN
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxTipWindow
diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 36bcbdc343..6c6b9d2d4f 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -35,16 +35,16 @@
 // event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase);
 
 wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
 
-BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)
     EVT_TOOL_RANGE(1, 50, wxToolbook::OnToolSelected)
     EVT_IDLE(wxToolbook::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxToolbook implementation
diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 4e1917d1ca..7e3599564d 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -44,18 +44,18 @@
 // event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxBookCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxBookCtrlBase);
 
 wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGING,  wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_TREEBOOK_PAGE_CHANGED,   wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
 wxDEFINE_EVENT( wxEVT_TREEBOOK_NODE_EXPANDED,  wxBookCtrlEvent );
 
-BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
     EVT_TREE_SEL_CHANGED   (wxID_ANY, wxTreebook::OnTreeSelectionChange)
     EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
     EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // wxTreebook implementation
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 383e6fde04..aee711a689 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -112,7 +112,7 @@ private:
     wxString            m_startValue;
     bool                m_aboutToFinish;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxTreeTextCtrl);
 };
 
@@ -415,11 +415,11 @@ void wxTreeRenameTimer::Notify()
 // wxTreeTextCtrl (internal)
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
+wxBEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
     EVT_CHAR           (wxTreeTextCtrl::OnChar)
     EVT_KEY_UP         (wxTreeTextCtrl::OnKeyUp)
     EVT_KILL_FOCUS     (wxTreeTextCtrl::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
                                wxGenericTreeItem *itm)
@@ -910,9 +910,9 @@ void wxGenericTreeItem::RecursiveResetTextSize()
 // wxGenericTreeCtrl implementation
 // -----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericTreeCtrl, wxControl);
 
-BEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)
+wxBEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)
     EVT_PAINT          (wxGenericTreeCtrl::OnPaint)
     EVT_SIZE           (wxGenericTreeCtrl::OnSize)
     EVT_MOUSE_EVENTS   (wxGenericTreeCtrl::OnMouse)
@@ -921,7 +921,7 @@ BEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)
     EVT_SET_FOCUS      (wxGenericTreeCtrl::OnSetFocus)
     EVT_KILL_FOCUS     (wxGenericTreeCtrl::OnKillFocus)
     EVT_TREE_ITEM_GETTOOLTIP(wxID_ANY, wxGenericTreeCtrl::OnGetToolTip)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // -----------------------------------------------------------------------------
 // construction/destruction
diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp
index 65e13b684a..74992994c1 100644
--- a/src/generic/treelist.cpp
+++ b/src/generic/treelist.cpp
@@ -979,7 +979,7 @@ wxTreeListModel::Compare(const wxDataViewItem& item1,
 // wxTreeListCtrl implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxTreeListCtrl, wxWindow)
+wxBEGIN_EVENT_TABLE(wxTreeListCtrl, wxWindow)
     EVT_DATAVIEW_SELECTION_CHANGED(wxID_ANY, wxTreeListCtrl::OnSelectionChanged)
     EVT_DATAVIEW_ITEM_EXPANDING(wxID_ANY, wxTreeListCtrl::OnItemExpanding)
     EVT_DATAVIEW_ITEM_EXPANDED(wxID_ANY, wxTreeListCtrl::OnItemExpanded)
@@ -988,7 +988,7 @@ BEGIN_EVENT_TABLE(wxTreeListCtrl, wxWindow)
     EVT_DATAVIEW_COLUMN_SORTED(wxID_ANY, wxTreeListCtrl::OnColumnSorted)
 
     EVT_SIZE(wxTreeListCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // Creation
@@ -1665,7 +1665,7 @@ wxWindow* wxTreeListCtrl::GetView() const
 // wxTreeListEvent implementation
 // ============================================================================
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxTreeListEvent, wxNotifyEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTreeListEvent, wxNotifyEvent);
 
 #define wxDEFINE_TREELIST_EVENT(name) \
     wxDEFINE_EVENT(wxEVT_TREELIST_##name, wxTreeListEvent)
diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 0834212b7e..60c524dbd2 100644
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -41,7 +41,7 @@
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
+wxBEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
     EVT_PAINT(wxVListBox::OnPaint)
 
     EVT_KEY_DOWN(wxVListBox::OnKeyDown)
@@ -52,13 +52,13 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
     EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)
 
     EVT_SIZE(wxVListBox::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow);
 const char wxVListBoxNameStr[] = "wxVListBox";
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index f00bdddb29..995f4d2c7a 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -996,9 +996,9 @@ bool wxVarHVScrollHelper::IsVisible(size_t row, size_t column) const
 // wx[V/H/HV]ScrolledWindow implementations
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxVScrolledWindow, wxPanel)
-IMPLEMENT_ABSTRACT_CLASS(wxHScrolledWindow, wxPanel)
-IMPLEMENT_ABSTRACT_CLASS(wxHVScrolledWindow, wxPanel)
+wxIMPLEMENT_ABSTRACT_CLASS(wxVScrolledWindow, wxPanel);
+wxIMPLEMENT_ABSTRACT_CLASS(wxHScrolledWindow, wxPanel);
+wxIMPLEMENT_ABSTRACT_CLASS(wxHVScrolledWindow, wxPanel);
 
 
 #if WXWIN_COMPATIBILITY_2_8
diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index f3c47f3670..3bfd26cc7c 100644
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -88,7 +88,7 @@ wxDEFINE_EVENT( wxEVT_WIZARD_FINISHED, wxWizardEvent );
 wxDEFINE_EVENT( wxEVT_WIZARD_HELP, wxWizardEvent );
 wxDEFINE_EVENT( wxEVT_WIZARD_PAGE_SHOWN, wxWizardEvent );
 
-BEGIN_EVENT_TABLE(wxWizard, wxDialog)
+wxBEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_BUTTON(wxID_CANCEL, wxWizard::OnCancel)
     EVT_BUTTON(wxID_BACKWARD, wxWizard::OnBackOrNext)
     EVT_BUTTON(wxID_FORWARD, wxWizard::OnBackOrNext)
@@ -99,9 +99,9 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
     EVT_WIZARD_CANCEL(wxID_ANY, wxWizard::OnWizEvent)
     EVT_WIZARD_FINISHED(wxID_ANY, wxWizard::OnWizEvent)
     EVT_WIZARD_HELP(wxID_ANY, wxWizard::OnWizEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog);
 
 /*
     TODO PROPERTIES :
@@ -110,9 +110,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
         title
 */
 
-IMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel)
-IMPLEMENT_DYNAMIC_CLASS(wxWizardPageSimple, wxWizardPage)
-IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel);
+wxIMPLEMENT_DYNAMIC_CLASS(wxWizardPageSimple, wxWizardPage);
+wxIMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent);
 
 // ============================================================================
 // implementation
diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index 8ed590bbe9..a36a16f33d 100644
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -51,7 +51,7 @@ void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,
 // wxAnimation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxAnimationBase);
 
 wxAnimation::wxAnimation(const wxAnimation& that)
     : base_type(that)
@@ -202,10 +202,10 @@ void wxAnimation::SetPixbuf(GdkPixbufAnimation* p)
 // wxAnimationCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxAnimationCtrlBase)
-BEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxAnimationCtrlBase);
+wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase)
     EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxAnimationCtrl::Init()
 {
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c224a62d2c..776205a5cb 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -168,7 +168,7 @@ bool wxApp::DoIdle()
 // wxApp
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler);
 
 wxApp::wxApp()
 {
diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index b1588b972b..0a739f30a6 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -75,7 +75,7 @@ static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h)
 // wxMask
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase);
 
 wxMask::wxMask()
 {
@@ -410,7 +410,7 @@ bool wxBitmapRefData::IsOk() const
 
 #define M_BMPDATA static_cast<wxBitmapRefData*>(m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject);
 
 wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
 {
diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 127b50d5e3..43d522c08a 100644
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -37,7 +37,7 @@
 // ============================================================================
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox);
 
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index f88821a4b1..4fe673d2bc 100644
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -53,7 +53,7 @@ public:
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
 
 wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
 {
diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 887bce0a10..1777b25a06 100644
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -429,7 +429,7 @@ async_targets_selection_received( GtkWidget *WXUNUSED(widget),
 // wxClipboard ctor/dtor
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index e821a2d16e..a51491d552 100644
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -55,7 +55,7 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 // wxColourButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourButton, wxButton);
 
 bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
                         const wxColour &col,
diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 20b5e91aba..b5a8b650b2 100644
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -34,7 +34,7 @@ const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
 
 wxDEFINE_EVENT( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );
 
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent);
 
 // ============================================================================
 // implementation
@@ -163,11 +163,11 @@ void wxCollapsiblePane::AddChildGTK(wxWindowGTK* child)
 // wxCollapsiblePane
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl);
 
-BEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase)
+wxBEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase)
     EVT_SIZE(wxCollapsiblePane::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxCollapsiblePane::Create(wxWindow *parent,
                                wxWindowID id,
diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index aa395f2374..5d8932bd33 100644
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -45,7 +45,7 @@ static void response(GtkDialog*, int response_id, wxColourDialog* win)
 }
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog);
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 {
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f08cf2b1f8..c9ea77f29f 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -64,7 +64,7 @@ gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
+wxBEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_CHAR(wxComboBox::OnChar)
 
     EVT_MENU(wxID_CUT, wxComboBox::OnCut)
@@ -82,7 +82,7 @@ BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
     EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 3352965683..20488b8979 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -34,7 +34,7 @@
 // wxControl creation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
 
 wxControl::wxControl()
 {
diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 2a8d175abe..ee2711aa0f 100644
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -67,7 +67,7 @@ wxCursorRefData::~wxCursorRefData()
 
 #define M_CURSORDATA static_cast<wxCursorRefData*>(m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject);
 
 wxCursor::wxCursor()
 {
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index b3932a938a..f1dbbac4e1 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1835,7 +1835,7 @@ wxgtk_renderer_editing_started( GtkCellRenderer *WXUNUSED(cell), GtkCellEditable
 }
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase);
 
 wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                         int align ) :
@@ -2128,7 +2128,7 @@ bool GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
 
 } // anonymous namespace
 
-IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer);
 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                 int align ) :
@@ -2229,7 +2229,7 @@ void SetPixbufProp(GtkCellRenderer *renderer, GdkPixbuf *pixbuf)
 
 } // anonymous namespace
 
-IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer);
 
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode,
                                                     int align ) :
@@ -2307,7 +2307,7 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
     model->ChangeValue( value, item, model_col );
 }
 
-IMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer);
 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode, int align ) :
@@ -2398,7 +2398,7 @@ public:
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer);
 
 wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype,
                                                     wxDataViewCellMode mode,
@@ -2521,7 +2521,7 @@ wxDC *wxDataViewCustomRenderer::GetDC()
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer)
+wxIMPLEMENT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer);
 
 wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label,
     const wxString &varianttype, wxDataViewCellMode mode, int align ) :
@@ -2756,7 +2756,7 @@ bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer)
+wxIMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer);
 
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer
                             (
@@ -4450,7 +4450,7 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget),
     return FALSE;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase);
 
 wxDataViewCtrl::~wxDataViewCtrl()
 {
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 8e0d249a5c..7d13a2f689 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -370,7 +370,7 @@ wxGTKCairoDC::wxGTKCairoDC(cairo_t* cr)
 // wxGTKDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl);
 
 wxGTKDCImpl::wxGTKDCImpl( wxDC *owner )
    : wxDCImpl( owner )
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index d7a799613e..1d8d3c9109 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -254,7 +254,7 @@ static void wxFreePoolGC( GdkGC *gc )
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGTKDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGTKDCImpl);
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) :
    wxGTKDCImpl( owner )
@@ -2027,7 +2027,7 @@ int wxWindowDCImpl::GetDepth() const
 // wxClientDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl( wxDC *owner )
           : wxWindowDCImpl( owner )
@@ -2059,7 +2059,7 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 // wxPaintDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl);
 
 // Limit the paint region to the window size. Sometimes
 // the paint region is too big, and this risks X11 errors
@@ -2124,10 +2124,10 @@ public:
     void OnExit() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDCModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDCModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule);
 
 bool wxDCModule::OnInit()
 {
diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 05009c9e59..a75c8ed21d 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -17,7 +17,7 @@
 // wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl);
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
   : wxWindowDCImpl( owner )
diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 3e6dc777f9..c895c9e200 100644
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -17,7 +17,7 @@
 // wxScreenDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
   : wxWindowDCImpl( owner )
diff --git a/src/gtk/dirdlg.cpp b/src/gtk/dirdlg.cpp
index dc88826163..c47abbd0f0 100644
--- a/src/gtk/dirdlg.cpp
+++ b/src/gtk/dirdlg.cpp
@@ -46,7 +46,7 @@ static void gtk_dirdialog_response_callback(GtkWidget * WXUNUSED(w),
 // wxDirDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog);
 
 wxDirDialog::wxDirDialog(wxWindow* parent,
                          const wxString& title,
diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index fd28b39918..3d7020dd6a 100644
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -301,7 +301,7 @@ extern "C"
 
 // wxGtkFileCtrl implementation
 
-IMPLEMENT_DYNAMIC_CLASS( wxGtkFileCtrl, wxControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxGtkFileCtrl, wxControl);
 
 wxGtkFileCtrl::~wxGtkFileCtrl()
 {
diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 44087dd65e..4a66029edc 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -165,12 +165,12 @@ void wxFileDialog::AddChildGTK(wxWindowGTK* child)
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxFileDialogBase);
 
-BEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)
+wxBEGIN_EVENT_TABLE(wxFileDialog,wxFileDialogBase)
     EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
     EVT_SIZE(wxFileDialog::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir,
diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index d8d0c6b01d..3e82198416 100644
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -36,7 +36,7 @@
 // wxFileButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileButton, wxButton);
 
 bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
                         const wxString &label, const wxString &path,
@@ -220,7 +220,7 @@ static void selection_changed(GtkFileChooser* chooser, wxDirButton* win)
 // wxDirButtonGTK
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDirButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirButton, wxButton);
 
 bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
                         const wxString &label, const wxString &path,
diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 4179792d70..82d0c8614c 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -58,7 +58,7 @@ static void response(GtkDialog* dialog, int response_id, wxFontDialog* win)
 // wxFontDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 bool wxFontDialog::DoCreate(wxWindow *parent)
 {
diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index a17216e73a..e5f98b64c8 100644
--- a/src/gtk/fontpicker.cpp
+++ b/src/gtk/fontpicker.cpp
@@ -49,7 +49,7 @@ static void gtk_fontbutton_setfont_callback(GtkFontButton *widget,
 // wxFontButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontButton, wxButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontButton, wxButton);
 
 bool wxFontButton::Create( wxWindow *parent, wxWindowID id,
                         const wxFont &initial,
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index d4acb9c8c2..aba6655462 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -140,7 +140,7 @@ parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void*
 // wxGlCanvas
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        wxWindowID id,
diff --git a/src/gtk/gnome/gvfs.cpp b/src/gtk/gnome/gvfs.cpp
index 3f86418b10..94986b7cc9 100644
--- a/src/gtk/gnome/gvfs.cpp
+++ b/src/gtk/gnome/gvfs.cpp
@@ -138,7 +138,7 @@ public:
     void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGnomeVFSModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGnomeVFSModule);
 };
 
 bool wxGnomeVFSModule::OnInit()
@@ -160,6 +160,6 @@ void wxGnomeVFSModule::OnExit()
     delete gs_lgvfs;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxGnomeVFSModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGnomeVFSModule, wxModule);
 
 #endif // wxUSE_LIBGNOMEVFS && wxUSE_MIMETYPE
diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 3454d4f90b..4437030362 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -76,7 +76,7 @@ switch_page(GtkNotebook* widget, GtkNotebookPage*, guint page_num, wxMDIParentFr
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
 
 void wxMDIParentFrame::Init()
 {
@@ -256,12 +256,12 @@ void wxMDIParentFrame::ActivatePrevious()
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
     EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxMDIChildFrame::Init()
 {
@@ -375,7 +375,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow);
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index b1b153c000..33c7f73f48 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -311,7 +311,7 @@ static unsigned char close_bits[]={
     0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 wxMiniFrame::~wxMiniFrame()
 {
diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 9ff33058f7..e10534c15e 100644
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -39,7 +39,7 @@
     #include <hildon/hildon.h>
 #endif // wxUSE_LIBHILDON2
 
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& message,
diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index fb93933a91..8f75c84c25 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -127,9 +127,9 @@ void wxNotebook::AddChildGTK(wxWindowGTK* child)
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxNotebook::Init()
 {
diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp
index 76e6fa632d..c23c144c6b 100644
--- a/src/gtk/pen.cpp
+++ b/src/gtk/pen.cpp
@@ -85,7 +85,7 @@ public:
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
 {
diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 5f46363917..18ded2d935 100644
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -77,9 +77,9 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
 //-----------------------------------------------------------------------------
 
 #ifdef __WXUNIVERSAL__
-BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
+wxBEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
     EVT_SIZE(wxPopupWindow::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 #endif
 
 wxPopupWindow::~wxPopupWindow()
diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 5c2afd722d..94050b7763 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -238,7 +238,7 @@ public:
     void OnExit() wxOVERRIDE {}
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGtkPrintModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGtkPrintModule);
 };
 
 bool wxGtkPrintModule::OnInit()
@@ -252,7 +252,7 @@ bool wxGtkPrintModule::OnInit()
     return true;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxGtkPrintModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGtkPrintModule, wxModule);
 
 //----------------------------------------------------------------------------
 // wxGtkPrintFactory
@@ -386,7 +386,7 @@ extern "C"
 // wxGtkPrintNativeData
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGtkPrintNativeData, wxPrintNativeDataBase)
+wxIMPLEMENT_CLASS(wxGtkPrintNativeData, wxPrintNativeDataBase);
 
 wxGtkPrintNativeData::wxGtkPrintNativeData()
 {
@@ -599,7 +599,7 @@ void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, Gt
 // wxGtkPrintDialog
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGtkPrintDialog, wxPrintDialogBase)
+wxIMPLEMENT_CLASS(wxGtkPrintDialog, wxPrintDialogBase);
 
 wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintDialogData *data )
                     : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
@@ -744,7 +744,7 @@ int wxGtkPrintDialog::ShowModal()
 // wxGtkPageSetupDialog
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGtkPageSetupDialog, wxPageSetupDialogBase)
+wxIMPLEMENT_CLASS(wxGtkPageSetupDialog, wxPageSetupDialogBase);
 
 wxGtkPageSetupDialog::wxGtkPageSetupDialog( wxWindow *parent,
                             wxPageSetupDialogData* data )
@@ -866,7 +866,7 @@ int wxGtkPageSetupDialog::ShowModal()
 // wxGtkPrinter
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGtkPrinter, wxPrinterBase)
+wxIMPLEMENT_CLASS(wxGtkPrinter, wxPrinterBase);
 
 wxGtkPrinter::wxGtkPrinter( wxPrintDialogData *data ) :
     wxPrinterBase( data )
@@ -1173,7 +1173,7 @@ bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )
 
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl);
 
 wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& data)
                   : wxDCImpl( owner )
@@ -2269,7 +2269,7 @@ int wxGtkPrinterDCImpl::GetResolution() const
 // Print preview
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGtkPrintPreview, wxPrintPreviewBase)
+wxIMPLEMENT_CLASS(wxGtkPrintPreview, wxPrintPreviewBase);
 
 void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),
                              wxPrintout * WXUNUSED(printoutForPrinting),
diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp
index 594f6f7186..e60d799ebc 100644
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -276,10 +276,10 @@ public:
         }
     }
 
-    DECLARE_DYNAMIC_CLASS(WidgetsCleanupModule)
+    wxDECLARE_DYNAMIC_CLASS(WidgetsCleanupModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(WidgetsCleanupModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(WidgetsCleanupModule, wxModule);
 
 static WidgetsCleanupModule gs_widgetsCleanupModule;
 
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 1277b5f912..f68fd270f9 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -192,7 +192,7 @@ static void gtk_radiobutton_size_allocate( GtkWidget *widget,
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
                          const wxString& title,
diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index af0d73628e..054acd8e80 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -70,8 +70,8 @@ public:
 #define M_REGIONDATA static_cast<wxRegionRefData*>(m_refData)
 #define M_REGIONDATA_OF(r) static_cast<wxRegionRefData*>(r.m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxRegion construction
diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 4b0cb1f3c6..61c533a548 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -104,9 +104,9 @@ private:
 // wxSpinCtrlGTKBase
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase)
+wxBEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase)
     EVT_CHAR(wxSpinCtrlGTKBase::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxSpinCtrlGTKBase::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
@@ -477,7 +477,7 @@ bool wxSpinCtrl::SetBase(int base)
 // wxSpinCtrlDouble
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGTKBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGTKBase);
 
 unsigned wxSpinCtrlDouble::GetDigits() const
 {
diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 599ef25377..0f1202f68e 100644
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -284,7 +284,7 @@ void wxTaskBarIcon::Private::size_allocate(int width, int height)
 #endif
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
 {
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index b0b3bf9774..7948f30f1c 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -600,7 +600,7 @@ static void state_flags_changed(GtkWidget*, GtkStateFlags, wxTextCtrl* win)
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -624,7 +624,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_RIGHT_DOWN  (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_UP    (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 6bc6506d9e..3ea1059b3b 100644
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -46,7 +46,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 // wxBitmapToggleButton
 // ------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxBitmap &bitmap, const wxPoint &pos,
@@ -75,7 +75,7 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
 // wxToggleButton
 // ------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 
 bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString &label, const wxPoint &pos,
diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index 27cba8f74f..61a5a79bdd 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -64,7 +64,7 @@ public:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 // ============================================================================
 // implementation
diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp
index 338b9a150c..2ab3069e49 100644
--- a/src/gtk/tooltip.cpp
+++ b/src/gtk/tooltip.cpp
@@ -31,7 +31,7 @@ static GtkTooltips *gs_tooltips = NULL;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject);
 
 wxToolTip::wxToolTip( const wxString &tip )
     : m_text(tip)
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5b916a0d23..d5d675b132 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2341,7 +2341,7 @@ wxMouseState wxGetMouseState()
 // in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
 // method
 #ifdef __WXUNIVERSAL__
-    IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase);
 #endif // __WXUNIVERSAL__
 
 void wxWindowGTK::Init()
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 5a862ee6e8..3ff32474e2 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -377,7 +377,7 @@ GtkWidget* wxGetRootWindow()
 // wxApp
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler);
 
 wxApp::wxApp()
 {
diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 4622f1a9ed..db48afe58a 100644
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -49,7 +49,7 @@ extern GtkWidget *wxGetRootWindow();
 // wxMask
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
 
 wxMask::wxMask()
 {
@@ -354,7 +354,7 @@ wxBitmapRefData::~wxBitmapRefData()
 
 #define M_BMPDATA ((wxBitmapRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject);
 
 wxGDIRefData *wxBitmap::CreateGDIRefData() const
 {
diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp
index a63ff02da6..2316177878 100644
--- a/src/gtk1/brush.cpp
+++ b/src/gtk1/brush.cpp
@@ -53,7 +53,7 @@ public:
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject);
 
 wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
 {
diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 1c3cc69c94..5b52fbe447 100644
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -297,7 +297,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index e21c718950..d125ba6be8 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -169,7 +169,7 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_SIZE(wxComboBox::OnSize)
     EVT_CHAR(wxComboBox::OnChar)
 
@@ -188,7 +188,7 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
     EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
                          const wxString& value,
diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 0e186c1bc9..6fdfb48980 100644
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -29,7 +29,7 @@
 // wxControl creation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
 
 wxControl::wxControl()
 {
diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 4e76f07153..cf67f7e506 100644
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -58,7 +58,7 @@ wxCursorRefData::~wxCursorRefData()
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject);
 
 wxCursor::wxCursor()
 {
diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 6065094fdd..7c75e571f2 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -18,7 +18,7 @@
 // wxGTKDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl);
 
 wxGTKDCImpl::wxGTKDCImpl(wxDC *owner)
            : wxDCImpl(owner)
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index f76205feab..1dacb1b416 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -259,7 +259,7 @@ static void wxFreePoolGC( GdkGC *gc )
 // wxWindowDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDC);
 
 wxWindowDCImpl::wxWindowDCImpl(wxDC *owner)
               : wxGTKDCImpl(owner)
@@ -2128,7 +2128,7 @@ int wxWindowDCImpl::GetDepth() const
 // wxPaintDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl);
 
 // Limit the paint region to the window size. Sometimes
 // the paint region is too big, and this risks X11 errors
@@ -2181,7 +2181,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow *win)
 // wxClientDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
               : wxWindowDCImpl(owner, win)
@@ -2214,10 +2214,10 @@ public:
     void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDCModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDCModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule);
 
 bool wxDCModule::OnInit()
 {
diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 09525a4a40..568a60a7c3 100644
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -18,7 +18,7 @@
 // wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl);
 
 void wxMemoryDCImpl::Init()
 {
diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index 9f8dfc1856..238ce71138 100644
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -32,7 +32,7 @@ int wxScreenDCImpl::sm_overlayWindowY = 0;
 // wxScreenDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPaintDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPaintDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner)
               : wxPaintDCImpl(owner)
diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 8076294532..e3fc133185 100644
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -36,12 +36,12 @@ extern int g_openDialogs;
 // wxDialog
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
+wxBEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
     EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
     EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxDialog::Init()
 {
diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 168b1e8b02..801a86b4ba 100644
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -19,11 +19,11 @@
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxGenericFileDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 
-BEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
+wxBEGIN_EVENT_TABLE(wxFileDialog,wxGenericFileDialog)
     EVT_BUTTON(wxID_OK, wxFileDialog::OnFakeOk)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir,
diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 095d476d72..9a0175e39c 100644
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -108,7 +108,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
 // wxFontDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 bool wxFontDialog::DoCreate(wxWindow *parent)
 {
diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 7e6e95b87d..971f582f6d 100644
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -133,7 +133,7 @@ gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, w
 // wxGlCanvas
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        wxWindowID id,
diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index b20e246205..e007724116 100644
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -107,7 +107,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
 
 void wxMDIParentFrame::Init()
 {
@@ -299,12 +299,12 @@ void wxMDIParentFrame::ActivatePrevious()
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
     EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxMDIChildFrame::Init()
 {
@@ -450,7 +450,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow);
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index ce0b428726..7ee1e7a750 100644
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -319,7 +319,7 @@ static const char *cross_xpm[] = {
 " ### ",
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index e4a59be9b8..79f6cb8ba8 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -279,9 +279,9 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 // wxNotebook
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxNotebook::Init()
 {
diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 1e24a693a4..8e5d64ea25 100644
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -85,7 +85,7 @@ public:
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
 {
diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 2fb8420826..022851d223 100644
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -158,11 +158,11 @@ static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
 // wxPopupWindow
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
+wxBEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
 #ifdef __WXUNIVERSAL__
     EVT_SIZE(wxPopupWindow::OnSize)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxPopupWindow::~wxPopupWindow()
 {
diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 8aa5e21107..92bbb02212 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -162,7 +162,7 @@ static gint gtk_radiobutton_focus_out( GtkWidget *WXUNUSED(widget),
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 void wxRadioBox::Init()
 {
diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 978a892cf0..ba851ff88d 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -78,8 +78,8 @@ public:
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxRegion construction
diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 355d7ab472..85e2083759 100644
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -102,9 +102,9 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
+wxBEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxSpinButton::Create(wxWindow *parent,
                           wxWindowID id,
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 79de856b28..eee5eaf029 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -122,9 +122,9 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     EVT_CHAR(wxSpinCtrl::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 0188681154..5267495b2f 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -200,7 +200,7 @@ static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -214,7 +214,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
diff --git a/src/gtk1/tglbtn.cpp b/src/gtk1/tglbtn.cpp
index 7e7be28ff9..73580a2974 100644
--- a/src/gtk1/tglbtn.cpp
+++ b/src/gtk1/tglbtn.cpp
@@ -52,7 +52,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 // wxToggleBitmapButton
 // ------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleBitmapButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleBitmapButton, wxControl);
 
 bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
                             const wxBitmap &label, const wxPoint &pos,
@@ -225,7 +225,7 @@ wxToggleBitmapButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant
 // wxToggleButton
 // ------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 
 bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString &label, const wxPoint &pos,
diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index f0e4b290e9..653ff03658 100644
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -164,7 +164,7 @@ void wxThread::OnExit()
     Join();
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
 
 bool wxThreadModule::OnInit()
 {
diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 830c0eb1d2..2b556a3e13 100644
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -251,10 +251,10 @@ public:
     virtual void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxThreadModule)
+    wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
 
 bool wxThreadModule::OnInit()
 {
diff --git a/src/gtk1/toolbar.cpp b/src/gtk1/toolbar.cpp
index fd7d86a8e6..1324cdda80 100644
--- a/src/gtk1/toolbar.cpp
+++ b/src/gtk1/toolbar.cpp
@@ -140,7 +140,7 @@ protected:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 // ============================================================================
 // implementation
diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp
index eb3840d464..26111af3ff 100644
--- a/src/gtk1/tooltip.cpp
+++ b/src/gtk1/tooltip.cpp
@@ -29,7 +29,7 @@ static GtkTooltips *ss_tooltips = NULL;
 // wxToolTip
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject);
 
 wxToolTip::wxToolTip( const wxString &tip )
 {
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9d5331e008..d36a768d0c 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2412,7 +2412,7 @@ wxMouseState wxGetMouseState()
 // in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
 // method
 #ifdef __WXUNIVERSAL__
-    IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase);
 #endif // __WXUNIVERSAL__
 
 void wxWindowGTK::Init()
@@ -4198,10 +4198,10 @@ public:
     void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWinModule)
+    wxDECLARE_DYNAMIC_CLASS(wxWinModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule);
 
 bool wxWinModule::OnInit()
 {
diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index 27ca831d8b..74d1608c69 100644
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -909,7 +909,7 @@ wxString wxChmFSHandler::FindNext()
 
 class wxChmSupportModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxChmSupportModule)
+    wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule);
 
 public:
     virtual bool OnInit()
@@ -921,6 +921,6 @@ public:
 }
 ;
 
-IMPLEMENT_DYNAMIC_CLASS(wxChmSupportModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxChmSupportModule, wxModule);
 
 #endif // wxUSE_LIBMSPACK
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 390260f672..1d19b0dd4a 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -37,7 +37,7 @@
 FORCE_LINK(wxhtml_chm_support)
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase);
 
 wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
     wxHelpControllerBase(parentWindow)
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 35d05228e8..4c6e3ed178 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -260,7 +260,7 @@ wxString wxHtmlHelpDataItem::GetIndentedName() const
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject);
 
 wxHtmlHelpData::wxHtmlHelpData()
 {
diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp
index e92f95d1a9..aa76fcd5f1 100644
--- a/src/html/helpdlg.cpp
+++ b/src/html/helpdlg.cpp
@@ -36,11 +36,11 @@
 #include "wx/html/helpctrl.h"
 #include "wx/artprov.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpDialog, wxDialog);
 
-BEGIN_EVENT_TABLE(wxHtmlHelpDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxHtmlHelpDialog, wxDialog)
     EVT_CLOSE(wxHtmlHelpDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxHtmlHelpDialog::wxHtmlHelpDialog(wxWindow* parent, wxWindowID id, const wxString& title,
                                  int style, wxHtmlHelpData* data)
diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 69694cfad4..bf3f897496 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -55,9 +55,9 @@
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame);
 
-BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
 #ifdef __WXMAC__
@@ -65,7 +65,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
     EVT_MENU(wxID_HELP_CONTENTS, wxHtmlHelpFrame::OnAbout)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
                                  int style, wxHtmlHelpData* data
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 73cab4a4cc..2a593b0801 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -202,9 +202,9 @@ void wxHtmlHelpWindow::UpdateMergedIndex()
 // wxHtmlHelpWindow
 //---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpWindow, wxWindow);
 
-BEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
     EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpWindow::OnToolbar)
     EVT_BUTTON(wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpWindow::OnToolbar)
     EVT_BUTTON(wxID_HTML_BOOKMARKSADD, wxHtmlHelpWindow::OnToolbar)
@@ -218,7 +218,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
     EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpWindow::OnIndexAll)
     EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpWindow::OnBookmarksSel)
     EVT_SIZE(wxHtmlHelpWindow::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxHtmlHelpWindow::wxHtmlHelpWindow(wxWindow* parent, wxWindowID id,
                                     const wxPoint& pos,
@@ -1283,14 +1283,14 @@ public:
         UpdateTestWin();
     }
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog);
 };
 
-BEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
     EVT_COMBOBOX(wxID_ANY, wxHtmlHelpWindowOptionsDialog::OnUpdate)
     EVT_SPINCTRL(wxID_ANY, wxHtmlHelpWindowOptionsDialog::OnUpdateSpin)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxHtmlHelpWindow::OptionsDialog()
 {
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index dc3a4a93dd..ee86cbbf8c 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -73,7 +73,7 @@ GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject);
 
 wxHtmlCell::wxHtmlCell() : wxObject()
 {
@@ -291,7 +291,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell);
 
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell()
 {
@@ -639,7 +639,7 @@ wxString wxHtmlWordWithTabsCell::GetPartAsText(int begin, int end) const
 // wxHtmlContainerCell
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell);
 
 wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell()
 {
@@ -1423,7 +1423,7 @@ void wxHtmlContainerCell::RemoveExtraSpacing(bool top, bool bottom)
 // wxHtmlColourCell
 // --------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell);
 
 void wxHtmlColourCell::Draw(wxDC& dc,
                             int x, int y,
@@ -1477,7 +1477,7 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
 // wxHtmlFontCell
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell);
 
 void wxHtmlFontCell::Draw(wxDC& dc,
                           int WXUNUSED(x), int WXUNUSED(y),
@@ -1504,7 +1504,7 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
 // wxHtmlWidgetCell
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell);
 
 wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 {
diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 6b3e0aab7e..763c7e7f3b 100644
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -34,13 +34,13 @@ extern WXDLLEXPORT_DATA(const char) wxWebKitCtrlNameStr[] = "webkitctrl";
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl);
 
-BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
     EVT_SIZE(wxWebKitCtrl::OnSize)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #if defined(__WXOSX__) && wxOSX_USE_CARBON
 
@@ -280,7 +280,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebKitCtrlEventHandler )
 // wxWebKit Events
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxWebKitStateChangedEvent, wxCommandEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitStateChangedEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent );
 
@@ -294,7 +294,7 @@ wxWebKitStateChangedEvent::wxWebKitStateChangedEvent( wxWindow* win )
     }
 }
 
-IMPLEMENT_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent, wxCommandEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitBeforeLoadEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent );
 
@@ -310,7 +310,7 @@ wxWebKitBeforeLoadEvent::wxWebKitBeforeLoadEvent( wxWindow* win )
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxWebKitNewWindowEvent, wxCommandEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitNewWindowEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );
 
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 65c54439ef..ffbe1b4b14 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -39,14 +39,14 @@ There is code for several default filters:
 
 */
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject);
 
 //--------------------------------------------------------------------------------
 // wxHtmlFilterPlainText
 //          filter for text/plain or uknown
 //--------------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter);
 
 bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
 {
@@ -81,14 +81,14 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
 
 class wxHtmlFilterImage : public wxHtmlFilter
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterImage);
 
     public:
         virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
         virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter);
 
 
 
@@ -114,7 +114,7 @@ wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
 //--------------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter);
 
 bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
 {
@@ -188,7 +188,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
 
 class wxHtmlFilterModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterModule);
 
     public:
         virtual bool OnInit() wxOVERRIDE
@@ -200,6 +200,6 @@ class wxHtmlFilterModule : public wxModule
         virtual void OnExit() wxOVERRIDE {}
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule);
 
 #endif
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index d0663f5d59..3b7e355c52 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -73,7 +73,7 @@ public:
 // wxHtmlParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlParser,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlParser,wxObject);
 
 wxHtmlParser::wxHtmlParser()
     : wxObject(),
@@ -412,7 +412,7 @@ wxString wxHtmlParser::GetInnerSource(const wxHtmlTag& tag)
 // wxHtmlTagHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler, wxObject);
 
 void wxHtmlTagHandler::ParseInnerSource(const wxString& source)
 {
@@ -428,7 +428,7 @@ void wxHtmlTagHandler::ParseInnerSource(const wxString& source)
 // wxHtmlEntitiesParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser, wxObject);
 
 wxHtmlEntitiesParser::wxHtmlEntitiesParser()
 #if !wxUSE_UNICODE
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index e1bae28e2c..a92a4c11c6 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -39,8 +39,8 @@
 //#define DEBUG_HTML_SELECTION
 
 // HTML events:
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent);
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent);
 
 wxDEFINE_EVENT( wxEVT_HTML_CELL_CLICKED, wxHtmlCellEvent );
 wxDEFINE_EVENT( wxEVT_HTML_CELL_HOVER, wxHtmlCellEvent );
@@ -1683,7 +1683,7 @@ void wxHtmlWindow::SelectAll()
 
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor, wxObject);
 
 wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
 /*
@@ -1700,9 +1700,9 @@ wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
 
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow, "wx/html/htmlwin.h");
 
-BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
+wxBEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_SIZE(wxHtmlWindow::OnSize)
     EVT_LEFT_DOWN(wxHtmlWindow::OnMouseDown)
     EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
@@ -1719,7 +1719,7 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
     EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)
     EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent)
 #endif // wxUSE_CLIPBOARD
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------
 // wxHtmlWindowInterface implementation in wxHtmlWindow
@@ -1847,14 +1847,14 @@ void wxHtmlWindow::SetDefaultHTMLCursor(HTMLCursor type, const wxCursor& cursor)
 
 class wxHtmlWinModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlWinModule);
 public:
     wxHtmlWinModule() : wxModule() {}
     bool OnInit() wxOVERRIDE { return true; }
     void OnExit() wxOVERRIDE { wxHtmlWindow::CleanUpStatics(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule);
 
 
 // This hack forces the linker to always link in m_* files
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index f8ca3b458a..b8b860a5fc 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -832,14 +832,14 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
 
 class wxHtmlPrintingModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule);
 public:
     wxHtmlPrintingModule() : wxModule() {}
     bool OnInit() wxOVERRIDE { return true; }
     void OnExit() wxOVERRIDE { wxHtmlPrintout::CleanUpStatics(); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule);
 
 
 // This hack forces the linker to always link in m_* files
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 9973cf19a5..ac5c5ecfbe 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -33,7 +33,7 @@
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser);
 
 wxList wxHtmlWinParser::m_Modules;
 
@@ -742,7 +742,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 // wxHtmlWinTagHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler)
+wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler);
 
 void wxHtmlWinTagHandler::ApplyStyle(const wxHtmlStyleParams &styleParams)
 {
@@ -861,7 +861,7 @@ void wxHtmlWinTagHandler::ApplyStyle(const wxHtmlStyleParams &styleParams)
 //     Do not add any winpars.cpp shutdown or initialization code to it,
 //     create a new module instead!
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule);
 
 bool wxHtmlTagsModule::OnInit()
 {
diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index d25b4c145f..8d11d20902 100644
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -20,7 +20,7 @@
 
 #include <ctype.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject);
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index b785132058..cb9716b4e0 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -65,7 +65,7 @@ extern bool wxAddIdleCallback();
 
 wxHashTable *wxWidgetHashTable = NULL;
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 
 extern "C"
 {
diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index ff8b335252..a61b461aeb 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -216,7 +216,7 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 #if wxUSE_TOGGLEBTN
 
 wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 
 bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
                              const wxString& label,
diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 9076a79c77..02e415c9bc 100644
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -33,8 +33,8 @@
 
 // define event table
 // ------------------
-BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+wxEND_EVENT_TABLE()
 
 // control creation
 // ----------------
diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 5012aff26f..002f063229 100644
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -185,7 +185,7 @@ static void wxClipboardCallback( Widget widget, long* data_id,
 #endif // Less/Motif
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 89ca39db56..ee931e6534 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -28,10 +28,10 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow);
 
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxControl, wxWindow)
+wxEND_EVENT_TABLE()
 
 // Item members
 wxControl::wxControl()
diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index d9e4623fa9..ba23046ea7 100644
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -69,7 +69,7 @@ private:
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject);
 
 wxCursorRefData::wxCursorRefData()
 {
diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index e053afa29f..c4ba143e54 100644
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -18,7 +18,7 @@
 
 #include "wx/motif/dc.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxMotifDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMotifDCImpl, wxDCImpl);
 
 //-----------------------------------------------------------------------------
 // wxMotifDCImpl
diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index f5292a17e7..2f401b0a35 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -79,9 +79,9 @@ static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti;
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl)
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxMotifDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl);
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxMotifDCImpl);
 
 #define IS_HATCH(s)    ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
 
diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 5c27de3022..627498185d 100644
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -33,7 +33,7 @@
 // wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl);
 
 void wxMemoryDCImpl::Init()
 {
diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 6363bb8cec..7b15a3ae07 100644
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -29,7 +29,7 @@
 #include "wx/motif/private.h"
 #include "wx/motif/dcscreen.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
 WXWindow wxScreenDCImpl::sm_overlayWindow = 0;
 int wxScreenDCImpl::sm_overlayWindowX = 0;
diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 2b0296ea92..fdeea03c2f 100644
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -405,10 +405,10 @@ public:
         close( idleFds[1] );
     }
 private:
-    DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
+    wxDECLARE_DYNAMIC_CLASS(wxIdlePipeModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
 
 static void wxInputCallback( XtPointer, int* fd, XtInputId* )
 {
diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index ede29a20b7..c87c141d1d 100644
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -43,7 +43,7 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+wxIMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase);
 
 #define DEFAULT_FILE_SELECTOR_SIZE 0
 // Let Motif defines the size of File
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index be67bd55c9..c1f87b4f1e 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -85,10 +85,10 @@ extern wxList wxModelessWindows;
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+wxBEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_ACTIVATE(wxFrame::OnActivate)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp
index 2b91c78020..fb642c5c58 100644
--- a/src/motif/icon.cpp
+++ b/src/motif/icon.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/icon.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
 
 // ============================================================================
 // Icons
diff --git a/src/motif/minifram.cpp b/src/motif/minifram.cpp
index f118c711ee..c2cd49fecd 100644
--- a/src/motif/minifram.cpp
+++ b/src/motif/minifram.cpp
@@ -15,6 +15,6 @@
 
 #include "wx/minifram.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 #endif // wxUSE_MINIFRAME
diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index b26430c4c4..c76621597e 100644
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -46,7 +46,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+    wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 // ============================================================================
 // implementation
diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index fff613adb6..19be780c42 100644
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -38,7 +38,7 @@
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
                     XmToggleButtonCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 // Radio box item
 void wxRadioBox::Init()
diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 1475196058..32f417d8c5 100644
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -35,8 +35,8 @@
 
 static void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs);
 
-BEGIN_EVENT_TABLE(wxSlider, wxControl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxSlider, wxControl)
+wxEND_EVENT_TABLE()
 
 
 
diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index be5679b748..a9b9e1666c 100644
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -28,9 +28,9 @@
 
 #include "wx/motif/private.h"
 
-BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxXmSizeKeeper
diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 7455453a4c..bba69ffa65 100644
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -58,9 +58,9 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
-    BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
-        EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
-        EVT_CHAR(wxTextCtrl::OnChar)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+    EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+    EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
@@ -74,7 +74,7 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
-    END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index c5c2da0ac5..9877f2b197 100644
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -49,7 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 // ----------------------------------------------------------------------------
 // private functions
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 6da1631f93..c29f053997 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -131,9 +131,9 @@ static int str16len(const char *s)
 // event tables
 // ----------------------------------------------------------------------------
 
-    BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
-        EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-    END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
+    EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index fbe5d7494f..db0884b7e2 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -34,7 +34,7 @@
 #include "wx/msw/private.h"
 #include "wx/msw/private/keyboard.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject);
 
 // ----------------------------------------------------------------------------
 // data defining wxAcceleratorTable
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 7c3cf95c65..8ce6c3928f 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -582,13 +582,13 @@ int wxApp::m_nCmdShow = SW_SHOWNORMAL;
 // wxWin macros
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
 // fails
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 5603227e7a..8000f7c478 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -154,10 +154,10 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 42eddf7fd4..cf16308670 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -53,9 +53,9 @@
 // macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
+wxBEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
     EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 /*
 TODO PROPERTIES :
diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index f6d7ea5022..deec1e3182 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -47,12 +47,12 @@
 // ============================================================================
 
 
-BEGIN_EVENT_TABLE(wxBitmapComboBox, wxComboBox)
+wxBEGIN_EVENT_TABLE(wxBitmapComboBox, wxComboBox)
     EVT_SIZE(wxBitmapComboBox::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBox, wxComboBox);
 
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index e0311972b0..8a1e4b850c 100644
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -78,7 +78,7 @@ private:
 // wxBrushRefData implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject);
 
 // ----------------------------------------------------------------------------
 // wxBrushRefData ctors/dtor
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index c7c463261d..02d13c0bcc 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -61,9 +61,9 @@
 // macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
+wxBEGIN_EVENT_TABLE(wxButton, wxButtonBase)
     EVT_CHAR_HOOK(wxButton::OnCharHook)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 36484a73a9..bd9efd6be4 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -168,10 +168,10 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
 // define event table
 // ------------------
-BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+wxBEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
   EVT_KEY_DOWN(wxCheckListBox::OnKeyDown)
   EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // control creation
 // ----------------
diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 81bfd9281f..5de9181b38 100644
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -519,7 +519,7 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 // wxClipboard
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index fca709586b..4d096c5004 100644
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -55,7 +55,7 @@ static wxRect gs_rectDialog(0, 0, 222, 324);
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index d10aa0e7f9..ad13cf491e 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -128,16 +128,16 @@
 // ============================================================================
 
 
-BEGIN_EVENT_TABLE(wxComboCtrl, wxComboCtrlBase)
+wxBEGIN_EVENT_TABLE(wxComboCtrl, wxComboCtrlBase)
     EVT_PAINT(wxComboCtrl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxComboCtrl::OnMouseEvent)
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
     EVT_TIMER(wxID_ANY, wxComboCtrl::OnTimerEvent)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxComboCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxComboCtrlBase);
 
 void wxComboCtrl::Init()
 {
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index f317ca3c01..6ea8113202 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -53,7 +53,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_MENU(wxID_CUT, wxComboBox::OnCut)
     EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
     EVT_MENU(wxID_PASTE, wxComboBox::OnPaste)
@@ -69,7 +69,7 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
     EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // function prototypes
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d76e91ebef..3f39d83901 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -60,7 +60,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow);
 
 // ============================================================================
 // wxControl implementation
diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 9e1e69eb85..d0c26c0702 100644
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -78,7 +78,7 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject);
 
 // ----------------------------------------------------------------------------
 // globals
diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 987edd1fd8..916fbb37a8 100644
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -37,7 +37,7 @@
 #include "wx/datectrl.h"
 #include "wx/dateevt.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index d22e7c02c3..b60101a40b 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -102,7 +102,7 @@ using namespace wxMSWImpl;
     #define WXMICROWIN_CHECK_HDC_RET(x)
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl);
 
 // ---------------------------------------------------------------------------
 // constants
@@ -204,10 +204,10 @@ public:
     virtual void OnExit() { wxMSIMG32DLL.Unload(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule);
 
 } // namespace wxMSWImpl
 
@@ -2731,10 +2731,10 @@ public:
     virtual void OnExit() { wxMSWDCImpl::ClearCache(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDCModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDCModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule);
 
 #endif // wxUSE_DC_CACHEING
 
diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index f8486aa92a..7307271fee 100644
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -156,7 +156,7 @@ PaintDCInfos gs_PaintDCInfos;
 // wxMSWWindowDCImpl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxMSWDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxMSWDCImpl);
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) :
    wxMSWDCImpl( owner )
@@ -199,7 +199,7 @@ void wxWindowDCImpl::DoGetSize(int *width, int *height) const
 // wxClientDCImpl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl( wxDC *owner ) :
    wxWindowDCImpl( owner )
@@ -259,7 +259,7 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 // wxPaintDCImpl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl);
 
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) :
    wxClientDCImpl( owner )
@@ -363,7 +363,7 @@ public:
 };
 
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCEx,wxPaintDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCEx, wxPaintDC);
 
 wxPaintDCEx::wxPaintDCEx(wxWindow *window, WXHDC dc)
            : wxPaintDC(new wxPaintDCExImpl(this, window, dc))
diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 018c5fa8c5..d19e6acc16 100644
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -37,7 +37,7 @@
 // wxMemoryDCImpl
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl);
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
         : wxMSWDCImpl( owner )
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 99b28328f5..82788ad364 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -66,7 +66,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp
index 755a59263f..397a227641 100644
--- a/src/msw/dcscreen.cpp
+++ b/src/msw/dcscreen.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/msw/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxMSWDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxMSWDCImpl);
 
 // Create a DC representing the whole screen
 wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index f11a849208..fab3b529be 100644
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -129,17 +129,17 @@ public:
     void OnExit() { wxDDECleanUp(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDDEModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDDEModule);
 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxClientBase)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEConnection, wxConnectionBase)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxServerBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxClientBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxDDEConnection, wxConnectionBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxDDEModule, wxModule);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index 63e0f0ced8..61988328a9 100644
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -301,10 +301,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDialUpManagerModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDialUpManagerModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialUpManagerModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDialUpManagerModule, wxModule);
 
 // ----------------------------------------------------------------------------
 // private functions
diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 223bc85464..900a5ca097 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -164,7 +164,7 @@ DEFINE_GUID(IID_IFileDialog,
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxDirDialog, wxDialog);
 
 // ----------------------------------------------------------------------------
 // private functions prototypes
diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index a5f6899b47..f4f135d008 100644
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -58,7 +58,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDragImage, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDragImage, wxObject);
 
 #define GetHimageList() ((HIMAGELIST) m_hImageList)
 
diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index a049016907..a0304693d0 100644
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -43,7 +43,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject);
 
 // ----------------------------------------------------------------------------
 // macros
@@ -333,7 +333,7 @@ wxEnhMetaFileDCImpl::~wxEnhMetaFileDCImpl()
 // wxEnhMetaFileDC
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)
+wxIMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC);
 
 wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
                                  int width, int height,
diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 621b782c0b..374c3342ab 100644
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -46,7 +46,7 @@ UINT_PTR CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFindReplaceDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFindReplaceDialog, wxDialog);
 
 // ----------------------------------------------------------------------------
 // wxFindReplaceDialogImpl: the internals of wxFindReplaceDialog
diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 002be5a5d7..07f592052c 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -74,7 +74,7 @@ static wxRect gs_rectDialog(0, 0, 428, 266);
 // implementation
 // ============================================================================
 
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+wxIMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase);
 
 // ----------------------------------------------------------------------------
 
diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 13c1dc1f69..36bdbd181b 100644
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -43,7 +43,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index db34ad48ff..d279fa6bce 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -78,9 +78,9 @@
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+wxBEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 7fe0731c3c..cca2b904c7 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -85,7 +85,7 @@ public:
                           const wxPalette *palette = NULL) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBMPFileHandler);
 };
 
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
@@ -102,7 +102,7 @@ public:
                           int desiredWidth, int desiredHeight);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxBMPResourceHandler);
 };
 
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
@@ -163,7 +163,7 @@ protected:
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxICOFileHandler);
 };
 
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
@@ -181,7 +181,7 @@ protected:
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxICOResourceHandler);
 };
 
 #if wxUSE_PNG_RESOURCE_HANDLER
@@ -209,12 +209,12 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler);
+wxIMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler);
+wxIMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject);
 #if wxUSE_PNG_RESOURCE_HANDLER
-IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler);
 #endif // wxUSE_PNG_RESOURCE_HANDLER
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index 97751b41bd..00897230cb 100644
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -864,10 +864,10 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit() { wxGdiPlus::Terminate(); }
 
-    DECLARE_DYNAMIC_CLASS(wxGdiPlusModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGdiPlusModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxGdiPlusModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGdiPlusModule, wxModule);
 
 // ============================================================================
 // implementation of the functions themselves
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index 58a3658c7c..733f01aa6e 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -149,7 +149,7 @@ typedef HGLRC(WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC)
 // wxGLContext
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLContext, wxObject)
+wxIMPLEMENT_CLASS(wxGLContext, wxObject);
 
 // The window will always be created first so the array will be initialized
 // and then the window will be assigned to the context.
@@ -219,14 +219,14 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 // wxGLCanvas
 // ============================================================================
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
-BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
+wxBEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
 #if wxUSE_PALETTE
     EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged)
     EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxGLCanvas construction
diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index a722619d0d..6952aee636 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -594,7 +594,7 @@ private :
     int m_loaded;
     ULONG_PTR m_gditoken;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer);
 } ;
 
 //-----------------------------------------------------------------------------
@@ -1988,7 +1988,7 @@ wxGDIPlusPrintingContext::wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer
 // wxGDIPlusRenderer implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRenderer,wxGraphicsRenderer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRenderer, wxGraphicsRenderer);
 
 static wxGDIPlusRenderer gs_GDIPlusRenderer;
 
@@ -2344,10 +2344,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule)
+    wxDECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRendererModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRendererModule, wxModule);
 
 // ----------------------------------------------------------------------------
 // wxMSW-specific parts of wxGCDC
diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index c929e7b78f..b509e7e4ca 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -3436,14 +3436,14 @@ private:
     wxCOMPtr<ID2D1Factory> m_direct2dFactory;
 
 private :
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxD2DRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxD2DRenderer);
 };
 
 //-----------------------------------------------------------------------------
 // wxD2DRenderer implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxD2DRenderer,wxGraphicsRenderer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxD2DRenderer,wxGraphicsRenderer);
 
 static wxD2DRenderer *gs_D2DRenderer = NULL;
 
diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index f9f811c6b9..0254261610 100644
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -28,7 +28,7 @@
 #include "wx/html/helpctrl.h"
 #include "wx/msw/helpbest.h"
 
-IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase )
+wxIMPLEMENT_DYNAMIC_CLASS(wxBestHelpController, wxHelpControllerBase);
 
 bool wxBestHelpController::Initialize( const wxString& filename )
 {
diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 8fa798a2a5..a819a28458 100644
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -79,7 +79,7 @@ static HWND GetSuitableHWND(wxWindow *win)
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxCHMHelpController, wxHelpControllerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCHMHelpController, wxHelpControllerBase);
 
 bool wxCHMHelpController::Initialize(const wxString& filename)
 {
diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index 766749edf4..9b177bbff3 100644
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -41,7 +41,7 @@ static HWND GetSuitableHWND(wxWinHelpController* controller)
         return GetDesktopWindow();
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase);
 
 bool wxWinHelpController::Initialize(const wxString& filename)
 {
diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 77e72efad4..b0bd252010 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -38,7 +38,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 3cb6b50806..a8d25d5591 100644
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -47,7 +47,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject);
 
 #define GetHImageList()     ((HIMAGELIST)m_hImageList)
 
diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index 27d11305ec..34748ac826 100644
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -47,7 +47,7 @@
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase);
 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,
diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index cad58c7c35..c51eb033d3 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -37,7 +37,7 @@
 
 #include <regstr.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject);
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b94db2a626..3615fe3cbc 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -225,10 +225,10 @@ public:
     wxDECLARE_NO_COPY_CLASS(wxMSWListItemData);
 };
 
-BEGIN_EVENT_TABLE(wxListCtrl, wxListCtrlBase)
+wxBEGIN_EVENT_TABLE(wxListCtrl, wxListCtrlBase)
     EVT_PAINT(wxListCtrl::OnPaint)
     EVT_CHAR_HOOK(wxListCtrl::OnCharHook)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 705c9af788..5ad9d71491 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -116,11 +116,11 @@ inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame)
 // wxWin macros
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow);
 
-BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
     EVT_SIZE(wxMDIParentFrame::OnSize)
     EVT_ICONIZE(wxMDIParentFrame::OnIconized)
@@ -132,15 +132,15 @@ BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_MENU_RANGE(wxID_MDI_WINDOW_FIRST, wxID_MDI_WINDOW_LAST,
                    wxMDIParentFrame::OnMDICommand)
 #endif // wxUSE_MENUS
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_IDLE(wxMDIChildFrame::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
+wxBEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
     EVT_SCROLL(wxMDIClientWindow::OnScroll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ===========================================================================
 // wxMDIParentFrame: the frame which contains the client window which manages
diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 488c770847..38eefa3503 100644
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -1479,7 +1479,7 @@ public:
     wxEvtHandler* m_evthandler;
 
     friend class wxAMMediaEvtHandler;
-    DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxAMMediaBackend);
 };
 
 class WXDLLIMPEXP_MEDIA wxAMMediaEvtHandler : public wxEvtHandler
@@ -1515,7 +1515,7 @@ private:
 //
 //---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAMMediaBackend, wxMediaBackend);
 
 //---------------------------------------------------------------------------
 // Usual debugging macros
diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index a746e3d328..845726352e 100644
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -407,7 +407,7 @@ public:
 
     friend class wxQTMediaEvtHandler;
 
-    DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
 };
 
 // helper to hijack background erasing for the QT window
@@ -448,7 +448,7 @@ private:
 // with this backend are treated as playable anyway - not verified though.
 //---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
+wxIMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 // Time between timer calls - this is the Apple recommendation to the TCL
 // team I believe
diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index 4e6d24fc08..a44bc8896f 100644
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -671,7 +671,7 @@ public:
     wxEvtHandler* m_evthandler;
 
     friend class wxWMP10MediaEvtHandler;
-    DECLARE_DYNAMIC_CLASS(wxWMP10MediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxWMP10MediaBackend);
 };
 
 #ifndef WXTEST_ATL
@@ -707,7 +707,7 @@ private:
 //
 //---------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxWMP10MediaBackend, wxMediaBackend)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWMP10MediaBackend, wxMediaBackend);
 
 //---------------------------------------------------------------------------
 // wxWMP10MediaBackend Constructor
diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 15a2caf97c..88fec4ee37 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -43,8 +43,8 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 482ae71d86..fc7e9c8568 100644
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -19,6 +19,6 @@
 
 #include "wx/minifram.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 #endif // wxUSE_MINIFRAME
diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index a234d065ab..791417647e 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -62,7 +62,7 @@
 
 using namespace wxMSWMessageDialog;
 
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 #if wxUSE_MSGBOX_HOOK
 
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index b5df68f331..6bc92fa957 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -116,7 +116,7 @@ static bool HasTroubleWithNonTopTabs()
 // event table
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 
@@ -124,7 +124,7 @@ BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
     EVT_PAINT(wxNotebook::OnPaint)
 #endif // USE_NOTEBOOK_ANTIFLICKER
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index faa896b019..a18c6fa139 100644
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -111,7 +111,7 @@ private:
 // wxPalette
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject);
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 7d593500ca..a41e4ddf83 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -425,7 +425,7 @@ WXHPEN wxPenRefData::GetHPEN() const
 // wxPen
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 wxPen::wxPen(const wxColour& col, int width, wxPenStyle style)
 {
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 629df49c74..21aacf9d35 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -167,7 +167,7 @@ wxCreateDevNames(const wxString& driverName,
     return hDev;
 }
 
-IMPLEMENT_CLASS(wxWindowsPrintNativeData, wxPrintNativeDataBase)
+wxIMPLEMENT_CLASS(wxWindowsPrintNativeData, wxPrintNativeDataBase);
 
 wxWindowsPrintNativeData::wxWindowsPrintNativeData()
 {
@@ -700,7 +700,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 // wxPrintDialog
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxWindowsPrintDialog, wxPrintDialogBase)
+wxIMPLEMENT_CLASS(wxWindowsPrintDialog, wxPrintDialogBase);
 
 wxWindowsPrintDialog::wxWindowsPrintDialog(wxWindow *p, wxPrintDialogData* data)
 {
@@ -929,7 +929,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
 // wxWidnowsPageSetupDialog
 // ---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase)
+wxIMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase);
 
 wxWindowsPageSetupDialog::wxWindowsPageSetupDialog()
 {
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 6929bbfe39..2e4856ea74 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -63,8 +63,8 @@ BOOL CALLBACK wxAbortProc(HDC hdc, int error);
 // wxWin macros
 // ---------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-    IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase);
+    wxIMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase);
 
 // ===========================================================================
 // implementation
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 1f9132b627..f2466ed419 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -77,7 +77,7 @@ wxBEGIN_FLAGS( wxRadioBoxStyle )
     wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
 wxEND_FLAGS( wxRadioBoxStyle )
 
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl, "wx/radiobox.h");
 
 wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
     wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent )
@@ -85,7 +85,7 @@ wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
 wxEND_PROPERTIES_TABLE()
 
 #else
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 #endif
 
 /*
diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 3cfe6583b7..90f977f577 100644
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -64,7 +64,7 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, wxMemoryBuffer &plVal
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxRegConfig, wxConfigBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxRegConfig, wxConfigBase);
 
 // create the config object which stores its data under HKCU\vendor\app and, if
 // style & wxCONFIG_USE_GLOBAL_FILE, under HKLM\vendor\app
diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 846fff1e85..b1dff4e946 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -31,8 +31,8 @@
 
 #include "wx/msw/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData implementation
diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index a209563f73..e7355c8631 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -55,7 +55,7 @@ public:
     virtual void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+    wxDECLARE_DYNAMIC_CLASS(wxSystemSettingsModule);
 };
 
 // ----------------------------------------------------------------------------
@@ -81,7 +81,7 @@ static wxFont *gs_fontDefault = NULL;
 // wxSystemSettingsModule
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule);
 
 bool wxSystemSettingsModule::OnInit()
 {
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 4623cacc96..f2eece9f36 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -47,11 +47,11 @@
 // macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
+wxBEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
     EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
     EVT_KILL_FOCUS(wxSpinCtrl::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
 
diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index ca6e5f8c4d..f5d9fd1368 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -66,7 +66,7 @@ static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index 295ddab84f..fd44b63bb8 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -597,7 +597,7 @@ private:
 // ----------------------------------------------------------------------------
 // wxThumbBarButton Implementation.
 // ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxThumbBarButton, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThumbBarButton, wxObject);
 
 wxThumbBarButton::wxThumbBarButton(int id,
                                    const wxIcon& icon,
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index de6f1db7ec..cd826e323a 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -136,7 +136,7 @@ private:
     static bool             ms_inkEditLibLoadAttemped;
 #endif
 
-    DECLARE_DYNAMIC_CLASS(wxRichEditModule)
+    wxDECLARE_DYNAMIC_CLASS(wxRichEditModule);
 };
 
 HINSTANCE wxRichEditModule::ms_hRichEdit[Version_Max] = { NULL, NULL, NULL };
@@ -146,7 +146,7 @@ wxDynamicLibrary wxRichEditModule::ms_inkEditLib;
 bool             wxRichEditModule::ms_inkEditLibLoadAttemped = false;
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule);
 
 #if wxUSE_OLE
 
@@ -270,7 +270,7 @@ wxStack<int> gs_lenOfInsertedText;
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
@@ -292,7 +292,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
 
     EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index ed34387b03..cd83ea9613 100644
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -54,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
                 const wxBitmap& label,const wxPoint& pos, const wxSize& size, long style,
@@ -83,7 +83,7 @@ bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
 // wxToggleButton
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 
 void wxToggleButton::Init()
 {
diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 5074f9c104..2e669709ee 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -1222,10 +1222,10 @@ public:
     virtual void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxThreadModule)
+    wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
 
 bool wxThreadModule::OnInit()
 {
diff --git a/src/msw/timectrl.cpp b/src/msw/timectrl.cpp
index 1a39cb4cdf..7469e12c3c 100644
--- a/src/msw/timectrl.cpp
+++ b/src/msw/timectrl.cpp
@@ -30,7 +30,7 @@
 #include "wx/timectrl.h"
 #include "wx/dateevt.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimePickerCtrl, wxControl);
 
 // ============================================================================
 // wxTimePickerCtrl implementation
diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index ba7ed1cd9c..7b335d64f1 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -99,10 +99,10 @@ private:
     // the class used to create it
     static const wxChar *ms_className;
 
-    DECLARE_DYNAMIC_CLASS(wxTimerHiddenWindowModule)
+    wxDECLARE_DYNAMIC_CLASS(wxTimerHiddenWindowModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimerHiddenWindowModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimerHiddenWindowModule, wxModule);
 
 // ============================================================================
 // implementation
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 489c2de407..1630ef47cf 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -102,7 +102,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 /*
     TOOLBAR PROPERTIES
@@ -123,11 +123,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
         dontattachtoframe
 */
 
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+wxBEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
     EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // private classes
diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 1ca0a44200..a5e7404251 100644
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -343,7 +343,7 @@ void wxToolTip::RelayEvent(WXMSG *msg)
 // ctor & dtor
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject);
 
 wxToolTip::wxToolTip(const wxString &tip)
          : m_text(tip)
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 58a9c1c675..e39f4106a1 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -101,18 +101,18 @@ private:
     // the class used to create it
     static const wxChar *ms_className;
 
-    DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
+    wxDECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule);
 
 // ============================================================================
 // wxTopLevelWindowMSW implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxTopLevelWindowMSW, wxTopLevelWindowBase)
+wxBEGIN_EVENT_TABLE(wxTopLevelWindowMSW, wxTopLevelWindowBase)
     EVT_ACTIVATE(wxTopLevelWindowMSW::OnActivate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW creation
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 42e041216d..038293121e 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -2165,7 +2165,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     // default behaviour, i.e. sorts items alphabetically and so call it
     // directly if we're not in derived class (much more efficient!)
     // RN: Note that if you find you're code doesn't sort as expected this
-    //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
+    //     may be why as if you don't use the wxDECLARE_CLASS/wxIMPLEMENT_CLASS
     //     combo for your derived wxTreeCtrl if will sort without
     //     OnCompareItems
     if ( GetClassInfo() == wxCLASSINFO(wxTreeCtrl) )
diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 75febe2704..ad933ffcfb 100644
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -48,13 +48,13 @@ public:
 protected:
     wxProtocolError m_error;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxHTTPDummyProto)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxHTTPDummyProto);
     DECLARE_PROTOCOL(wxHTTPDummyProto)
 };
 
 // the only "reason for being" for this class is to tell
 // wxURL that there is someone dealing with the http protocol
-IMPLEMENT_DYNAMIC_CLASS(wxHTTPDummyProto, wxProtocol)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHTTPDummyProto, wxProtocol);
 IMPLEMENT_PROTOCOL(wxHTTPDummyProto, wxT("http"), NULL, false)
 USE_PROTOCOL(wxHTTPDummyProto)
 
diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 5f28d7bf91..c4f8fba548 100644
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -188,10 +188,10 @@ public:
     }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxExecuteModule)
+    wxDECLARE_DYNAMIC_CLASS(wxExecuteModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxExecuteModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxExecuteModule, wxModule);
 
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
 
diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index ee30955555..568110d10b 100644
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -62,10 +62,10 @@ public:
     }
 
 
-    DECLARE_DYNAMIC_CLASS(wxUxThemeModule)
+    wxDECLARE_DYNAMIC_CLASS(wxUxThemeModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxUxThemeModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxUxThemeModule, wxModule);
 
 // ============================================================================
 // wxUxThemeEngine implementation
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 74d1236cb3..b3270fbf68 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -59,10 +59,10 @@ enum //Internal find flags
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
 
-BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
+wxBEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
     EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxWebViewIE::Create(wxWindow* parent,
            wxWindowID id,
diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp
index 6b9fd5e409..311c6c4eb3 100644
--- a/src/msw/wince/checklst.cpp
+++ b/src/msw/wince/checklst.cpp
@@ -41,9 +41,9 @@
 
 // define event table
 // ------------------
-BEGIN_EVENT_TABLE(wxCheckListBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxCheckListBox, wxControl)
     EVT_SIZE(wxCheckListBox::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // control creation
 // ----------------
diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index 19a4a19101..6894fd9cbf 100644
--- a/src/msw/wince/filedlgwce.cpp
+++ b/src/msw/wince/filedlgwce.cpp
@@ -56,7 +56,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxFileDialog, wxDialog);
 
 // ----------------------------------------------------------------------------
 // wxFileDialog
diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 2582360788..bcac5fc77f 100644
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/msw/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase);
 
 bool wxWinceHelpController::Initialize(const wxString& filename)
 {
diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index bb0f99f380..86b4e90892 100644
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -68,10 +68,10 @@
 // Event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolMenuBar, wxToolBar)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolMenuBar, wxToolBar);
 
-BEGIN_EVENT_TABLE(wxToolMenuBar, wxToolBar)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxToolMenuBar, wxToolBar)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -567,10 +567,10 @@ WXLRESULT wxToolMenuBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lP
 // Event table
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase);
 
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+wxEND_EVENT_TABLE()
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
                                          const wxString& label,
diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp
index 1d80a7c3f2..dbc614de12 100644
--- a/src/msw/wince/textctrlce.cpp
+++ b/src/msw/wince/textctrlce.cpp
@@ -42,7 +42,7 @@
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
 
     EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // constants
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index cbd6137337..a61265425b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -347,15 +347,15 @@ void wxGetCursorPosMSW(POINT* pt)
 // in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
 // method
 #ifdef __WXUNIVERSAL__
-    IMPLEMENT_ABSTRACT_CLASS(wxWindowMSW, wxWindowBase)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxWindowMSW, wxWindowBase);
 #endif // __WXUNIVERSAL__
 
-BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
+wxBEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
 #ifdef __WXWINCE__
     EVT_INIT_DIALOG(wxWindowMSW::OnInitDialog)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ===========================================================================
 // implementation
@@ -7506,12 +7506,12 @@ public:
 private:
     static HHOOK ms_hMsgHookProc;
 
-    DECLARE_DYNAMIC_CLASS(wxIdleWakeUpModule)
+    wxDECLARE_DYNAMIC_CLASS(wxIdleWakeUpModule);
 };
 
 HHOOK wxIdleWakeUpModule::ms_hMsgHookProc = 0;
 
-IMPLEMENT_DYNAMIC_CLASS(wxIdleWakeUpModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIdleWakeUpModule, wxModule);
 
 #endif // __WXWINCE__
 
diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index 389f6fb5f2..49ca614533 100644
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -18,7 +18,7 @@
     #include "wx/string.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxAccelList: a list of wxAcceleratorEntries
diff --git a/src/osx/anybutton_osx.cpp b/src/osx/anybutton_osx.cpp
index 8a417aff56..8fc481a544 100644
--- a/src/osx/anybutton_osx.cpp
+++ b/src/osx/anybutton_osx.cpp
@@ -22,10 +22,10 @@
 
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxAnyButton, wxControl)
+wxBEGIN_EVENT_TABLE(wxAnyButton, wxControl)
     EVT_ENTER_WINDOW(wxAnyButton::OnEnterWindow)
     EVT_LEAVE_WINDOW(wxAnyButton::OnLeaveWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxAnyButton::SetLabel(const wxString& label)
 {
diff --git a/src/osx/brush.cpp b/src/osx/brush.cpp
index 296779c8ac..9effab162a 100644
--- a/src/osx/brush.cpp
+++ b/src/osx/brush.cpp
@@ -18,7 +18,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject);
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index a7ee3cc93e..bb7e66c9fc 100644
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -57,12 +57,12 @@
 // Keep linker from discarding wxStockGDIMac
 wxFORCE_LINK_MODULE(gdiobj)
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
+wxBEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxWindow* wxApp::s_captureWindow = NULL ;
diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index 7835430e65..535f5e4cff 100644
--- a/src/osx/carbon/clipbrd.cpp
+++ b/src/osx/carbon/clipbrd.cpp
@@ -37,7 +37,7 @@
 // (there will be a *lot* of them!)
 #define TRACE_CLIPBOARD wxT("clipboard")
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 53f11e0248..fbeb4db8f4 100644
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -18,7 +18,7 @@
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX && wxUSE_COLOURDLG
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog);
 
 #include "wx/osx/private.h"
 
diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index e66fa62e37..a818dde360 100644
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -30,7 +30,7 @@
 //Mac OSX 10.2+ only
 #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX && wxUSE_COLOURDLG
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog);
 
 #include "wx/osx/private.h"
 
diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 301af54dea..263276c4e9 100644
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -140,17 +140,17 @@ protected:
 private:
     wxComboBox *m_cb;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
+wxBEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
     EVT_CHAR(wxComboBoxText::OnChar)
     EVT_KEY_UP(wxComboBoxText::OnKeyUp)
     EVT_SET_FOCUS(wxComboBoxText::OnFocus)
     EVT_KILL_FOCUS(wxComboBoxText::OnFocus)
     EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
@@ -208,12 +208,12 @@ private:
 
     friend class wxComboBox;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
+wxBEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp
index b38c20cc21..e6aaa1857f 100644
--- a/src/osx/carbon/combobxc.cpp
+++ b/src/osx/carbon/combobxc.cpp
@@ -166,12 +166,12 @@ protected:
 private:
     wxComboBox *m_cb;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
+wxBEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
     EVT_CHAR( wxComboBoxText::OnChar)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
@@ -204,12 +204,12 @@ protected:
 private:
     wxComboBox *m_cb;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
+wxBEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 {
diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index fbf5a31ba7..217865ec60 100644
--- a/src/osx/carbon/control.cpp
+++ b/src/osx/carbon/control.cpp
@@ -28,7 +28,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow);
 
 
 wxControl::wxControl()
diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 3828f56b58..fa5e59ed33 100644
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -23,7 +23,7 @@
 #include "wx/osx/private.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject);
 
 
 class WXDLLEXPORT wxCursorRefData: public wxGDIRefData
diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 66781a9e74..d16984af4c 100644
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -800,7 +800,7 @@ OSStatus wxMacDataBrowserTableViewControl::OpenContainer(DataBrowserItemID conta
   return ::OpenDataBrowserContainer(m_controlRef,containerID);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl,wxMacControl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl, wxMacControl);
 
 // ============================================================================
 // wxMacDataBrowserListViewControl
@@ -2337,7 +2337,7 @@ void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDa
   m_NativeDataPtr = newNativeDataPtr;
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase);
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
@@ -2355,7 +2355,7 @@ bool wxDataViewCustomRenderer::MacRender()
   return true;
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
@@ -2374,7 +2374,7 @@ bool wxDataViewTextRenderer::MacRender()
   return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr);
 }
 
-IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
@@ -2399,7 +2399,7 @@ bool wxDataViewBitmapRenderer::MacRender()
   return (!(bitmap.IsOk()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr));
 }
 
-IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
@@ -2429,7 +2429,7 @@ bool wxDataViewIconTextRenderer::MacRender()
   return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer);
 
 
 // ---------------------------------------------------------
@@ -2450,7 +2450,7 @@ bool wxDataViewToggleRenderer::MacRender()
   return (::SetDataBrowserItemDataButtonValue(GetNativeData()->GetItemDataRef(),GetValue().GetBool()) == noErr);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
@@ -2473,7 +2473,7 @@ bool wxDataViewProgressRenderer::MacRender()
           (::SetDataBrowserItemDataValue  (GetNativeData()->GetItemDataRef(),GetValue().GetLong()) == noErr));
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
@@ -2490,7 +2490,7 @@ bool wxDataViewDateRenderer::MacRender()
   return (::SetDataBrowserItemDataDateTime(GetNativeData()->GetItemDataRef(),GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewColumn
diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index 89cd6c9d06..7897dcf023 100644
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -31,7 +31,7 @@
 // wxWindowDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGCDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxGCDCImpl);
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
    : wxGCDCImpl( owner )
@@ -149,7 +149,7 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
  * wxClientDCImpl
  */
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl( wxDC *owner )
  : wxWindowDCImpl( owner )
@@ -182,7 +182,7 @@ wxClientDCImpl::~wxClientDCImpl()
  * wxPaintDCImpl
  */
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl);
 
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
  : wxWindowDCImpl( owner )
diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp
index 4a67ac6ff4..9c4978f843 100644
--- a/src/osx/carbon/dcprint.cpp
+++ b/src/osx/carbon/dcprint.cpp
@@ -29,7 +29,7 @@
 #include "wx/osx/dcprint.h"
 #include "wx/graphics.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl);
 
 class wxNativePrinterDC
 {
diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index 372164545f..df7b09db24 100644
--- a/src/osx/carbon/dcscreen.cpp
+++ b/src/osx/carbon/dcscreen.cpp
@@ -16,7 +16,7 @@
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
 // TODO : for the Screenshot use case, which doesn't work in Quartz
 // we should do a GetAsBitmap using something like
diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp
index b6cc8a45ef..081dc57a5c 100644
--- a/src/osx/carbon/dirdlg.cpp
+++ b/src/osx/carbon/dirdlg.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxDirDialog, wxDialog);
 
 static pascal void NavEventProc(
                                 NavEventCallbackMessage inSelector,
diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp
index 16854bf02a..48f521b0ae 100644
--- a/src/osx/carbon/drawer.cpp
+++ b/src/osx/carbon/drawer.cpp
@@ -19,7 +19,7 @@
 
 #include "wx/osx/carbon/drawer.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow);
 
 // Use constants for now.
 // These can be made into member variables and set dynamically.
diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index fb953d1986..15baf5bc5f 100644
--- a/src/osx/carbon/filedlg.cpp
+++ b/src/osx/carbon/filedlg.cpp
@@ -32,7 +32,7 @@
     #include "PLStringFuncs.h"
 #endif
 
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+wxIMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase);
 
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard
diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index 0c54a9e57a..0c3030dc5a 100644
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -45,7 +45,7 @@
 
 #if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 #include "wx/osx/private.h"
 
@@ -298,12 +298,12 @@ public:
 
 private:
     void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxFontPreviewCtrl, wxWindow)
+wxBEGIN_EVENT_TABLE(wxFontPreviewCtrl, wxWindow)
     EVT_PAINT(wxFontPreviewCtrl::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
@@ -332,7 +332,7 @@ void wxFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
 class wxFontColourSwatchCtrl: public wxControl
 {
-    DECLARE_CLASS(wxFontColourSwatchCtrl)
+    wxDECLARE_CLASS(wxFontColourSwatchCtrl);
 public:
     wxFontColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
     virtual ~wxFontColourSwatchCtrl();
@@ -349,18 +349,18 @@ public:
 protected:
     wxColour    m_colour;
 
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 /*
  * A control for displaying a small preview of a colour or bitmap
  */
 
-BEGIN_EVENT_TABLE(wxFontColourSwatchCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxFontColourSwatchCtrl, wxControl)
     EVT_MOUSE_EVENTS(wxFontColourSwatchCtrl::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_CLASS(wxFontColourSwatchCtrl, wxControl)
+wxIMPLEMENT_CLASS(wxFontColourSwatchCtrl, wxControl);
 
 wxFontColourSwatchCtrl::wxFontColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
     wxControl(parent, id, pos, size, style)
@@ -407,13 +407,13 @@ void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
  * wxFontDialog type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxFontDialog, wxDialog )
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 /*!
  * wxFontDialog event table definition
  */
 
-BEGIN_EVENT_TABLE( wxFontDialog, wxDialog )
+wxBEGIN_EVENT_TABLE( wxFontDialog, wxDialog )
     EVT_LISTBOX( wxID_FONTDIALOG_FACENAME, wxFontDialog::OnFontdialogFacenameSelected )
     EVT_SPINCTRL( wxID_FONTDIALOG_FONTSIZE, wxFontDialog::OnFontdialogFontsizeUpdated )
     EVT_TEXT( wxID_FONTDIALOG_FONTSIZE, wxFontDialog::OnFontdialogFontsizeTextUpdated )
@@ -422,7 +422,7 @@ BEGIN_EVENT_TABLE( wxFontDialog, wxDialog )
     EVT_CHECKBOX( wxID_FONTDIALOG_UNDERLINED, wxFontDialog::OnFontdialogUnderlinedClick )
     EVT_BUTTON( wxID_OK, wxFontDialog::OnOkClick )
     EVT_BUTTON(wxID_FONTDIALOG_COLOUR, wxFontDialog::OnColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 /*!
  * wxFontDialog constructors
diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 2d5b890c53..d92aaf2476 100644
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -230,7 +230,7 @@ int RunMixedFontDialog(wxFontDialog* dialog)
 
 #if USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 // Cocoa headers
 
diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp
index 0308c4bd59..e69d7137b1 100644
--- a/src/osx/carbon/frame.cpp
+++ b/src/osx/carbon/frame.cpp
@@ -25,10 +25,10 @@
 
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+wxBEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
   EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #define WX_MAC_STATUSBAR_HEIGHT 18
 
diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index d17864083d..956a96bb46 100644
--- a/src/osx/carbon/gdiobj.cpp
+++ b/src/osx/carbon/gdiobj.cpp
@@ -34,10 +34,10 @@ public:
 
 private:
     typedef wxStockGDI super;
-    DECLARE_DYNAMIC_CLASS(wxStockGDIMac)
+    wxDECLARE_DYNAMIC_CLASS(wxStockGDIMac);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxStockGDIMac, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStockGDIMac, wxModule);
 
 bool wxStockGDIMac::OnInit()
 {
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 02d899f28d..a85deef19a 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -2634,14 +2634,14 @@ public :
     virtual void GetVersion(int *major, int *minor, int *micro) const wxOVERRIDE;
 
 private :
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer);
 } ;
 
 //-----------------------------------------------------------------------------
 // wxMacCoreGraphicsRenderer implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsRenderer,wxGraphicsRenderer)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsRenderer,wxGraphicsRenderer);
 
 static wxMacCoreGraphicsRenderer gs_MacCoreGraphicsRenderer;
 
diff --git a/src/osx/carbon/helpxxxx.cpp b/src/osx/carbon/helpxxxx.cpp
index 9f87e6754d..7ebb399c62 100644
--- a/src/osx/carbon/helpxxxx.cpp
+++ b/src/osx/carbon/helpxxxx.cpp
@@ -14,7 +14,7 @@
 
 #include <string.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXXXXHelpController, wxHelpControllerBase);
 
 wxXXXXHelpController::wxXXXXHelpController()
 {
diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 9ce67cf895..1137e89e96 100644
--- a/src/osx/carbon/icon.cpp
+++ b/src/osx/carbon/icon.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject);
 
 #define M_ICONDATA ((wxIconRefData *)m_refData)
 
@@ -497,7 +497,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
 
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler);
 
 bool  wxICONResourceHandler::LoadFile(
     wxBitmap *bitmap, const wxString& name, wxBitmapType WXUNUSED(flags),
diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 8275ad0a81..b2ef9072f8 100644
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -256,7 +256,7 @@ void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
     }
 }
 
-IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserListControl , wxMacDataItemBrowserControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacDataBrowserListControl, wxMacDataItemBrowserControl);
 
 wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
     : wxMacDataItemBrowserControl( peer, pos, size, style )
diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index d87a96ee91..e15949fb9d 100644
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -204,7 +204,7 @@ protected:
     wxClientDataType m_clientDataItemsType;
     bool m_isVirtual;
     int m_flags;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListCtrlControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListCtrlControl);
 };
 
 class wxMacListCtrlEventDelegate : public wxEvtHandler
@@ -298,7 +298,7 @@ private:
     bool                m_finished;
     bool                m_aboutToFinish;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 //-----------------------------------------------------------------------------
@@ -319,11 +319,11 @@ void wxListCtrlRenameTimer::Notify()
 // wxListCtrlTextCtrlWrapper (internal)
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxListCtrlTextCtrlWrapper, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxListCtrlTextCtrlWrapper, wxEvtHandler)
     EVT_CHAR           (wxListCtrlTextCtrlWrapper::OnChar)
     EVT_KEY_UP         (wxListCtrlTextCtrlWrapper::OnKeyUp)
     EVT_KILL_FOCUS     (wxListCtrlTextCtrlWrapper::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxListCtrlTextCtrlWrapper::wxListCtrlTextCtrlWrapper(wxListCtrl *owner,
                                              wxTextCtrl *text,
@@ -2527,7 +2527,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
 
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxMacDataBrowserListCtrlControl, wxMacDataItemBrowserControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacDataBrowserListCtrlControl, wxMacDataItemBrowserControl);
 
 wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style)
     : wxMacDataItemBrowserControl( peer, pos, size, style )
diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp
index 9ccc98880a..7b62670775 100644
--- a/src/osx/carbon/mdi.cpp
+++ b/src/osx/carbon/mdi.cpp
@@ -24,14 +24,14 @@
 #include "wx/osx/private.h"
 #include "wx/osx/uma.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow);
 
-BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #define TRACE_MDI "mdi"
 
diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index 9e4b8fa236..7e20e45f41 100644
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -163,7 +163,7 @@ public:
 
     friend class wxQTMediaEvtHandler;
 
-    DECLARE_DYNAMIC_CLASS(wxQTMediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
 };
 
 // helper to hijack background erasing for the QT window
@@ -199,7 +199,7 @@ private:
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend)
+wxIMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 //Time between timer calls - this is the Apple recommondation to the TCL
 //team I believe
diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp
index 844b62e9ec..5232166c38 100644
--- a/src/osx/carbon/metafile.cpp
+++ b/src/osx/carbon/metafile.cpp
@@ -30,9 +30,9 @@
 #include <stdio.h>
 #include <string.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
-IMPLEMENT_ABSTRACT_CLASS(wxMetafileDCImpl, wxGCDCImpl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject);
+wxIMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC);
+wxIMPLEMENT_ABSTRACT_CLASS(wxMetafileDCImpl, wxGCDCImpl);
 
 #define M_METAFILEREFDATA( a ) ((wxMetafileRefData*)(a).GetRefData())
 
diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp
index 7a98a66b81..4c57159db1 100644
--- a/src/osx/carbon/msgdlg.cpp
+++ b/src/osx/carbon/msgdlg.cpp
@@ -22,7 +22,7 @@
 #include "wx/osx/uma.h"
 
 
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp
index 88d3766b31..a5b543d944 100644
--- a/src/osx/carbon/nonownedwnd.cpp
+++ b/src/osx/carbon/nonownedwnd.cpp
@@ -34,7 +34,7 @@
 // unified title and toolbar constant - not in Tiger headers, so we duplicate it here
 #define kWindowUnifiedTitleAndToolbarAttribute (1 << 7)
 
-IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCarbonImpl , wxNonOwnedWindowImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxNonOwnedWindowCarbonImpl , wxNonOwnedWindowImpl);
 
 WXWindow wxNonOwnedWindowCarbonImpl::GetWXWindow() const
 {
diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index 8e9ae8cee1..6d4a38ad40 100644
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -20,8 +20,8 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 #define OSX_USE_SCANLINES 1
 
diff --git a/src/osx/carbon/statbmp.cpp b/src/osx/carbon/statbmp.cpp
index 7a4ed047a5..a3650f2cd2 100644
--- a/src/osx/carbon/statbmp.cpp
+++ b/src/osx/carbon/statbmp.cpp
@@ -22,9 +22,9 @@
  * wxStaticBitmap
  */
 
-BEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
+wxBEGIN_EVENT_TABLE(wxStaticBitmap, wxStaticBitmapBase)
     EVT_PAINT(wxStaticBitmap::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& bitmap,
diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index 2c5152f34c..35e1b86893 100644
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -26,9 +26,9 @@
 #define wxFIELD_TEXT_MARGIN 2
 
 
-BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
+wxBEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
     EVT_PAINT(wxStatusBarMac::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 wxStatusBarMac::wxStatusBarMac(wxWindow *parent,
diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index f8a8c4821e..2eab375c1a 100644
--- a/src/osx/carbon/taskbar.cpp
+++ b/src/osx/carbon/taskbar.cpp
@@ -453,7 +453,7 @@ bool wxDockTaskBarIcon::PopupMenu(wxMenu *menu)
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
 
 //-----------------------------------------------------------------------------
 // wxTaskBarIcon Constructor
diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index dcb7bd778a..f62bd70f4e 100644
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -1197,10 +1197,10 @@ public:
     virtual void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxThreadModule)
+    wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
 
 bool wxThreadModule::OnInit()
 {
diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index fb3dfee128..8533823fc2 100644
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -31,9 +31,9 @@ const short kwxMacToolBarLeftMargin =  4;
 const short kwxMacToolBorder = 0;
 const short kwxMacToolSpacing = 6;
 
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+wxBEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 #pragma mark -
diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index 66f99826e0..8c1a031e11 100644
--- a/src/osx/carbon/tooltip.cpp
+++ b/src/osx/carbon/tooltip.cpp
@@ -57,7 +57,7 @@ static wxWindow* s_LastWindowEntered = NULL ;
 static wxRect2DInt s_ToolTipArea ;
 static WindowRef s_ToolTipWindowRef = NULL ;
 
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject);
 
 
 wxToolTip::wxToolTip( const wxString &tip )
diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index 9653ee4191..37502cd289 100644
--- a/src/osx/carbon/utils.cpp
+++ b/src/osx/carbon/utils.cpp
@@ -220,7 +220,7 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
 // basing on DataBrowserItemIDs
 //
 
-IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl )
+wxIMPLEMENT_ABSTRACT_CLASS(wxMacDataBrowserControl, wxMacControl);
 
 pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
     ControlRef browser,
@@ -652,7 +652,7 @@ void wxMacDataItem::Notification(wxMacDataItemBrowserControl *WXUNUSED(owner) ,
 {
 }
 
-IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacDataItemBrowserControl, wxMacDataBrowserControl);
 
 wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
     wxMacDataBrowserControl( peer, pos, size, style )
diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index f7085d277f..539dcb0ca1 100644
--- a/src/osx/carbon/window.cpp
+++ b/src/osx/carbon/window.cpp
@@ -787,7 +787,7 @@ void wxMacControl::InstallEventHandler( WXWidget control )
         GetEventTypeCount(eventList), eventList, GetWXPeer(), NULL);
 }
 
-IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxWidgetImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacControl, wxWidgetImpl);
 
 wxMacControl::wxMacControl()
 {
diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 6e4d58a680..9c3e975694 100644
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -15,7 +15,7 @@
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox);
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent,
diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index 8b4b28a897..ba95b138e9 100644
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -23,8 +23,8 @@
 
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
+wxEND_EVENT_TABLE()
 
 void wxCheckListBox::Init()
 {
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 54abb59611..5056b57d35 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2783,7 +2783,7 @@ void wxDataViewRenderer::OSXApplyEnabled(bool enabled)
     [GetNativeData()->GetItemCell() setEnabled:enabled];
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase);
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
@@ -2818,7 +2818,7 @@ void wxDataViewCustomRenderer::OSXApplyAttr(const wxDataViewItemAttr& attr)
     // methods), then we should pass it on to wxDataViewRenderer here
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
@@ -2856,7 +2856,7 @@ wxDataViewTextRenderer::OSXOnCellChanged(NSObject *value,
     model->ChangeValue(valueText, item, col);
 }
 
-IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
@@ -2890,7 +2890,7 @@ bool wxDataViewBitmapRenderer::MacRender()
     return true;
 }
 
-IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer);
 
 // -------------------------------------
 // wxDataViewChoiceRenderer
@@ -2945,7 +2945,7 @@ bool wxDataViewChoiceRenderer::MacRender()
     return true;
 }
 
-IMPLEMENT_CLASS(wxDataViewChoiceRenderer,wxDataViewRenderer)
+wxIMPLEMENT_CLASS(wxDataViewChoiceRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
@@ -3036,7 +3036,7 @@ wxDataViewDateRenderer::OSXOnCellChanged(NSObject *value,
     model->ChangeValue(valueDate, item, col);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
@@ -3086,7 +3086,7 @@ wxDataViewIconTextRenderer::OSXOnCellChanged(NSObject *value,
     model->ChangeValue(valueIconText, item, col);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
@@ -3126,7 +3126,7 @@ wxDataViewToggleRenderer::OSXOnCellChanged(NSObject *value,
     model->ChangeValue(valueToggle, item, col);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
@@ -3167,7 +3167,7 @@ wxDataViewProgressRenderer::OSXOnCellChanged(NSObject *value,
     model->ChangeValue(valueProgress, item, col);
 }
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
+wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer);
 
 // ---------------------------------------------------------
 // wxDataViewColumn
diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 7f002567ad..c6a4dc9139 100644
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -35,7 +35,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxDirDialog, wxDialog);
 
 void wxDirDialog::Init()
 {
diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index a7dea232a2..33f5e8fecf 100644
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -189,7 +189,7 @@ bool HasAppKit_10_6()
 
 @end
 
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+wxIMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase);
 
 void wxFileDialog::Init()
 {
diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm
index dd7cf74154..7634aee9a3 100644
--- a/src/osx/cocoa/mediactrl.mm
+++ b/src/osx/cocoa/mediactrl.mm
@@ -242,7 +242,7 @@ private:
 // wxQTMediaBackend
 // --------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
+wxIMPLEMENT_DYNAMIC_CLASS(wxQTMediaBackend, wxMediaBackend);
 
 wxQTMediaBackend::wxQTMediaBackend() : 
     m_movie(nil), m_movieview(nil),
@@ -773,7 +773,7 @@ private:
 
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxAVMediaBackend, wxMediaBackend);
+wxIMPLEMENT_DYNAMIC_CLASS(wxAVMediaBackend, wxMediaBackend);
 
 wxAVMediaBackend::wxAVMediaBackend() :
 m_player(nil),
diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index 1e5f8fe84a..65e56b2e78 100644
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -24,7 +24,7 @@
 #include "wx/osx/private.h"
 
 
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 
 namespace 
diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 66cd58d947..a7ace84c19 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -587,7 +587,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 @end
 
-IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl);
 
 wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) :
     wxNonOwnedWindowImpl(nonownedwnd)
diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm
index 06c7e15950..2b1c88a6ab 100644
--- a/src/osx/cocoa/printdlg.mm
+++ b/src/osx/cocoa/printdlg.mm
@@ -28,7 +28,7 @@
 #include "wx/osx/private/print.h"
 #include "wx/osx/private.h"
 
-IMPLEMENT_CLASS(wxOSXCocoaPrintData, wxOSXPrintData)
+wxIMPLEMENT_CLASS(wxOSXCocoaPrintData, wxOSXPrintData);
 
 wxOSXCocoaPrintData::wxOSXCocoaPrintData()
 {
diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index 36b0f73fb1..df66491361 100644
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -44,7 +44,7 @@ public:
     
 private:
     wxTaskBarIconImpl *m_impl;
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ============================================================================
@@ -136,7 +136,7 @@ private:
 // wxTaskBarIcon implementation
 //     The facade class.
 // ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType iconType)
 {
@@ -415,10 +415,10 @@ bool wxTaskBarIconCustomStatusItemImpl::PopupMenu(wxMenu *menu)
 // wxTaskBarIconWindow
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxTaskBarIconWindow, wxWindow)
-EVT_MENU(-1, wxTaskBarIconWindow::OnMenuEvent)
-EVT_UPDATE_UI(-1, wxTaskBarIconWindow::OnUpdateUIEvent)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxTaskBarIconWindow, wxWindow)
+    EVT_MENU(-1, wxTaskBarIconWindow::OnMenuEvent)
+    EVT_UPDATE_UI(-1, wxTaskBarIconWindow::OnUpdateUIEvent)
+wxEND_EVENT_TABLE()
 
 wxTaskBarIconWindow::wxTaskBarIconWindow(wxTaskBarIconImpl *impl) 
 : m_impl(impl)
diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 19219e2664..4df984e1e9 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -29,9 +29,9 @@ const short kwxMacToolBarLeftMargin =  4;
 const short kwxMacToolBorder = 0;
 const short kwxMacToolSpacing = 6;
 
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+wxBEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 #pragma mark -
diff --git a/src/osx/cocoa/tooltip.mm b/src/osx/cocoa/tooltip.mm
index d36bbeba52..becaaf0580 100644
--- a/src/osx/cocoa/tooltip.mm
+++ b/src/osx/cocoa/tooltip.mm
@@ -30,7 +30,7 @@
 // wxToolTip
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject);
 
 
 wxToolTip::wxToolTip( const wxString &tip )
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 1953dc3b3d..3cd9d2cd14 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1810,7 +1810,7 @@ void wxOSXCocoaClassAddWXMethods(Class c)
 // C++ implementation class
 //
 
-IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxWidgetCocoaImpl , wxWidgetImpl);
 
 wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
     wxWidgetImpl( peer, isRootControl, isUserPane )
diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 0cfc57b07e..d7c27b7449 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -26,8 +26,8 @@
 
 #include "wx/filename.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
 
 #if wxOSX_USE_CARBON
 #include "wx/osx/uma.h"
@@ -1822,7 +1822,7 @@ WXHBITMAP wxMask::GetHBITMAP() const
 
 class WXDLLEXPORT wxBundleResourceHandler: public wxBitmapHandler
 {
-    DECLARE_ABSTRACT_CLASS(wxBundleResourceHandler)
+    wxDECLARE_ABSTRACT_CLASS(wxBundleResourceHandler);
     
 public:
     inline wxBundleResourceHandler()
@@ -1836,12 +1836,12 @@ public:
                           int desiredHeight) wxOVERRIDE;
 };
 
-IMPLEMENT_ABSTRACT_CLASS(wxBundleResourceHandler, wxBitmapHandler);
+wxIMPLEMENT_ABSTRACT_CLASS(wxBundleResourceHandler, wxBitmapHandler);
 
 class WXDLLEXPORT wxPNGResourceHandler: public wxBundleResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxPNGResourceHandler)
-    
+    wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler);
+
 public:
     inline wxPNGResourceHandler()
     {
@@ -1851,12 +1851,12 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler);
 
 class WXDLLEXPORT wxJPEGResourceHandler: public wxBundleResourceHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxJPEGResourceHandler)
-    
+    wxDECLARE_DYNAMIC_CLASS(wxJPEGResourceHandler);
+
 public:
     inline wxJPEGResourceHandler()
     {
@@ -1866,7 +1866,7 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxJPEGResourceHandler, wxBundleResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxJPEGResourceHandler, wxBundleResourceHandler);
 
 bool wxBundleResourceHandler::LoadFile(wxBitmap *bitmap,
                                      const wxString& name,
diff --git a/src/osx/core/dcmemory.cpp b/src/osx/core/dcmemory.cpp
index a7a47d6213..ea4b4c6761 100644
--- a/src/osx/core/dcmemory.cpp
+++ b/src/osx/core/dcmemory.cpp
@@ -20,7 +20,7 @@
 // wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl,wxPaintDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPaintDCImpl);
 
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 621f35c9d2..ba96d83918 100644
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -641,9 +641,9 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
 
 class wxHIDModule : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxHIDModule)
+    wxDECLARE_DYNAMIC_CLASS(wxHIDModule);
 
-    public:
+public:
         static wxArrayPtrVoid sm_keyboards;
         virtual bool OnInit() wxOVERRIDE
         {
@@ -657,7 +657,7 @@ class wxHIDModule : public wxModule
         }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxHIDModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHIDModule, wxModule);
 
 wxArrayPtrVoid wxHIDModule::sm_keyboards;
 
diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 3349ec8878..feace2517e 100644
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -133,7 +133,7 @@ void wxGetIntFromCFDictionary(CFTypeRef cfDict, CFStringRef key, int* pOut)
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject);
 
 //---------------------------------------------------------------------------
 // wxJoystick Constructor
diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index 3c98a272f4..d837da21a2 100644
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -83,7 +83,7 @@ static PMResolution *GetSupportedResolutions(PMPrinter printer, UInt32 *count)
 
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxOSXPrintData, wxPrintNativeDataBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxOSXPrintData, wxPrintNativeDataBase);
 
 bool wxOSXPrintData::IsOk() const
 {
@@ -536,7 +536,7 @@ wxPrintNativeDataBase* wxOSXCreatePrintData()
 * Printer
 */
 
-IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase);
 
 wxMacPrinter::wxMacPrinter(wxPrintDialogData *data):
 wxPrinterBase(data)
@@ -721,7 +721,7 @@ bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent))
 * Print preview
 */
 
-IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
+wxIMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase);
 
 wxMacPrintPreview::wxMacPrintPreview(wxPrintout *printout,
                                      wxPrintout *printoutForPrinting,
@@ -803,7 +803,7 @@ void wxMacPrintPreview::DetermineScaling(void)
 
 #if wxOSX_USE_CARBON
 
-IMPLEMENT_DYNAMIC_CLASS(wxOSXCarbonPrintData, wxOSXPrintData)
+wxIMPLEMENT_DYNAMIC_CLASS(wxOSXCarbonPrintData, wxOSXPrintData);
 
 wxOSXCarbonPrintData::wxOSXCarbonPrintData()
 {
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 2aaa7244c8..0bac650faf 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -784,12 +784,12 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 #endif
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl,wxDataViewCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl,wxDataViewCtrlBase);
 
-BEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
+wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
   EVT_SIZE(wxDataViewCtrl::OnSize)
   EVT_MOTION(wxDataViewCtrl::OnMouse)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #endif // (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0))
 
diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
index 3610ccff48..bb67d38293 100644
--- a/src/osx/glcanvas_osx.cpp
+++ b/src/osx/glcanvas_osx.cpp
@@ -56,13 +56,13 @@ wxGLContext::~wxGLContext()
 // wxGLCanvas
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
-BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
+wxBEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
 #if wxOSX_USE_CARBON
     EVT_SIZE(wxGLCanvas::OnSize)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        wxWindowID id,
diff --git a/src/osx/imaglist.cpp b/src/osx/imaglist.cpp
index 300a143bfd..b057fe3c3f 100644
--- a/src/osx/imaglist.cpp
+++ b/src/osx/imaglist.cpp
@@ -22,7 +22,7 @@
     #include "wx/image.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject);
 
 
 wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
diff --git a/src/osx/iphone/msgdlg.mm b/src/osx/iphone/msgdlg.mm
index 3431cb5a91..30d1f58777 100644
--- a/src/osx/iphone/msgdlg.mm
+++ b/src/osx/iphone/msgdlg.mm
@@ -22,7 +22,7 @@
 #include "wx/modalhook.h"
 
 
-IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMessageDialog, wxDialog);
 
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm
index 30eb710a36..2da94aba87 100644
--- a/src/osx/iphone/nonownedwnd.mm
+++ b/src/osx/iphone/nonownedwnd.mm
@@ -69,7 +69,7 @@ wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p )
 // c++ impl
 //
 
-IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl);
 
 wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) :
     wxNonOwnedWindowImpl(nonownedwnd)
diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index 589c3f7028..3af8bca297 100644
--- a/src/osx/iphone/toolbar.mm
+++ b/src/osx/iphone/toolbar.mm
@@ -26,8 +26,8 @@
 #pragma mark -
 #pragma mark Tool Implementation
 
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // private classes
diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm
index b4b8c4ac36..5872e9dc01 100644
--- a/src/osx/iphone/window.mm
+++ b/src/osx/iphone/window.mm
@@ -326,7 +326,7 @@ void wxOSXIPhoneClassAddWXMethods(Class c)
 
 @end
 
-IMPLEMENT_DYNAMIC_CLASS( wxWidgetIPhoneImpl , wxWidgetImpl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxWidgetIPhoneImpl , wxWidgetImpl);
 
 wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) :
     wxWidgetImpl( peer, isRootControl, isUserPane ), m_osxView(w)
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 1c97085ccb..131e85f0f7 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -23,8 +23,8 @@
     #include "wx/dcclient.h"
 #endif
 
-BEGIN_EVENT_TABLE(wxListBox, wxControl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxListBox, wxControl)
+wxEND_EVENT_TABLE()
 
 #include "wx/osx/private.h"
 
diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 917782a72b..0ab7ec8c25 100644
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -37,7 +37,7 @@
 // ----------------------
 #include <string.h>
 
-IMPLEMENT_ABSTRACT_CLASS( wxMenuImpl , wxObject )
+wxIMPLEMENT_ABSTRACT_CLASS(wxMenuImpl, wxObject);
 
 wxMenuImpl::~wxMenuImpl()
 {
diff --git a/src/osx/menuitem_osx.cpp b/src/osx/menuitem_osx.cpp
index 34a9996173..4c5a70245e 100644
--- a/src/osx/menuitem_osx.cpp
+++ b/src/osx/menuitem_osx.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS( wxMenuItemImpl , wxObject )
+wxIMPLEMENT_ABSTRACT_CLASS(wxMenuItemImpl, wxObject);
 
 wxMenuItemImpl::~wxMenuItemImpl()
 {
diff --git a/src/osx/minifram.cpp b/src/osx/minifram.cpp
index 0b5e463efd..255a86fc11 100644
--- a/src/osx/minifram.cpp
+++ b/src/osx/minifram.cpp
@@ -14,6 +14,6 @@
 
 #include "wx/minifram.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 #endif // wxUSE_MINIFRAME
diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 0e57c7f9f9..698c7faccd 100644
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -91,7 +91,7 @@ void wxNonOwnedWindowImpl::Associate( WXWindow window, wxNonOwnedWindowImpl *imp
 // wxNonOwnedWindow creation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS( wxNonOwnedWindowImpl , wxObject )
+wxIMPLEMENT_ABSTRACT_CLASS(wxNonOwnedWindowImpl, wxObject);
 
 wxNonOwnedWindow *wxNonOwnedWindow::s_macDeactivateWindow = NULL;
 
diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 59a329d5e7..e463af641c 100644
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -29,13 +29,13 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+wxBEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxNotebook::Create( wxWindow *parent,
     wxWindowID id,
diff --git a/src/osx/palette.cpp b/src/osx/palette.cpp
index 5e61ebd238..86ced8bca7 100644
--- a/src/osx/palette.cpp
+++ b/src/osx/palette.cpp
@@ -15,7 +15,7 @@
 #include "wx/palette.h"
 #include "wx/colour.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject);
 
 // ============================================================================
 // wxPaletteRefData
diff --git a/src/osx/pen.cpp b/src/osx/pen.cpp
index e5608fefdb..b835196261 100644
--- a/src/osx/pen.cpp
+++ b/src/osx/pen.cpp
@@ -16,7 +16,7 @@
     #include "wx/utils.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 class WXDLLEXPORT wxPenRefData : public wxGDIRefData
 {
diff --git a/src/osx/printdlg_osx.cpp b/src/osx/printdlg_osx.cpp
index c84039c272..f1db3b82fd 100644
--- a/src/osx/printdlg_osx.cpp
+++ b/src/osx/printdlg_osx.cpp
@@ -29,7 +29,7 @@
 #include "wx/statline.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxMacPrintDialog, wxPrintDialogBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMacPrintDialog, wxPrintDialogBase);
 
 wxMacPrintDialog::wxMacPrintDialog()
 {
@@ -77,7 +77,7 @@ wxDC *wxMacPrintDialog::GetPrintDC()
     return new wxPrinterDC( m_printDialogData.GetPrintData() );
 }
 
-IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
+wxIMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase);
 
 wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data )
     : wxPageSetupDialogBase()
@@ -104,7 +104,7 @@ wxPageSetupDialogData& wxMacPageSetupDialog::GetPageSetupDialogData()
     return m_pageSetupData;
 }
 
-IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog)
+wxIMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog);
 
 wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupDialogData *data) :
   wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))),
diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 2aba6e193b..a59c94eed0 100644
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -25,12 +25,12 @@
 // spacing between InterfaceBuild and the Human Interface Guidelines, we stick
 // to the latter, as those are also used eg in the System Preferences Dialogs
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 
-BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxRadioBox, wxControl)
     EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index 3d6d8f2961..6eea3d4802 100644
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -22,8 +22,8 @@
 
 #if wxUSE_SCROLLBAR
 
-BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+wxEND_EVENT_TABLE()
 
 
 bool wxScrollBar::Create( wxWindow *parent,
diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index e5e83b0ae7..8a4cad4a1a 100644
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -15,8 +15,8 @@
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxSlider, wxControl)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxSlider, wxControl)
+wxEND_EVENT_TABLE()
 
  // The dimensions of the different styles of sliders (from Aqua document)
 #if wxOSX_USE_COCOA
diff --git a/src/osx/srchctrl_osx.cpp b/src/osx/srchctrl_osx.cpp
index a08341993d..928bb9340e 100644
--- a/src/osx/srchctrl_osx.cpp
+++ b/src/osx/srchctrl_osx.cpp
@@ -26,10 +26,10 @@
 
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase);
 
 
 #endif // wxUSE_NATIVE_SEARCH_CONTROL
diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 08346e5adb..a7972e2fe4 100644
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -47,7 +47,7 @@
 
 #include "wx/osx/private.h"
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
@@ -68,7 +68,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
     EVT_UPDATE_UI(wxID_CLEAR, wxTextCtrl::OnUpdateDelete)
     EVT_UPDATE_UI(wxID_SELECTALL, wxTextCtrl::OnUpdateSelectAll)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 void wxTextCtrl::Init()
diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index f1ba9cd00e..9d1c5568fb 100644
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -29,7 +29,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
 // ============================================================================
@@ -104,7 +104,7 @@ bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 // wxBitmapToggleButton
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxBitmap& label,
diff --git a/src/osx/toolbar_osx.cpp b/src/osx/toolbar_osx.cpp
index 502e1f4573..ff00eddbac 100644
--- a/src/osx/toolbar_osx.cpp
+++ b/src/osx/toolbar_osx.cpp
@@ -23,7 +23,7 @@
 #include "wx/geometry.h"
 #include "wx/sysopt.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 bool wxToolBar::Destroy()
 {
diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp
index 848199a388..a1d2a65aa6 100644
--- a/src/osx/toplevel_osx.cpp
+++ b/src/osx/toplevel_osx.cpp
@@ -50,8 +50,8 @@
 // wxTopLevelWindowMac implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxTopLevelWindowMac, wxTopLevelWindowBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxTopLevelWindowMac, wxTopLevelWindowBase)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac creation
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index ac33b8a058..dec96e366f 100644
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -47,11 +47,11 @@
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
 
-BEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
+wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
     EVT_SIZE(wxWebViewWebKit::OnSize)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #if defined(__WXOSX__) && wxOSX_USE_CARBON
 
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 904ce7f0af..5b63ad7de0 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -75,12 +75,12 @@
 #include <string.h>
 
 #ifdef __WXUNIVERSAL__
-    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase);
 #endif
 
-BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+wxBEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
@@ -167,18 +167,18 @@ protected:
     {
     }
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBlindPlateWindow)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBlindPlateWindow);
+    wxDECLARE_EVENT_TABLE();
 };
 
 wxBlindPlateWindow::~wxBlindPlateWindow()
 {
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxBlindPlateWindow, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBlindPlateWindow, wxWindow);
 
-BEGIN_EVENT_TABLE(wxBlindPlateWindow, wxWindow)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxBlindPlateWindow, wxWindow)
+wxEND_EVENT_TABLE()
 
 
 // ----------------------------------------------------------------------------
@@ -2856,7 +2856,7 @@ void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
     }
 }
 
-IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
+wxIMPLEMENT_ABSTRACT_CLASS(wxWidgetImpl, wxObject);
 
 wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl, bool isUserPane )
 {
diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index b8ebd1d5be..e8ff14ea64 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -83,7 +83,7 @@
 
 
 // Implement dynamic class for type value.
-IMPLEMENT_DYNAMIC_CLASS(wxColourPropertyValue, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourPropertyValue, wxObject);
 
 bool operator == (const wxColourPropertyValue& a, const wxColourPropertyValue& b)
 {
@@ -441,7 +441,7 @@ bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* proper
 
 class wxPGDatePickerCtrlEditor : public wxPGEditor
 {
-    DECLARE_DYNAMIC_CLASS(wxPGDatePickerCtrlEditor)
+    wxDECLARE_DYNAMIC_CLASS(wxPGDatePickerCtrlEditor);
 public:
     virtual ~wxPGDatePickerCtrlEditor();
 
@@ -1765,7 +1765,7 @@ static const long gs_cp_es_syscursors_values[NUM_CURSORS] = {
     wxCURSOR_ARROWWAIT
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursorProperty, wxEnumProperty)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursorProperty, wxEnumProperty);
 
 static wxPGChoices gs_wxCursorProperty_choicesCache;
 
@@ -1883,7 +1883,7 @@ const wxString& wxPGGetDefaultImageWildcard()
     return wxPGGlobalVars->m_pDefaultImageWildcard;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxImageFileProperty, wxFileProperty)
+wxIMPLEMENT_DYNAMIC_CLASS(wxImageFileProperty, wxFileProperty);
 
 wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString& name,
     const wxString& value )
diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 63c47b4f44..5228a57ce1 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -148,7 +148,7 @@
 // wxPGEditor
 // -----------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPGEditor, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPGEditor, wxObject);
 
 
 wxPGEditor::~wxPGEditor()
@@ -591,13 +591,13 @@ private:
     wxPGProperty*               m_property;  // Selected property
     bool                        m_downReceived;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxPGDoubleClickProcessor, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxPGDoubleClickProcessor, wxEvtHandler)
     EVT_MOUSE_EVENTS(wxPGDoubleClickProcessor::OnMouseEvent)
     EVT_SET_FOCUS(wxPGDoubleClickProcessor::OnSetFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 
@@ -1536,19 +1536,19 @@ private:
     }
     void OnLeftClickActivate( wxCommandEvent& evt );
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 wxDEFINE_EVENT( wxEVT_CB_LEFT_CLICK_ACTIVATE, wxCommandEvent );
 
-BEGIN_EVENT_TABLE(wxSimpleCheckBox, wxControl)
+wxBEGIN_EVENT_TABLE(wxSimpleCheckBox, wxControl)
     EVT_PAINT(wxSimpleCheckBox::OnPaint)
     EVT_LEFT_DOWN(wxSimpleCheckBox::OnLeftClick)
     EVT_LEFT_DCLICK(wxSimpleCheckBox::OnLeftClick)
     EVT_KEY_DOWN(wxSimpleCheckBox::OnKeyDown)
     EVT_SIZE(wxSimpleCheckBox::OnResize)
     EVT_COMMAND(wxID_ANY, wxEVT_CB_LEFT_CLICK_ACTIVATE, wxSimpleCheckBox::OnLeftClickActivate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxSimpleCheckBox::~wxSimpleCheckBox()
 {
@@ -2141,7 +2141,7 @@ wxPGEditor* wxPropertyGridInterface::GetEditorByName( const wxString& editorName
 // wxPGEditorDialogAdapter
 // -----------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPGEditorDialogAdapter, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPGEditorDialogAdapter, wxObject);
 
 bool wxPGEditorDialogAdapter::ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property )
 {
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 44bff1a1a2..3e32a4bf30 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -157,11 +157,11 @@ static const char* const gs_xpm_defpage[] = {
 // -----------------------------------------------------------------------
 
 
-IMPLEMENT_CLASS(wxPropertyGridPage, wxEvtHandler)
+wxIMPLEMENT_CLASS(wxPropertyGridPage, wxEvtHandler);
 
 
-BEGIN_EVENT_TABLE(wxPropertyGridPage, wxEvtHandler)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxPropertyGridPage, wxEvtHandler)
+wxEND_EVENT_TABLE()
 
 
 wxPropertyGridPage::wxPropertyGridPage()
@@ -408,11 +408,11 @@ private:
 
 // -----------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxPropertyGridManager, wxPanel)
+wxIMPLEMENT_CLASS(wxPropertyGridManager, wxPanel);
 
 // -----------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPropertyGridManager, wxPanel)
+wxBEGIN_EVENT_TABLE(wxPropertyGridManager, wxPanel)
   EVT_MOTION(wxPropertyGridManager::OnMouseMove)
   EVT_SIZE(wxPropertyGridManager::OnResize)
   EVT_PAINT(wxPropertyGridManager::OnPaint)
@@ -420,7 +420,7 @@ BEGIN_EVENT_TABLE(wxPropertyGridManager, wxPanel)
   EVT_LEFT_UP(wxPropertyGridManager::OnMouseUp)
   EVT_LEAVE_WINDOW(wxPropertyGridManager::OnMouseEntry)
   //EVT_ENTER_WINDOW(wxPropertyGridManager::OnMouseEntry)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // -----------------------------------------------------------------------
 
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 0fb01ad4d0..339da1111b 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -449,7 +449,7 @@ void wxPGCell::SetEmptyData()
 // wxPGProperty
 // -----------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPGProperty, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPGProperty, wxObject);
 
 wxString* wxPGProperty::sm_wxPG_LABEL = NULL;
 
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index f53db99fb9..5429637304 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -159,14 +159,14 @@ const char wxPropertyGridNameStr[] = "wxPropertyGrid";
 
 class wxPGGlobalVarsClassManager : public wxModule
 {
-    DECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager)
+    wxDECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager);
 public:
     wxPGGlobalVarsClassManager() {}
     virtual bool OnInit() wxOVERRIDE { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; }
     virtual void OnExit() wxOVERRIDE { wxDELETE(wxPGGlobalVars); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxPGGlobalVarsClassManager, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPGGlobalVarsClassManager, wxModule);
 
 
 // When wxPG is loaded dynamically after the application is already running
@@ -259,9 +259,9 @@ void wxPropertyGridInitGlobalsIfNeeded()
 // wxPropertyGrid
 // -----------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyGrid, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPropertyGrid, wxControl);
 
-BEGIN_EVENT_TABLE(wxPropertyGrid, wxControl)
+wxBEGIN_EVENT_TABLE(wxPropertyGrid, wxControl)
   EVT_IDLE(wxPropertyGrid::OnIdle)
   EVT_PAINT(wxPropertyGrid::OnPaint)
   EVT_SIZE(wxPropertyGrid::OnResize)
@@ -279,7 +279,7 @@ BEGIN_EVENT_TABLE(wxPropertyGrid, wxControl)
   EVT_RIGHT_UP(wxPropertyGrid::OnMouseRightClick)
   EVT_LEFT_DCLICK(wxPropertyGrid::OnMouseDoubleClick)
   EVT_KEY_DOWN(wxPropertyGrid::OnKey)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // -----------------------------------------------------------------------
 
@@ -6260,7 +6260,7 @@ wxPGChoiceEntry& wxPGChoicesData::Insert( int index,
 // wxPropertyGridEvent
 // -----------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyGridEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPropertyGridEvent, wxCommandEvent);
 
 
 wxDEFINE_EVENT( wxEVT_PG_SELECTED, wxPropertyGridEvent );
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 9ccc8b0410..42da4513a4 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -1013,7 +1013,7 @@ wxValidator* wxFloatProperty::DoGetValidator() const
 // We cannot use standard WX_PG_IMPLEMENT_PROPERTY_CLASS macro, since
 // there is a custom GetEditorClass.
 
-IMPLEMENT_DYNAMIC_CLASS(wxBoolProperty, wxPGProperty)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBoolProperty, wxPGProperty);
 
 const wxPGEditor* wxBoolProperty::DoGetEditorClass() const
 {
@@ -1829,7 +1829,7 @@ bool wxFlagsProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 // wxDirProperty
 // -----------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDirProperty, wxLongStringProperty)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirProperty, wxLongStringProperty);
 
 wxDirProperty::wxDirProperty( const wxString& name, const wxString& label, const wxString& value )
   : wxLongStringProperty(name,label,value)
@@ -2302,11 +2302,11 @@ bool wxLongStringProperty::StringToValue( wxVariant& variant, const wxString& te
 // wxPGArrayEditorDialog
 // -----------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPGArrayEditorDialog, wxDialog)
+wxBEGIN_EVENT_TABLE(wxPGArrayEditorDialog, wxDialog)
     EVT_IDLE(wxPGArrayEditorDialog::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_ABSTRACT_CLASS(wxPGArrayEditorDialog, wxDialog)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPGArrayEditorDialog, wxDialog);
 
 #include "wx/editlbox.h"
 #include "wx/listctrl.h"
@@ -2619,10 +2619,10 @@ void wxPGArrayEditorDialog::OnBeginLabelEdit(wxListEvent& evt)
 // wxPGArrayStringEditorDialog
 // -----------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog);
 
-BEGIN_EVENT_TABLE(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog)
+wxEND_EVENT_TABLE()
 
 // -----------------------------------------------------------------------
 
diff --git a/src/qt/accel.cpp b/src/qt/accel.cpp
index 024fc2cddc..5b9b2f37f0 100644
--- a/src/qt/accel.cpp
+++ b/src/qt/accel.cpp
@@ -54,7 +54,7 @@ class wxAccelRefData : public wxObjectRefData
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS( wxAcceleratorTable, wxObject )
+wxIMPLEMENT_DYNAMIC_CLASS( wxAcceleratorTable, wxObject );
 
 QShortcut *ConvertAccelerator( wxAcceleratorEntry *e, QWidget *parent )
 {
diff --git a/src/qt/app.cpp b/src/qt/app.cpp
index 898569c4a1..c732701684 100644
--- a/src/qt/app.cpp
+++ b/src/qt/app.cpp
@@ -14,7 +14,7 @@
 #include "wx/qt/private/converter.h"
 #include <QtCore/QStringList>
 
-IMPLEMENT_DYNAMIC_CLASS( wxApp, wxAppBase )
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase);
 
 wxApp::wxApp()
 {
diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp
index 16ab3121d0..0e6244893b 100644
--- a/src/qt/bitmap.cpp
+++ b/src/qt/bitmap.cpp
@@ -155,7 +155,7 @@ class wxBitmapRefData: public wxGDIRefData
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxBitmap, wxObject )
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxObject);
 
 #define M_PIXDATA (*((wxBitmapRefData *)m_refData)->m_qtPixmap)
 
@@ -460,7 +460,7 @@ bool wxBitmap::HasAlpha() const
 // wxMask
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxMask, wxObject )
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject);
 
 wxMask::wxMask()
 {
diff --git a/src/qt/clipbrd.cpp b/src/qt/clipbrd.cpp
index 438ee99f12..827ea69df9 100644
--- a/src/qt/clipbrd.cpp
+++ b/src/qt/clipbrd.cpp
@@ -19,7 +19,7 @@
 // wxClipboard ctor/dtor
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject);
 
 #define QtClipboard  QApplication::clipboard()
 typedef wxScopedArray<wxDataFormat> wxDataFormatArray;
diff --git a/src/qt/control.cpp b/src/qt/control.cpp
index 16a2f1ad7c..5605fd03e0 100644
--- a/src/qt/control.cpp
+++ b/src/qt/control.cpp
@@ -11,7 +11,7 @@
 #include "wx/control.h"
 #include "wx/qt/private/converter.h"
 
-IMPLEMENT_DYNAMIC_CLASS( wxControl, wxWindow )
+wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
 
 wxControl::wxControl()
 {
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
index edefb18d0b..c72ada4450 100644
--- a/src/qt/cursor.cpp
+++ b/src/qt/cursor.cpp
@@ -36,7 +36,7 @@ void wxEndBusyCursor()
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxCursor, wxGDIObject )
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject);
 
 wxCursor::wxCursor( const wxCursor &cursor )
 {
diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp
index 8ba3d18c9b..d3986fdca7 100644
--- a/src/qt/dcscreen.cpp
+++ b/src/qt/dcscreen.cpp
@@ -15,7 +15,7 @@
 #include <QtGui/QScreen>
 #include <QPixmap>
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
     : wxWindowDCImpl( owner )
diff --git a/src/qt/filedlg.cpp b/src/qt/filedlg.cpp
index 558db5d40d..d3161303af 100644
--- a/src/qt/filedlg.cpp
+++ b/src/qt/filedlg.cpp
@@ -69,7 +69,7 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxDialog);
 
 wxFileDialog::wxFileDialog(wxWindow *parent,
                            const wxString& message,
@@ -210,7 +210,7 @@ public:
         }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirDialog, wxDialog);
 
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
diff --git a/src/qt/fontdlg.cpp b/src/qt/fontdlg.cpp
index f7f5b9acbc..fa5a0fcfd4 100644
--- a/src/qt/fontdlg.cpp
+++ b/src/qt/fontdlg.cpp
@@ -26,7 +26,7 @@ public:
         }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 
 bool wxFontDialog::DoCreate(wxWindow *parent)
 {
diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp
index 653b399af6..1bb3feb331 100644
--- a/src/qt/glcanvas.cpp
+++ b/src/qt/glcanvas.cpp
@@ -68,7 +68,7 @@ void wxQtGLWidget::paintGL()
 // wxGlContext
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLContext, wxWindow)
+wxIMPLEMENT_CLASS(wxGLContext, wxWindow);
 
 wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other))
 {
@@ -86,7 +86,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas&) const
 // wxGlCanvas
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        wxWindowID id,
diff --git a/src/qt/mdi.cpp b/src/qt/mdi.cpp
index 770224d955..edfaea9d5f 100644
--- a/src/qt/mdi.cpp
+++ b/src/qt/mdi.cpp
@@ -34,7 +34,7 @@ class wxQtMdiArea : public wxQtEventSignalHandler< QMdiArea, wxMDIClientWindow >
         wxQtMdiArea( wxWindow *parent, wxMDIClientWindow *handler );
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame);
 
 wxMDIParentFrame::wxMDIParentFrame()
 {
diff --git a/src/qt/minifram.cpp b/src/qt/minifram.cpp
index 70a987912a..712cf6beaf 100644
--- a/src/qt/minifram.cpp
+++ b/src/qt/minifram.cpp
@@ -17,6 +17,6 @@
 
 #include "wx/minifram.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 #endif // wxUSE_MINIFRAME
diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp
index 74242cefd2..f5c01515bc 100644
--- a/src/qt/radiobox.cpp
+++ b/src/qt/radiobox.cpp
@@ -52,7 +52,7 @@ void wxQtButtonGroup::buttonClicked(int index) {
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS( wxRadioBox, wxControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 
 wxRadioBox::wxRadioBox()
diff --git a/src/qt/taskbar.cpp b/src/qt/taskbar.cpp
index e90b481093..6b40fe8507 100644
--- a/src/qt/taskbar.cpp
+++ b/src/qt/taskbar.cpp
@@ -19,7 +19,7 @@ bool wxTaskBarIconBase::IsAvailable()
 
 //=============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS( wxTaskBarIcon, wxTaskBarIconBase )
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxTaskBarIconBase);
 
 wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
 {
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
index d4cbc11590..02210d87bc 100644
--- a/src/qt/tglbtn.cpp
+++ b/src/qt/tglbtn.cpp
@@ -44,7 +44,7 @@ void wxQtToggleButton::clicked( bool checked )
 
 wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
-IMPLEMENT_DYNAMIC_CLASS( wxBitmapToggleButton, wxToggleButtonBase )
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButtonBase);
 
 wxBitmapToggleButton::wxBitmapToggleButton()
 {
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
index ed8becaad8..9535a5d671 100644
--- a/src/qt/toolbar.cpp
+++ b/src/qt/toolbar.cpp
@@ -88,7 +88,7 @@ void wxQtToolButton::enterEvent( QEvent *WXUNUSED(event) )
     toolbar->OnMouseEnter( handler->GetId() );
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 void wxToolBarTool::SetLabel( const wxString &label )
 {
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index ca5c2510a7..a8b00ae9b5 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -82,7 +82,7 @@ void wxQtShortcutHandler::activated()
 //##############################################################################
 
 #ifdef __WXUNIVERSAL__
-    IMPLEMENT_ABSTRACT_CLASS(wxWindow, wxWindowBase)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxWindow, wxWindowBase);
 #endif // __WXUNIVERSAL__
 
 // We use the QObject property capabilities to store the wxWindow pointer, so we
diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 4c305a658f..3592078144 100644
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -43,10 +43,10 @@ wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_LEFT_DCLICK, wxRibbonBarEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONBAR_TOGGLED, wxRibbonBarEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONBAR_HELP_CLICK, wxRibbonBarEvent);
 
-IMPLEMENT_CLASS(wxRibbonBar, wxRibbonControl)
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonBarEvent, wxNotifyEvent)
+wxIMPLEMENT_CLASS(wxRibbonBar, wxRibbonControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonBarEvent, wxNotifyEvent);
 
-BEGIN_EVENT_TABLE(wxRibbonBar, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonBar, wxRibbonControl)
   EVT_ERASE_BACKGROUND(wxRibbonBar::OnEraseBackground)
   EVT_LEAVE_WINDOW(wxRibbonBar::OnMouseLeave)
   EVT_LEFT_DOWN(wxRibbonBar::OnMouseLeftDown)
@@ -60,7 +60,7 @@ BEGIN_EVENT_TABLE(wxRibbonBar, wxRibbonControl)
   EVT_LEFT_DCLICK(wxRibbonBar::OnMouseDoubleClick)
   EVT_SIZE(wxRibbonBar::OnSize)
   EVT_KILL_FOCUS(wxRibbonBar::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxRibbonBar::AddPage(wxRibbonPage *page)
 {
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 34c4406573..51bf8bf6cc 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -31,10 +31,10 @@
 wxDEFINE_EVENT(wxEVT_RIBBONBUTTONBAR_CLICKED, wxRibbonButtonBarEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED, wxRibbonButtonBarEvent);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonButtonBarEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonButtonBar, wxRibbonControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonButtonBarEvent, wxCommandEvent);
+wxIMPLEMENT_CLASS(wxRibbonButtonBar, wxRibbonControl);
 
-BEGIN_EVENT_TABLE(wxRibbonButtonBar, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonButtonBar, wxRibbonControl)
     EVT_ERASE_BACKGROUND(wxRibbonButtonBar::OnEraseBackground)
     EVT_ENTER_WINDOW(wxRibbonButtonBar::OnMouseEnter)
     EVT_LEAVE_WINDOW(wxRibbonButtonBar::OnMouseLeave)
@@ -44,7 +44,7 @@ BEGIN_EVENT_TABLE(wxRibbonButtonBar, wxRibbonControl)
     EVT_LEFT_DOWN(wxRibbonButtonBar::OnMouseDown)
     EVT_LEFT_DCLICK(wxRibbonButtonBar::OnMouseDown)
     EVT_LEFT_UP(wxRibbonButtonBar::OnMouseUp)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 class wxRibbonButtonBarButtonSizeInfo
 {
diff --git a/src/ribbon/control.cpp b/src/ribbon/control.cpp
index ecd332103e..986b8b1a52 100644
--- a/src/ribbon/control.cpp
+++ b/src/ribbon/control.cpp
@@ -26,7 +26,7 @@
 #include "wx/msw/private.h"
 #endif
 
-IMPLEMENT_CLASS(wxRibbonControl, wxControl)
+wxIMPLEMENT_CLASS(wxRibbonControl, wxControl);
 
 bool wxRibbonControl::Create(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos,
diff --git a/src/ribbon/gallery.cpp b/src/ribbon/gallery.cpp
index 429d5e8f93..a62c18ac54 100644
--- a/src/ribbon/gallery.cpp
+++ b/src/ribbon/gallery.cpp
@@ -33,8 +33,8 @@ wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_HOVER_CHANGED, wxRibbonGalleryEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_SELECTED, wxRibbonGalleryEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_CLICKED, wxRibbonGalleryEvent);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonGalleryEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonGallery, wxRibbonControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonGalleryEvent, wxCommandEvent);
+wxIMPLEMENT_CLASS(wxRibbonGallery, wxRibbonControl);
 
 class wxRibbonGalleryItem
 {
@@ -69,7 +69,7 @@ protected:
     bool m_is_visible;
 };
 
-BEGIN_EVENT_TABLE(wxRibbonGallery, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonGallery, wxRibbonControl)
     EVT_ENTER_WINDOW(wxRibbonGallery::OnMouseEnter)
     EVT_ERASE_BACKGROUND(wxRibbonGallery::OnEraseBackground)
     EVT_LEAVE_WINDOW(wxRibbonGallery::OnMouseLeave)
@@ -79,7 +79,7 @@ BEGIN_EVENT_TABLE(wxRibbonGallery, wxRibbonControl)
     EVT_MOTION(wxRibbonGallery::OnMouseMove)
     EVT_PAINT(wxRibbonGallery::OnPaint)
     EVT_SIZE(wxRibbonGallery::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRibbonGallery::wxRibbonGallery()
 {
diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp
index 9ae2fba091..8670319834 100644
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -61,20 +61,20 @@ protected:
     wxRibbonPage* m_sibling;
     long m_flags;
 
-    DECLARE_CLASS(wxRibbonPageScrollButton)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxRibbonPageScrollButton);
+    wxDECLARE_EVENT_TABLE();
 };
 
-IMPLEMENT_CLASS(wxRibbonPageScrollButton, wxRibbonControl)
+wxIMPLEMENT_CLASS(wxRibbonPageScrollButton, wxRibbonControl);
 
-BEGIN_EVENT_TABLE(wxRibbonPageScrollButton, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonPageScrollButton, wxRibbonControl)
     EVT_ENTER_WINDOW(wxRibbonPageScrollButton::OnMouseEnter)
     EVT_ERASE_BACKGROUND(wxRibbonPageScrollButton::OnEraseBackground)
     EVT_LEAVE_WINDOW(wxRibbonPageScrollButton::OnMouseLeave)
     EVT_LEFT_DOWN(wxRibbonPageScrollButton::OnMouseDown)
     EVT_LEFT_UP(wxRibbonPageScrollButton::OnMouseUp)
     EVT_PAINT(wxRibbonPageScrollButton::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRibbonPageScrollButton::wxRibbonPageScrollButton(wxRibbonPage* sibling,
                  wxWindowID id,
@@ -146,13 +146,13 @@ void wxRibbonPageScrollButton::OnMouseUp(wxMouseEvent& WXUNUSED(evt))
     }
 }
 
-IMPLEMENT_CLASS(wxRibbonPage, wxRibbonControl)
+wxIMPLEMENT_CLASS(wxRibbonPage, wxRibbonControl);
 
-BEGIN_EVENT_TABLE(wxRibbonPage, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonPage, wxRibbonControl)
     EVT_ERASE_BACKGROUND(wxRibbonPage::OnEraseBackground)
     EVT_PAINT(wxRibbonPage::OnPaint)
     EVT_SIZE(wxRibbonPage::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRibbonPage::wxRibbonPage()
 {
diff --git a/src/ribbon/panel.cpp b/src/ribbon/panel.cpp
index 1e37b6c093..c675525758 100644
--- a/src/ribbon/panel.cpp
+++ b/src/ribbon/panel.cpp
@@ -33,11 +33,11 @@
 
 wxDEFINE_EVENT(wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, wxRibbonPanelEvent);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonPanelEvent, wxCommandEvent)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonPanelEvent, wxCommandEvent);
 
-IMPLEMENT_CLASS(wxRibbonPanel, wxRibbonControl)
+wxIMPLEMENT_CLASS(wxRibbonPanel, wxRibbonControl);
 
-BEGIN_EVENT_TABLE(wxRibbonPanel, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonPanel, wxRibbonControl)
     EVT_ENTER_WINDOW(wxRibbonPanel::OnMouseEnter)
     EVT_ERASE_BACKGROUND(wxRibbonPanel::OnEraseBackground)
     EVT_KILL_FOCUS(wxRibbonPanel::OnKillFocus)
@@ -46,7 +46,7 @@ BEGIN_EVENT_TABLE(wxRibbonPanel, wxRibbonControl)
     EVT_LEFT_DOWN(wxRibbonPanel::OnMouseClick)
     EVT_PAINT(wxRibbonPanel::OnPaint)
     EVT_SIZE(wxRibbonPanel::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRibbonPanel::wxRibbonPanel() : m_expanded_dummy(NULL), m_expanded_panel(NULL)
 {
diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 9967ae5268..44bb065d2d 100644
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -60,10 +60,10 @@ public:
 wxDEFINE_EVENT(wxEVT_RIBBONTOOLBAR_CLICKED, wxRibbonToolBarEvent);
 wxDEFINE_EVENT(wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED, wxRibbonToolBarEvent);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonToolBarEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonToolBar, wxRibbonControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRibbonToolBarEvent, wxCommandEvent);
+wxIMPLEMENT_CLASS(wxRibbonToolBar, wxRibbonControl);
 
-BEGIN_EVENT_TABLE(wxRibbonToolBar, wxRibbonControl)
+wxBEGIN_EVENT_TABLE(wxRibbonToolBar, wxRibbonControl)
     EVT_ENTER_WINDOW(wxRibbonToolBar::OnMouseEnter)
     EVT_ERASE_BACKGROUND(wxRibbonToolBar::OnEraseBackground)
     EVT_LEAVE_WINDOW(wxRibbonToolBar::OnMouseLeave)
@@ -73,7 +73,7 @@ BEGIN_EVENT_TABLE(wxRibbonToolBar, wxRibbonControl)
     EVT_MOTION(wxRibbonToolBar::OnMouseMove)
     EVT_PAINT(wxRibbonToolBar::OnPaint)
     EVT_SIZE(wxRibbonToolBar::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRibbonToolBar::wxRibbonToolBar()
 {
diff --git a/src/richtext/richtextbackgroundpage.cpp b/src/richtext/richtextbackgroundpage.cpp
index ba87ee5b7a..6acf9f3b8b 100644
--- a/src/richtext/richtextbackgroundpage.cpp
+++ b/src/richtext/richtextbackgroundpage.cpp
@@ -20,15 +20,15 @@
  * wxRichTextBackgroundPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextBackgroundPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextBackgroundPage, wxRichTextDialogPage);
 
 
 /*!
  * wxRichTextBackgroundPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextBackgroundPage, wxRichTextDialogPage )
-EVT_BUTTON(ID_RICHTEXT_BACKGROUND_COLOUR_SWATCH, wxRichTextBackgroundPage::OnColourSwatch)
+wxBEGIN_EVENT_TABLE( wxRichTextBackgroundPage, wxRichTextDialogPage )
+    EVT_BUTTON(ID_RICHTEXT_BACKGROUND_COLOUR_SWATCH, wxRichTextBackgroundPage::OnColourSwatch)
 
 ////@begin wxRichTextBackgroundPage event table entries
     EVT_UPDATE_UI( ID_RICHTEXT_SHADOW_HORIZONTAL_OFFSET, wxRichTextBackgroundPage::OnRichtextShadowUpdate )
@@ -47,7 +47,7 @@ EVT_BUTTON(ID_RICHTEXT_BACKGROUND_COLOUR_SWATCH, wxRichTextBackgroundPage::OnCol
     EVT_UPDATE_UI( ID_RICHTEXT_SHADOW_OPACITY, wxRichTextBackgroundPage::OnRichtextShadowOpacityUpdate )
 ////@end wxRichTextBackgroundPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextBackgroundPage)
 
diff --git a/src/richtext/richtextborderspage.cpp b/src/richtext/richtextborderspage.cpp
index e1eaa93fdb..0d56833f9e 100644
--- a/src/richtext/richtextborderspage.cpp
+++ b/src/richtext/richtextborderspage.cpp
@@ -21,13 +21,13 @@
  * wxRichTextBordersPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextBordersPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextBordersPage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextBordersPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextBordersPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextBordersPage, wxRichTextDialogPage)
 
     EVT_CHECKBOX(wxID_ANY, wxRichTextBordersPage::OnCommand)
     EVT_TEXT(wxID_ANY, wxRichTextBordersPage::OnCommand)
@@ -96,7 +96,7 @@ BEGIN_EVENT_TABLE( wxRichTextBordersPage, wxRichTextDialogPage )
     EVT_UPDATE_UI( ID_RICHTEXTBORDERSPAGE_CORNER_UNITS, wxRichTextBordersPage::OnRichtextborderspageCornerUpdate )
 ////@end wxRichTextBordersPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextBordersPage)
 
@@ -1325,9 +1325,9 @@ void wxRichTextBordersPage::OnRichtextOutlineLeftStyleSelected( wxCommandEvent&
     }
 }
 
-BEGIN_EVENT_TABLE(wxRichTextBorderPreviewCtrl, wxWindow)
+wxBEGIN_EVENT_TABLE(wxRichTextBorderPreviewCtrl, wxWindow)
     EVT_PAINT(wxRichTextBorderPreviewCtrl::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRichTextBorderPreviewCtrl::wxRichTextBorderPreviewCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& sz, long style)
 {
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 24859551f1..3c566fb654 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -522,7 +522,7 @@ inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush)
  * This is the base for drawable objects.
  */
 
-IMPLEMENT_CLASS(wxRichTextObject, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextObject, wxObject);
 
 wxRichTextObject::wxRichTextObject(wxRichTextObject* parent)
 {
@@ -1352,7 +1352,7 @@ void wxRichTextObject::Move(const wxPoint& pt)
  * This is the base for drawable objects.
  */
 
-IMPLEMENT_CLASS(wxRichTextCompositeObject, wxRichTextObject)
+wxIMPLEMENT_CLASS(wxRichTextCompositeObject, wxRichTextObject);
 
 wxRichTextCompositeObject::wxRichTextCompositeObject(wxRichTextObject* parent):
     wxRichTextObject(parent)
@@ -1932,7 +1932,7 @@ void wxRichTextCompositeObject::Move(const wxPoint& pt)
  * This box knows how to lay out paragraphs.
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject);
 
 wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
     wxRichTextCompositeObject(parent)
@@ -4773,7 +4773,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
  * This object represents a single paragraph (or in a straight text editor, a line).
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextCompositeObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextCompositeObject);
 
 wxArrayInt wxRichTextParagraph::sm_defaultTabs;
 
@@ -6766,7 +6766,7 @@ wxRichTextRange wxRichTextLine::GetAbsoluteRange() const
  * This object represents a single piece of text.
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject);
 
 wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* style):
     wxRichTextObject(parent)
@@ -7715,7 +7715,7 @@ long wxRichTextPlainText::GetFirstLineBreakPosition(long pos)
  * This is a kind of box, used to represent the whole buffer
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox);
 
 wxList                      wxRichTextBuffer::sm_handlers;
 wxList                      wxRichTextBuffer::sm_drawingHandlers;
@@ -9343,7 +9343,7 @@ bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNa
  * wxRichTextBox
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextParagraphLayoutBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextParagraphLayoutBox);
 
 wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
     wxRichTextParagraphLayoutBox(parent)
@@ -9391,7 +9391,7 @@ bool wxRichTextBox::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
  * wxRichTextField
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextField, wxRichTextParagraphLayoutBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextField, wxRichTextParagraphLayoutBox);
 
 wxRichTextField::wxRichTextField(const wxString& fieldType, wxRichTextObject* parent):
     wxRichTextParagraphLayoutBox(parent)
@@ -9505,9 +9505,9 @@ bool wxRichTextField::IsTopLevel() const
     return true;
 }
 
-IMPLEMENT_CLASS(wxRichTextFieldType, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextFieldType, wxObject);
 
-IMPLEMENT_CLASS(wxRichTextFieldTypeStandard, wxRichTextFieldType)
+wxIMPLEMENT_CLASS(wxRichTextFieldTypeStandard, wxRichTextFieldType);
 
 wxRichTextFieldTypeStandard::wxRichTextFieldTypeStandard(const wxString& name, const wxString& label, int displayStyle)
 {
@@ -9736,7 +9736,7 @@ wxSize wxRichTextFieldTypeStandard::GetSize(wxRichTextField* WXUNUSED(obj), wxDC
     return sz;
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextCell, wxRichTextBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextCell, wxRichTextBox);
 
 wxRichTextCell::wxRichTextCell(wxRichTextObject* parent):
     wxRichTextBox(parent)
@@ -10034,7 +10034,7 @@ int wxRichTextCell::GetRowSpan() const
 
 WX_DEFINE_OBJARRAY(wxRichTextObjectPtrArrayArray)
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextTable, wxRichTextBox)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextTable, wxRichTextBox);
 
 wxRichTextTable::wxRichTextTable(wxRichTextObject* parent): wxRichTextBox(parent)
 {
@@ -11588,7 +11588,7 @@ wxRichTextCell* wxRichTextTableBlock::GetFocusedCell(wxRichTextCtrl* ctrl)
 
 class wxRichTextModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxRichTextModule)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextModule);
 public:
     wxRichTextModule() {}
     bool OnInit() wxOVERRIDE
@@ -11626,7 +11626,7 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule);
 
 
 // If the richtext lib is dynamically loaded after the app has already started
@@ -12417,7 +12417,7 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
  * This object represents an image.
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject);
 
 wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxRichTextAttr* charStyle):
     wxRichTextObject(parent)
@@ -12939,7 +12939,7 @@ wxString wxRichTextDecimalToRoman(long n)
  * Base class for file handlers
  */
 
-IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextFileHandler, wxObject);
 
 #if wxUSE_FFILE && wxUSE_STREAMS
 bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
@@ -12975,7 +12975,7 @@ bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
  * Plain text handler
  */
 
-IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
+wxIMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler);
 
 #if wxUSE_STREAMS
 bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
@@ -13503,7 +13503,7 @@ wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec, double
     }
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject);
 
 wxRichTextFontTable::wxRichTextFontTable()
 {
@@ -15032,7 +15032,7 @@ WX_DEFINE_OBJARRAY(wxRichTextVariantArray);
 WX_DEFINE_OBJARRAY(wxRichTextAttrArray);
 WX_DEFINE_OBJARRAY(wxRichTextRectArray);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject);
 
 bool wxRichTextProperties::operator==(const wxRichTextProperties& props) const
 {
@@ -15342,8 +15342,8 @@ bool wxRichTextSelection::WithinSelection(const wxRichTextRange& range, const wx
     return false;
 }
 
-IMPLEMENT_CLASS(wxRichTextDrawingHandler, wxObject)
-IMPLEMENT_CLASS(wxRichTextDrawingContext, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextDrawingHandler, wxObject);
+wxIMPLEMENT_CLASS(wxRichTextDrawingContext, wxObject);
 
 wxRichTextDrawingContext::wxRichTextDrawingContext(wxRichTextBuffer* buffer)
 {
diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp
index 99c4bc7473..47c3178f57 100644
--- a/src/richtext/richtextbulletspage.cpp
+++ b/src/richtext/richtextbulletspage.cpp
@@ -19,13 +19,13 @@
  * wxRichTextBulletsPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextBulletsPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextBulletsPage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextBulletsPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextBulletsPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextBulletsPage, wxRichTextDialogPage)
 
 ////@begin wxRichTextBulletsPage event table entries
     EVT_LISTBOX( ID_RICHTEXTBULLETSPAGE_STYLELISTBOX, wxRichTextBulletsPage::OnStylelistboxSelected )
@@ -57,7 +57,7 @@ BEGIN_EVENT_TABLE( wxRichTextBulletsPage, wxRichTextDialogPage )
     EVT_UPDATE_UI( ID_RICHTEXTBULLETSPAGE_NUMBERCTRL, wxRichTextBulletsPage::OnNumberctrlUpdate )
 ////@end wxRichTextBulletsPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextBulletsPage)
 
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index c069d761c3..83aaf09d1f 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -154,11 +154,11 @@ private:
 };
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextCtrl, wxControl )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextCtrl, wxControl);
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextEvent, wxNotifyEvent);
 
-BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
+wxBEGIN_EVENT_TABLE(wxRichTextCtrl, wxControl)
     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
     EVT_IDLE(wxRichTextCtrl::OnIdle)
@@ -209,7 +209,7 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_MENU(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnProperties)
     EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnUpdateProperties)
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 /*!
  * wxRichTextCtrl
diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index cf117988ec..c3ae39eb03 100644
--- a/src/richtext/richtextfontpage.cpp
+++ b/src/richtext/richtextfontpage.cpp
@@ -14,13 +14,13 @@
  * wxRichTextFontPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextFontPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextFontPage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextFontPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextFontPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE( wxRichTextFontPage, wxRichTextDialogPage )
     EVT_LISTBOX( ID_RICHTEXTFONTPAGE_FACELISTBOX, wxRichTextFontPage::OnFaceListBoxSelected )
     EVT_BUTTON( ID_RICHTEXTFONTPAGE_COLOURCTRL, wxRichTextFontPage::OnColourClicked )
     EVT_BUTTON( ID_RICHTEXTFONTPAGE_BGCOLOURCTRL, wxRichTextFontPage::OnColourClicked )
@@ -45,7 +45,7 @@ BEGIN_EVENT_TABLE( wxRichTextFontPage, wxRichTextDialogPage )
     EVT_CHECKBOX( ID_RICHTEXTFONTPAGE_SUBSCRIPT, wxRichTextFontPage::OnRichtextfontpageSubscriptClick )
 ////@end wxRichTextFontPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextFontPage)
 
diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 8383ca479f..aad636522f 100644
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -79,15 +79,15 @@ bool wxRichTextFormattingDialog::sm_showToolTips = false;
 bool wxRichTextFormattingDialog::sm_restoreLastPage = true;
 int wxRichTextFormattingDialog::sm_lastPage = -1;
 
-IMPLEMENT_CLASS(wxRichTextDialogPage, wxPanel)
+wxIMPLEMENT_CLASS(wxRichTextDialogPage, wxPanel);
 
-IMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog)
+wxIMPLEMENT_CLASS(wxRichTextFormattingDialog, wxPropertySheetDialog);
 
-BEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)
+wxBEGIN_EVENT_TABLE(wxRichTextFormattingDialog, wxPropertySheetDialog)
     EVT_BOOKCTRL_PAGE_CHANGED(wxID_ANY, wxRichTextFormattingDialog::OnTabChanged)
     EVT_BUTTON(wxID_HELP, wxRichTextFormattingDialog::OnHelp)
     EVT_UPDATE_UI(wxID_HELP, wxRichTextFormattingDialog::OnUpdateHelp)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextFormattingDialog)
 
@@ -489,22 +489,22 @@ bool wxRichTextFormattingDialogFactory::ShowHelp(int WXUNUSED(page), wxRichTextF
 
 class wxRichTextFormattingDialogModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule)
+    wxDECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule);
 public:
     wxRichTextFormattingDialogModule() {}
     bool OnInit() wxOVERRIDE { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; }
     void OnExit() wxOVERRIDE { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule);
 
 /*
  * Font preview control
  */
 
-BEGIN_EVENT_TABLE(wxRichTextFontPreviewCtrl, wxWindow)
+wxBEGIN_EVENT_TABLE(wxRichTextFontPreviewCtrl, wxWindow)
     EVT_PAINT(wxRichTextFontPreviewCtrl::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRichTextFontPreviewCtrl::wxRichTextFontPreviewCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& sz, long style)
 {
@@ -744,11 +744,11 @@ bool wxRichTextFormattingDialog::ConvertFromString(const wxString& str, int& ret
  * A control for displaying a small preview of a colour or bitmap
  */
 
-BEGIN_EVENT_TABLE(wxRichTextColourSwatchCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxRichTextColourSwatchCtrl, wxControl)
     EVT_MOUSE_EVENTS(wxRichTextColourSwatchCtrl::OnMouseEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-IMPLEMENT_CLASS(wxRichTextColourSwatchCtrl, wxControl)
+wxIMPLEMENT_CLASS(wxRichTextColourSwatchCtrl, wxControl);
 
 wxRichTextColourSwatchCtrl::wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
 {
@@ -809,10 +809,10 @@ void wxRichTextColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
  * A listbox to display styles.
  */
 
-IMPLEMENT_CLASS(wxRichTextFontListBox, wxHtmlListBox)
+wxIMPLEMENT_CLASS(wxRichTextFontListBox, wxHtmlListBox);
 
-BEGIN_EVENT_TABLE(wxRichTextFontListBox, wxHtmlListBox)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxRichTextFontListBox, wxHtmlListBox)
+wxEND_EVENT_TABLE()
 
 wxRichTextFontListBox::wxRichTextFontListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos,
     const wxSize& size, long style)
diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index f779ec5567..af3d8f7ff9 100644
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -32,7 +32,7 @@
 #include "wx/fs_mem.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextHTMLHandler, wxRichTextFileHandler);
 
 int wxRichTextHTMLHandler::sm_fileCounter = 1;
 
diff --git a/src/richtext/richtextimagedlg.cpp b/src/richtext/richtextimagedlg.cpp
index 3cf80ec924..76a1ad1fc1 100644
--- a/src/richtext/richtextimagedlg.cpp
+++ b/src/richtext/richtextimagedlg.cpp
@@ -39,19 +39,19 @@
  * wxRichTextObjectPropertiesDialog type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextObjectPropertiesDialog, wxRichTextFormattingDialog )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextObjectPropertiesDialog, wxRichTextFormattingDialog);
 
 
 /*!
  * wxRichTextObjectPropertiesDialog event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextObjectPropertiesDialog, wxRichTextFormattingDialog )
+wxBEGIN_EVENT_TABLE(wxRichTextObjectPropertiesDialog, wxRichTextFormattingDialog)
 
 ////@begin wxRichTextObjectPropertiesDialog event table entries
 ////@end wxRichTextObjectPropertiesDialog event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 /*!
diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp
index d51270dbd1..b694c6b04b 100644
--- a/src/richtext/richtextindentspage.cpp
+++ b/src/richtext/richtextindentspage.cpp
@@ -16,13 +16,13 @@
  * wxRichTextIndentsSpacingPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextIndentsSpacingPage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextIndentsSpacingPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextIndentsSpacingPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE( wxRichTextIndentsSpacingPage, wxRichTextDialogPage )
 
 ////@begin wxRichTextIndentsSpacingPage event table entries
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT, wxRichTextIndentsSpacingPage::OnAlignmentLeftSelected )
@@ -39,7 +39,7 @@ BEGIN_EVENT_TABLE( wxRichTextIndentsSpacingPage, wxRichTextDialogPage )
     EVT_COMBOBOX( ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, wxRichTextIndentsSpacingPage::OnSpacingLineSelected )
 ////@end wxRichTextIndentsSpacingPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextIndentsSpacingPage)
 
diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp
index b9882c2208..f7908d949d 100644
--- a/src/richtext/richtextliststylepage.cpp
+++ b/src/richtext/richtextliststylepage.cpp
@@ -17,13 +17,13 @@
  * wxRichTextListStylePage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextListStylePage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextListStylePage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextListStylePage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextListStylePage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextListStylePage, wxRichTextDialogPage)
 
 ////@begin wxRichTextListStylePage event table entries
     EVT_SPINCTRL( ID_RICHTEXTLISTSTYLEPAGE_LEVEL, wxRichTextListStylePage::OnLevelUpdated )
@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE( wxRichTextListStylePage, wxRichTextDialogPage )
 
 ////@end wxRichTextListStylePage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextListStylePage)
 
diff --git a/src/richtext/richtextmarginspage.cpp b/src/richtext/richtextmarginspage.cpp
index f9233d7222..51a3145cc4 100644
--- a/src/richtext/richtextmarginspage.cpp
+++ b/src/richtext/richtextmarginspage.cpp
@@ -18,14 +18,14 @@
  * wxRichTextMarginsPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextMarginsPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextMarginsPage, wxRichTextDialogPage);
 
 
 /*!
  * wxRichTextMarginsPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextMarginsPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextMarginsPage, wxRichTextDialogPage)
 
 ////@begin wxRichTextMarginsPage event table entries
     EVT_UPDATE_UI( ID_RICHTEXT_LEFT_MARGIN, wxRichTextMarginsPage::OnRichtextLeftMarginUpdate )
@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE( wxRichTextMarginsPage, wxRichTextDialogPage )
 
 ////@end wxRichTextMarginsPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextMarginsPage)
 
diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp
index 926f1bc296..f89791b301 100644
--- a/src/richtext/richtextprint.cpp
+++ b/src/richtext/richtextprint.cpp
@@ -669,7 +669,7 @@ wxString wxRichTextPrinting::GetFooterText(wxRichTextOddEvenPage page, wxRichTex
  * Header/footer data
  */
 
-IMPLEMENT_CLASS(wxRichTextHeaderFooterData, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextHeaderFooterData, wxObject);
 
 /// Copy
 void wxRichTextHeaderFooterData::Copy(const wxRichTextHeaderFooterData& data)
diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp
index 6207f921ed..585c88e4da 100644
--- a/src/richtext/richtextsizepage.cpp
+++ b/src/richtext/richtextsizepage.cpp
@@ -17,14 +17,14 @@
  * wxRichTextSizePage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextSizePage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextSizePage, wxRichTextDialogPage);
 
 
 /*!
  * wxRichTextSizePage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextSizePage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextSizePage, wxRichTextDialogPage)
 
 ////@begin wxRichTextSizePage event table entries
     EVT_UPDATE_UI( ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX, wxRichTextSizePage::OnRichtextVerticalAlignmentComboboxUpdate )
@@ -52,7 +52,7 @@ BEGIN_EVENT_TABLE( wxRichTextSizePage, wxRichTextDialogPage )
     EVT_BUTTON( ID_RICHTEXT_PARA_DOWN, wxRichTextSizePage::OnRichtextParaDownClick )
 ////@end wxRichTextSizePage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextSizePage)
 
diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp
index 75e821a694..e8443093c6 100644
--- a/src/richtext/richtextstyledlg.cpp
+++ b/src/richtext/richtextstyledlg.cpp
@@ -30,13 +30,13 @@
 
 bool wxRichTextStyleOrganiserDialog::sm_showToolTips = false;
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog, wxDialog )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextStyleOrganiserDialog, wxDialog);
 
 /*!
  * wxRichTextStyleOrganiserDialog event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextStyleOrganiserDialog, wxDialog )
+wxBEGIN_EVENT_TABLE(wxRichTextStyleOrganiserDialog, wxDialog)
 
     EVT_LISTBOX(wxID_ANY, wxRichTextStyleOrganiserDialog::OnListSelection)
 
@@ -60,7 +60,7 @@ BEGIN_EVENT_TABLE( wxRichTextStyleOrganiserDialog, wxDialog )
     EVT_BUTTON( wxID_HELP, wxRichTextStyleOrganiserDialog::OnHelpClick )
 ////@end wxRichTextStyleOrganiserDialog event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextStyleOrganiserDialog)
 
diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp
index b28400b7cd..35aac07bb4 100644
--- a/src/richtext/richtextstylepage.cpp
+++ b/src/richtext/richtextstylepage.cpp
@@ -16,20 +16,20 @@
  * wxRichTextStylePage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextStylePage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextStylePage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextStylePage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextStylePage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextStylePage, wxRichTextDialogPage)
 
 ////@begin wxRichTextStylePage event table entries
     EVT_UPDATE_UI( ID_RICHTEXTSTYLEPAGE_NEXT_STYLE, wxRichTextStylePage::OnNextStyleUpdate )
 
 ////@end wxRichTextStylePage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextStylePage)
 
diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index bb6bc5dc9d..50dc49c393 100644
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -30,11 +30,11 @@
 
 #include "wx/richtext/richtextctrl.h"
 
-IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject)
-IMPLEMENT_CLASS(wxRichTextCharacterStyleDefinition, wxRichTextStyleDefinition)
-IMPLEMENT_CLASS(wxRichTextParagraphStyleDefinition, wxRichTextStyleDefinition)
-IMPLEMENT_CLASS(wxRichTextListStyleDefinition, wxRichTextParagraphStyleDefinition)
-IMPLEMENT_CLASS(wxRichTextBoxStyleDefinition, wxRichTextStyleDefinition)
+wxIMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject);
+wxIMPLEMENT_CLASS(wxRichTextCharacterStyleDefinition, wxRichTextStyleDefinition);
+wxIMPLEMENT_CLASS(wxRichTextParagraphStyleDefinition, wxRichTextStyleDefinition);
+wxIMPLEMENT_CLASS(wxRichTextListStyleDefinition, wxRichTextParagraphStyleDefinition);
+wxIMPLEMENT_CLASS(wxRichTextBoxStyleDefinition, wxRichTextStyleDefinition);
 
 /*!
  * A definition
@@ -290,7 +290,7 @@ bool wxRichTextListStyleDefinition::IsNumbered(int i) const
  * The style manager
  */
 
-IMPLEMENT_CLASS(wxRichTextStyleSheet, wxObject)
+wxIMPLEMENT_CLASS(wxRichTextStyleSheet, wxObject);
 
 wxRichTextStyleSheet::~wxRichTextStyleSheet()
 {
@@ -554,13 +554,13 @@ static wxString wxGetRichTextStyle(const wxString& style)
  * wxRichTextStyleListBox: a listbox to display styles.
  */
 
-IMPLEMENT_CLASS(wxRichTextStyleListBox, wxHtmlListBox)
+wxIMPLEMENT_CLASS(wxRichTextStyleListBox, wxHtmlListBox);
 
-BEGIN_EVENT_TABLE(wxRichTextStyleListBox, wxHtmlListBox)
+wxBEGIN_EVENT_TABLE(wxRichTextStyleListBox, wxHtmlListBox)
     EVT_LEFT_DOWN(wxRichTextStyleListBox::OnLeftDown)
     EVT_LEFT_DCLICK(wxRichTextStyleListBox::OnLeftDoubleClick)
     EVT_IDLE(wxRichTextStyleListBox::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRichTextStyleListBox::wxRichTextStyleListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos,
     const wxSize& size, long style)
@@ -1017,12 +1017,12 @@ void wxRichTextStyleListBox::ApplyStyle(int item)
  * switch shown style types
  */
 
-IMPLEMENT_CLASS(wxRichTextStyleListCtrl, wxControl)
+wxIMPLEMENT_CLASS(wxRichTextStyleListCtrl, wxControl);
 
-BEGIN_EVENT_TABLE(wxRichTextStyleListCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxRichTextStyleListCtrl, wxControl)
     EVT_CHOICE(wxID_ANY, wxRichTextStyleListCtrl::OnChooseType)
     EVT_SIZE(wxRichTextStyleListCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxRichTextStyleListCtrl::wxRichTextStyleListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos,
     const wxSize& size, long style)
@@ -1230,10 +1230,10 @@ void wxRichTextStyleListCtrl::UpdateStyles()
  */
 
 
-BEGIN_EVENT_TABLE(wxRichTextStyleComboPopup, wxRichTextStyleListBox)
+wxBEGIN_EVENT_TABLE(wxRichTextStyleComboPopup, wxRichTextStyleListBox)
     EVT_MOTION(wxRichTextStyleComboPopup::OnMouseMove)
     EVT_LEFT_DOWN(wxRichTextStyleComboPopup::OnMouseClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxRichTextStyleComboPopup::Create( wxWindow* parent )
 {
@@ -1300,11 +1300,11 @@ void wxRichTextStyleComboPopup::OnMouseClick(wxMouseEvent& WXUNUSED(event))
  * A combo for applying styles.
  */
 
-IMPLEMENT_CLASS(wxRichTextStyleComboCtrl, wxComboCtrl)
+wxIMPLEMENT_CLASS(wxRichTextStyleComboCtrl, wxComboCtrl);
 
-BEGIN_EVENT_TABLE(wxRichTextStyleComboCtrl, wxComboCtrl)
+wxBEGIN_EVENT_TABLE(wxRichTextStyleComboCtrl, wxComboCtrl)
     EVT_IDLE(wxRichTextStyleComboCtrl::OnIdle)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 bool wxRichTextStyleComboCtrl::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos,
         const wxSize& size, long style)
diff --git a/src/richtext/richtextsymboldlg.cpp b/src/richtext/richtextsymboldlg.cpp
index 9c482459c1..4fd387243f 100644
--- a/src/richtext/richtextsymboldlg.cpp
+++ b/src/richtext/richtextsymboldlg.cpp
@@ -281,13 +281,13 @@ bool wxSymbolPickerDialog::sm_showToolTips = false;
  * wxSymbolPickerDialog type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxSymbolPickerDialog, wxDialog )
+wxIMPLEMENT_DYNAMIC_CLASS(wxSymbolPickerDialog, wxDialog);
 
 /*!
  * wxSymbolPickerDialog event table definition
  */
 
-BEGIN_EVENT_TABLE( wxSymbolPickerDialog, wxDialog )
+wxBEGIN_EVENT_TABLE(wxSymbolPickerDialog, wxDialog)
     EVT_LISTBOX(ID_SYMBOLPICKERDIALOG_LISTCTRL, wxSymbolPickerDialog::OnSymbolSelected)
 
 ////@begin wxSymbolPickerDialog event table entries
@@ -306,7 +306,7 @@ BEGIN_EVENT_TABLE( wxSymbolPickerDialog, wxDialog )
     EVT_UPDATE_UI( wxID_HELP, wxSymbolPickerDialog::OnHelpUpdate )
 ////@end wxSymbolPickerDialog event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxSymbolPickerDialog)
 
@@ -750,20 +750,20 @@ wxIcon wxSymbolPickerDialog::GetIconResource( const wxString& name )
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxSymbolListCtrl, wxVScrolledWindow)
+wxBEGIN_EVENT_TABLE(wxSymbolListCtrl, wxVScrolledWindow)
     EVT_PAINT(wxSymbolListCtrl::OnPaint)
     EVT_SIZE(wxSymbolListCtrl::OnSize)
 
     EVT_KEY_DOWN(wxSymbolListCtrl::OnKeyDown)
     EVT_LEFT_DOWN(wxSymbolListCtrl::OnLeftDown)
     EVT_LEFT_DCLICK(wxSymbolListCtrl::OnLeftDClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxSymbolListCtrl, wxVScrolledWindow)
+wxIMPLEMENT_ABSTRACT_CLASS(wxSymbolListCtrl, wxVScrolledWindow);
 
 // ----------------------------------------------------------------------------
 // wxSymbolListCtrl creation
diff --git a/src/richtext/richtexttabspage.cpp b/src/richtext/richtexttabspage.cpp
index 7cc3d50a29..cf4f9f82da 100644
--- a/src/richtext/richtexttabspage.cpp
+++ b/src/richtext/richtexttabspage.cpp
@@ -16,13 +16,13 @@
  * wxRichTextTabsPage type definition
  */
 
-IMPLEMENT_DYNAMIC_CLASS( wxRichTextTabsPage, wxRichTextDialogPage )
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextTabsPage, wxRichTextDialogPage);
 
 /*!
  * wxRichTextTabsPage event table definition
  */
 
-BEGIN_EVENT_TABLE( wxRichTextTabsPage, wxRichTextDialogPage )
+wxBEGIN_EVENT_TABLE(wxRichTextTabsPage, wxRichTextDialogPage)
 
 ////@begin wxRichTextTabsPage event table entries
     EVT_LISTBOX( ID_RICHTEXTTABSPAGE_TABLIST, wxRichTextTabsPage::OnTablistSelected )
@@ -34,7 +34,7 @@ BEGIN_EVENT_TABLE( wxRichTextTabsPage, wxRichTextDialogPage )
     EVT_UPDATE_UI( ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS, wxRichTextTabsPage::OnDeleteAllTabsUpdate )
 ////@end wxRichTextTabsPage event table entries
 
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 IMPLEMENT_HELP_PROVISION(wxRichTextTabsPage)
 
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 6660faf5aa..9a3af28a2e 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -60,7 +60,7 @@
 // Set to 1 to time file saving
 #define wxRICHTEXT_USE_OUTPUT_TIMINGS 0
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextXMLHandler, wxRichTextFileHandler);
 
 wxStringToStringHashMap wxRichTextXMLHandler::sm_nodeNameToClassMap;
 
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 81711665cf..98cde26a90 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -840,17 +840,17 @@ public:
 #endif
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
+wxBEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
     EVT_SET_FOCUS( wxSTCListBox::OnFocus)
     EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus)
 #ifdef __WXMAC__
     EVT_KEY_DOWN(  wxSTCListBox::OnKeyDown)
     EVT_CHAR(      wxSTCListBox::OnChar)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 
@@ -973,15 +973,15 @@ public:
     wxListView* GetLB() { return lv; }
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 
 };
 
-BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
+wxBEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
     EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
     EVT_SIZE               (          wxSTCListBoxWin::OnSize)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 
@@ -1125,15 +1125,15 @@ public:
     wxListView* GetLB() { return lv; }
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
-BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
+wxBEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
     EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
     EVT_SIZE               (          wxSTCListBoxWin::OnSize)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 #endif // wxUSE_POPUPWIN -----------------------------------
 
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 67d966de87..a22707ce58 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -195,14 +195,14 @@ private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;
     int           m_cx, m_cy;
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
+wxBEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
     EVT_PAINT(wxSTCCallTip::OnPaint)
     EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
     EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 //----------------------------------------------------------------------
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 08de5bffa4..d4c0923078 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -139,7 +139,7 @@ wxDEFINE_EVENT( wxEVT_STC_CLIPBOARD_PASTE, wxStyledTextEvent );
 
 
 
-BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
     EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
     EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
     EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
@@ -164,11 +164,11 @@ BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
     EVT_ERASE_BACKGROUND        (wxStyledTextCtrl::OnEraseBackground)
     EVT_MENU_RANGE              (10, 16, wxStyledTextCtrl::OnMenu)
     EVT_LISTBOX_DCLICK          (wxID_ANY, wxStyledTextCtrl::OnListBox)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
+wxIMPLEMENT_CLASS(wxStyledTextCtrl, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent);
 
 #ifdef LINK_LEXERS
 // forces the linking of the lexer modules
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index d78d8ec6eb..c54b671a99 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -139,7 +139,7 @@ wxDEFINE_EVENT( wxEVT_STC_CLIPBOARD_PASTE, wxStyledTextEvent );
 
 
 
-BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
+wxBEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
     EVT_PAINT                   (wxStyledTextCtrl::OnPaint)
     EVT_SCROLLWIN               (wxStyledTextCtrl::OnScrollWin)
     EVT_SCROLL                  (wxStyledTextCtrl::OnScroll)
@@ -164,11 +164,11 @@ BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
     EVT_ERASE_BACKGROUND        (wxStyledTextCtrl::OnEraseBackground)
     EVT_MENU_RANGE              (10, 16, wxStyledTextCtrl::OnMenu)
     EVT_LISTBOX_DCLICK          (wxID_ANY, wxStyledTextCtrl::OnListBox)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
-IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
+wxIMPLEMENT_CLASS(wxStyledTextCtrl, wxControl);
+wxIMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent);
 
 #ifdef LINK_LEXERS
 // forces the linking of the lexer modules
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index f0f89491ab..f506426857 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -504,8 +504,8 @@ protected:
     void NotifyParent(SCNotification* scn);
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxStyledTextCtrl);
 
 protected:
 
@@ -608,7 +608,7 @@ public:
 
 #ifndef SWIG
 private:
-    DECLARE_DYNAMIC_CLASS(wxStyledTextEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxStyledTextEvent);
 
     int  m_position;
     int  m_key;
diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index ca8d01378a..a239214da9 100644
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -37,10 +37,10 @@
 // implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
+wxBEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
     EVT_SET_FOCUS(wxBitmapButton::OnSetFocus)
     EVT_KILL_FOCUS(wxBitmapButton::OnKillFocus)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index 8dcb99b748..5af7cb3f62 100644
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -30,9 +30,9 @@
     #include "wx/arrstr.h"
 #endif
 
-BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
+wxBEGIN_EVENT_TABLE(wxChoice, wxComboBox)
     EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos,
diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 3afcf097d3..7af306c92d 100644
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -93,16 +93,16 @@ protected:
 private:
     friend class wxComboBox; // it accesses our DoGetItemClientData()
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
 // event tables and such
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
+wxBEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index 9e6a4b2de8..400cba8978 100644
--- a/src/univ/control.cpp
+++ b/src/univ/control.cpp
@@ -39,11 +39,11 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
+wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
 
-BEGIN_EVENT_TABLE(wxControl, wxControlBase)
+wxBEGIN_EVENT_TABLE(wxControl, wxControlBase)
     WX_EVENT_TABLE_INPUT_CONSUMER(wxControl)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 WX_FORWARD_TO_INPUT_CONSUMER(wxControl)
 
diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index f12d20baa1..4f85197897 100644
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -34,12 +34,12 @@
 // wxDialog
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
+wxBEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
     EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
     EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxDialog::Init()
 {
diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index eb333546fd..94f7a352f5 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -36,10 +36,10 @@
 // implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+wxBEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SIZE(wxFrame::OnSize)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // ctors
diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 334891c65b..e146f1109c 100644
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -96,9 +96,9 @@ protected:
 // implementation of wxListBox
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
+wxBEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
     EVT_SIZE(wxListBox::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // construction
diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index a45f476090..ce9c4d492b 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -246,7 +246,7 @@ private:
     // do we currently have an opened submenu?
     bool m_hasOpenSubMenu;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -280,7 +280,7 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
+wxBEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupMenuWindow::OnKeyDown)
 
     EVT_LEFT_UP(wxPopupMenuWindow::OnLeftUp)
@@ -289,16 +289,16 @@ BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
 #ifdef __WXMSW__
     EVT_IDLE(wxPopupMenuWindow::OnIdle)
 #endif
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)
+wxBEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)
     EVT_KILL_FOCUS(wxMenuBar::OnKillFocus)
 
     EVT_KEY_DOWN(wxMenuBar::OnKeyDown)
 
     EVT_LEFT_DOWN(wxMenuBar::OnLeftDown)
     EVT_MOTION(wxMenuBar::OnMouseMove)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index 78f0c55d79..e68d51f07e 100644
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -93,12 +93,12 @@ protected:
 private:
     wxNotebook *m_nb;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
+wxBEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
     EVT_SPIN(wxID_ANY, wxNotebookSpinBtn::OnSpin)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 9b1855cc04..dd3049631b 100644
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -86,7 +86,7 @@ private:
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 // ----------------------------------------------------------------------------
 // wxRadioBox creation
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 35d3387552..d29b858c87 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -73,8 +73,8 @@ private:
 // implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // creation
diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp
index b0d4735ff7..1a0883f73c 100644
--- a/src/univ/slider.cpp
+++ b/src/univ/slider.cpp
@@ -95,9 +95,9 @@ static const wxCoord SLIDER_LABEL_MARGIN = 2;
 // implementation of wxSlider
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxSlider, wxControl)
+wxBEGIN_EVENT_TABLE(wxSlider, wxControl)
     EVT_SIZE(wxSlider::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // wxSlider creation
diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 71408e5db3..ecd25d968b 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -38,11 +38,11 @@
 // implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxStatusBarUniv, wxStatusBarBase)
+wxBEGIN_EVENT_TABLE(wxStatusBarUniv, wxStatusBarBase)
     EVT_SIZE(wxStatusBarUniv::OnSize)
 
     WX_EVENT_TABLE_INPUT_CONSUMER(wxStatusBarUniv)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 WX_FORWARD_TO_INPUT_CONSUMER(wxStatusBarUniv)
 
diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 307ce89f7b..51aa4bc903 100644
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -626,11 +626,11 @@ private:
 // implementation
 // ============================================================================
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_SIZE(wxTextCtrl::OnSize)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // creation
diff --git a/src/univ/tglbtn.cpp b/src/univ/tglbtn.cpp
index 0d5ad993ed..1ecfbe8512 100644
--- a/src/univ/tglbtn.cpp
+++ b/src/univ/tglbtn.cpp
@@ -25,7 +25,7 @@
 
 wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase);
 
 wxToggleButton::wxToggleButton()
 {
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 09ba0fb250..4b56e0137a 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -3603,7 +3603,7 @@ public:
     void Detach();
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void OnSystemMenu(wxCommandEvent &event);
     void OnCloseFrame(wxCommandEvent &event);
     void OnClose(wxCloseEvent &event);
@@ -3652,11 +3652,11 @@ void wxWin32SystemMenuEvtHandler::Detach()
     }
 }
 
-BEGIN_EVENT_TABLE(wxWin32SystemMenuEvtHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxWin32SystemMenuEvtHandler, wxEvtHandler)
     EVT_MENU(wxID_SYSTEM_MENU, wxWin32SystemMenuEvtHandler::OnSystemMenu)
     EVT_MENU(wxID_CLOSE_FRAME, wxWin32SystemMenuEvtHandler::OnCloseFrame)
     EVT_CLOSE(wxWin32SystemMenuEvtHandler::OnClose)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxWin32SystemMenuEvtHandler::OnSystemMenu(wxCommandEvent &WXUNUSED(event))
 {
diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 99ac239271..833bd80334 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -153,7 +153,7 @@ private:
 // wxToolBar implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
 
 // ----------------------------------------------------------------------------
 // wxToolBar creation
diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index 63fe8f7f23..312ce6a912 100644
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -62,11 +62,11 @@ private:
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
+wxBEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
     WX_EVENT_TABLE_INPUT_CONSUMER(wxTopLevelWindow)
     EVT_NC_PAINT(wxTopLevelWindow::OnNcPaint)
     EVT_MENU_RANGE(wxID_CLOSE_FRAME, wxID_RESTORE_FRAME, wxTopLevelWindow::OnSystemMenu)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow)
 
@@ -407,7 +407,7 @@ public:
     wxInteractiveMoveHandler(wxInteractiveMoveData& data) : m_data(data) {}
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
@@ -416,12 +416,12 @@ private:
     wxInteractiveMoveData& m_data;
 };
 
-BEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
     EVT_MOTION(wxInteractiveMoveHandler::OnMouseMove)
     EVT_LEFT_DOWN(wxInteractiveMoveHandler::OnMouseDown)
     EVT_LEFT_UP(wxInteractiveMoveHandler::OnMouseUp)
     EVT_KEY_DOWN(wxInteractiveMoveHandler::OnKeyDown)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 static inline LINKAGEMODE
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index b43fae652c..3197b75ab9 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -88,18 +88,18 @@ public:
 
 // we can't use wxWindowNative here as it won't be expanded inside the macro
 #if defined(__WXMSW__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMSW)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMSW);
 #elif defined(__WXGTK__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK);
 #elif defined(__WXOSX__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac);
 #elif defined(__WXDFB__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB);
 #elif defined(__WXX11__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11);
 #endif
 
-BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
+wxBEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
     EVT_SIZE(wxWindow::OnSize)
 
 #if wxUSE_ACCEL || wxUSE_MENUS
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
     EVT_PAINT(wxWindow::OnPaint)
     EVT_NC_PAINT(wxWindow::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindow::OnErase)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // creation
diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 45d5e3cce5..22f65947f5 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -1500,10 +1500,10 @@ public:
     void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxFontModule)
+    wxDECLARE_DYNAMIC_CLASS(wxFontModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontModule, wxModule);
 
 bool wxFontModule::OnInit()
 {
diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp
index c81a8c967a..be024b63c7 100644
--- a/src/unix/glx11.cpp
+++ b/src/unix/glx11.cpp
@@ -112,7 +112,7 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC)
 // wxGLContext implementation
 // ============================================================================
 
-IMPLEMENT_CLASS(wxGLContext, wxObject)
+wxIMPLEMENT_CLASS(wxGLContext, wxObject);
 
 wxGLContext::wxGLContext(wxGLCanvas *gc, const wxGLContext *other)
 {
diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 28635e402f..5896e0450f 100644
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -52,7 +52,7 @@ enum {
 };
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject);
 
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index f221692044..02f7947d16 100644
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -226,7 +226,7 @@ public:
 
     friend class wxGStreamerMediaEventHandler;
     friend class wxGStreamerLoadWaitTimer;
-    DECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend)
+    wxDECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend);
 };
 
 //-----------------------------------------------------------------------------
@@ -256,7 +256,7 @@ class wxGStreamerMediaEventHandler : public wxEvtHandler
 // Implementation
 //=============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend);
 
 //-----------------------------------------------------------------------------
 //
diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 6f671d3125..342a58f7e4 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -714,9 +714,9 @@ class wxSoundCleanupModule: public wxModule
 public:
     bool OnInit() wxOVERRIDE { return true; }
     void OnExit() wxOVERRIDE { wxSound::UnloadBackend(); }
-    DECLARE_DYNAMIC_CLASS(wxSoundCleanupModule)
+    wxDECLARE_DYNAMIC_CLASS(wxSoundCleanupModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxSoundCleanupModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSoundCleanupModule, wxModule);
 
 #endif
diff --git a/src/unix/sound_sdl.cpp b/src/unix/sound_sdl.cpp
index 0fc4ebf3ff..373174c36b 100644
--- a/src/unix/sound_sdl.cpp
+++ b/src/unix/sound_sdl.cpp
@@ -37,7 +37,7 @@
 class wxSoundBackendSDLNotification : public wxEvent
 {
 public:
-    DECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification)
+    wxDECLARE_DYNAMIC_CLASS(wxSoundBackendSDLNotification);
     wxSoundBackendSDLNotification();
     wxEvent *Clone() const { return new wxSoundBackendSDLNotification(*this); }
 };
@@ -54,7 +54,7 @@ wxDECLARE_EVENT(wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotificat
                               wxEVENT_HANDLER_CAST( wxSoundBackendSDLNotificationFunction, func ), \
                               NULL ),
 
-IMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSoundBackendSDLNotification, wxEvtHandler);
 wxDEFINE_EVENT( wxEVT_SOUND_BACKEND_SDL_NOTIFICATION, wxSoundBackendSDLNotification );
 
 wxSoundBackendSDLNotification::wxSoundBackendSDLNotification()
@@ -114,12 +114,12 @@ private:
     }
     wxSoundBackendSDL *m_backend;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxSoundBackendSDLEvtHandler, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(wxSoundBackendSDLEvtHandler, wxEvtHandler)
     EVT_SOUND_BACKEND_SDL_NOTIFICATON(wxSoundBackendSDLEvtHandler::OnNotify)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxSoundBackendSDL::~wxSoundBackendSDL()
 {
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 146d2ccd9c..5633edbbde 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -100,15 +100,15 @@ protected:
     wxPoint        m_pos;
     wxBitmap       m_bmp;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
+wxBEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
     EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
     EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent)
     EVT_PAINT(wxTaskBarIconArea::OnPaint)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
     : wxTaskBarIconAreaBase(), m_icon(icon), m_bmp(bmp)
@@ -246,7 +246,7 @@ bool wxTaskBarIconBase::IsAvailable()
 // wxTaskBarIcon class:
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler);
 
 wxTaskBarIcon::wxTaskBarIcon() : m_iconWnd(NULL)
 {
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 36b461256a..67ec9c3302 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -1781,10 +1781,10 @@ public:
     virtual void OnExit() wxOVERRIDE;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxThreadModule)
+    wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule);
 
 bool wxThreadModule::OnInit()
 {
diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp
index 9c98301770..9817804722 100644
--- a/src/unix/timerunx.cpp
+++ b/src/unix/timerunx.cpp
@@ -241,10 +241,10 @@ public:
     virtual bool OnInit() wxOVERRIDE { return true; }
     virtual void OnExit() wxOVERRIDE { wxTimerScheduler::Shutdown(); }
 
-    DECLARE_DYNAMIC_CLASS(wxTimerUnixModule)
+    wxDECLARE_DYNAMIC_CLASS(wxTimerUnixModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimerUnixModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimerUnixModule, wxModule);
 
 // ============================================================================
 // global functions
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 240b25fb30..3383e5cdf5 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1281,10 +1281,10 @@ public:
         gs_envVars.clear();
     }
 
-    DECLARE_DYNAMIC_CLASS(wxSetEnvModule)
+    wxDECLARE_DYNAMIC_CLASS(wxSetEnvModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule);
 
 #endif // USE_PUTENV
 
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 377c9582eb..5c62d41d8c 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -88,7 +88,7 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 
 long wxApp::sm_lastMessageTime = 0;
 
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 
 bool wxApp::Initialize(int& argC, wxChar **argV)
 {
diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 1a8f29766d..550506fe01 100644
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -50,7 +50,7 @@ static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap,
 // wxMask
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject);
 
 wxMask::wxMask()
 {
@@ -377,7 +377,7 @@ static WXPixmap wxGetSubPixmap( WXDisplay* xdisplay, WXPixmap xpixmap,
 
 #define M_BMPDATA ((wxBitmapRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject);
 
 bool wxBitmap::Create( int width, int height, int depth )
 {
@@ -1350,10 +1350,10 @@ public:
                         int WXUNUSED(depth) = 1)
         { return false; }
 
-    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxXPMFileHandler);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler);
 
 bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
                                 const wxString& name,
@@ -1445,7 +1445,7 @@ bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap,
 
 class wxXPMDataHandler : public wxBitmapHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxXPMDataHandler);
 public:
     wxXPMDataHandler()
     {
@@ -1471,7 +1471,7 @@ public:
                         int width, int height, int depth = 1);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler);
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
                               wxBitmapType WXUNUSED(flags),
@@ -1551,7 +1551,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
 
 class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxXBMDataHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxXBMDataHandler);
 public:
     inline wxXBMDataHandler()
     {
@@ -1577,7 +1577,7 @@ public:
                         int width, int height, int depth = 1);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler);
 
 bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,
                                wxBitmapType WXUNUSED(type),
diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp
index a792aab2c7..48b186bdf5 100644
--- a/src/x11/brush.cpp
+++ b/src/x11/brush.cpp
@@ -54,7 +54,7 @@ public:
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
 
 wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
 {
diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index d103097bc4..0cfe2e098e 100644
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -405,7 +405,7 @@ extern "C" void wxClipboardHandleSelectionRequest(XEvent event)
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject);
 
 wxClipboard::wxClipboard()
 {
diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index b8f7e4aa31..d12d15314b 100644
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -63,7 +63,7 @@ wxCursorRefData::~wxCursorRefData()
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject);
 
 wxCursor::wxCursor()
 {
diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp
index 25a110715f..b278aa7ca8 100644
--- a/src/x11/dc.cpp
+++ b/src/x11/dc.cpp
@@ -18,7 +18,7 @@
     #include "wx/dcmemory.h"
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxX11DCImpl, wxDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxX11DCImpl, wxDCImpl);
 
 //-----------------------------------------------------------------------------
 // wxDC
diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index e2f13b4ec8..7fba49e97c 100644
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -162,7 +162,7 @@ static void wxFreePoolGC( GC gc )
 // wxWindowDC
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxX11DCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxX11DCImpl);
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
   : wxX11DCImpl( owner )
@@ -2384,7 +2384,7 @@ int wxWindowDCImpl::GetDepth() const
 // wxClientDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window )
           : wxWindowDCImpl( owner, window )
@@ -2414,7 +2414,7 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 // wxPaintDC
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl);
 
 wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow* window)
   : wxClientDCImpl(owner, window)
@@ -2455,8 +2455,8 @@ public:
     void OnExit() { wxCleanUpGCPool(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxDCModule)
+    wxDECLARE_DYNAMIC_CLASS(wxDCModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule);
 
diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 54927d01ef..2679dde525 100644
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -21,7 +21,7 @@
 #include "wx/x11/private.h"
 #include "wx/x11/dcmemory.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl,wxWindowDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl);
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxDC *owner )
   : wxWindowDCImpl( owner )
diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 74ef3da31c..a61492f81d 100644
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -29,7 +29,7 @@
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl,wxPaintDCImpl)
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPaintDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl( wxDC* owner )
               : wxPaintDCImpl( owner )
diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index b6e7b5a6cf..d58cd1e31e 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -39,7 +39,7 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        wxWindowID id,
diff --git a/src/x11/minifram.cpp b/src/x11/minifram.cpp
index 6cbdb9bb7f..0ef6d7af2e 100644
--- a/src/x11/minifram.cpp
+++ b/src/x11/minifram.cpp
@@ -14,6 +14,6 @@
 
 #include "wx/minifram.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame);
 
 #endif // wxUSE_MINIFRAME
diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 0151b2c3b5..1cdf8bc4ad 100644
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -53,8 +53,8 @@ not the functionality that wxPalette::Create() aims to provide.
 #endif
 #include "wx/x11/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject);
 
 /*
 * Palette
diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index ec7da519b0..036c52f3da 100644
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -75,7 +75,7 @@ public:
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
-IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject);
 
 wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )
 {
diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 49239614cd..13e4ef33a0 100644
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -27,8 +27,8 @@
 // wxPopupWindow
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
+wxEND_EVENT_TABLE()
 
 wxPopupWindow::~wxPopupWindow()
 {
diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index ee6e510984..dca34a1f53 100644
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -60,8 +60,8 @@ public:
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 
-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject);
 
 // ----------------------------------------------------------------------------
 // wxRegion construction
diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 5df5cc4e03..dea9579417 100644
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -130,7 +130,7 @@ WX_DEFINE_OBJARRAY(wxSourceLineArray);
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
+wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_PAINT(wxTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
     EVT_CHAR(wxTextCtrl::OnChar)
@@ -149,7 +149,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 69750e035f..6bbb103242 100644
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -247,10 +247,10 @@ public:
     virtual void OnExit() { wxCloseDisplay(); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxX11DisplayModule)
+    wxDECLARE_DYNAMIC_CLASS(wxX11DisplayModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxX11DisplayModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxX11DisplayModule, wxModule);
 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index c026062d99..a48921ee4b 100644
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -84,11 +84,11 @@ static wxWindow* gs_toBeFocusedWindow = NULL;
 // event tables
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)
+wxIMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase);
 
-BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
+wxBEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // ============================================================================
 // implementation
@@ -1778,10 +1778,10 @@ public:
     virtual void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxWinModule)
+    wxDECLARE_DYNAMIC_CLASS(wxWinModule);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule);
 
 bool wxWinModule::OnInit()
 {
diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 665c4b906b..0328ffb9f5 100644
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -37,7 +37,7 @@
 WX_CHECK_BUILD_OPTIONS("wxXML")
 
 
-IMPLEMENT_CLASS(wxXmlDocument, wxObject)
+wxIMPLEMENT_CLASS(wxXmlDocument, wxObject);
 
 
 // a private utility used by wxXML
diff --git a/src/xrc/xh_activityindicator.cpp b/src/xrc/xh_activityindicator.cpp
index 9b2bc6a534..1673ccf2ec 100644
--- a/src/xrc/xh_activityindicator.cpp
+++ b/src/xrc/xh_activityindicator.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_activityindicator.h"
 #include "wx/activityindicator.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxActivityIndicatorXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxActivityIndicatorXmlHandler, wxXmlResourceHandler);
 
 wxActivityIndicatorXmlHandler::wxActivityIndicatorXmlHandler()
 {
diff --git a/src/xrc/xh_animatctrl.cpp b/src/xrc/xh_animatctrl.cpp
index aabcb53a7b..d2e8444352 100644
--- a/src/xrc/xh_animatctrl.cpp
+++ b/src/xrc/xh_animatctrl.cpp
@@ -20,7 +20,7 @@
 #include "wx/animate.h"
 #include "wx/scopedptr.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler, wxXmlResourceHandler);
 
 wxAnimationCtrlXmlHandler::wxAnimationCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_auitoolb.cpp b/src/xrc/xh_auitoolb.cpp
index d187db582e..498924bc29 100644
--- a/src/xrc/xh_auitoolb.cpp
+++ b/src/xrc/xh_auitoolb.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xrc/xh_auitoolb.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiToolBarXmlHandler, wxXmlResourceHandler);
 
 wxAuiToolBarXmlHandler::wxAuiToolBarXmlHandler()
     : wxXmlResourceHandler()
diff --git a/src/xrc/xh_bannerwindow.cpp b/src/xrc/xh_bannerwindow.cpp
index acba8dd837..d2ee73659d 100644
--- a/src/xrc/xh_bannerwindow.cpp
+++ b/src/xrc/xh_bannerwindow.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_bannerwindow.h"
 #include "wx/bannerwindow.h"
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxBannerWindowXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBannerWindowXmlHandler, wxXmlResourceHandler);
 
 wxBannerWindowXmlHandler::wxBannerWindowXmlHandler()
     : wxXmlResourceHandler()
diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 788f50f227..f1248664ca 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -22,7 +22,7 @@
     #include "wx/bitmap.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler);
 
 wxBitmapXmlHandler::wxBitmapXmlHandler()
                    :wxXmlResourceHandler()
@@ -39,7 +39,7 @@ bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmap"));
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler);
 
 wxIconXmlHandler::wxIconXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index d5ae4ec9dc..c82857977c 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -22,7 +22,7 @@
     #include "wx/bmpbuttn.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler);
 
 wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_bmpcbox.cpp b/src/xrc/xh_bmpcbox.cpp
index 533f52fd84..b0d72fb3a2 100644
--- a/src/xrc/xh_bmpcbox.cpp
+++ b/src/xrc/xh_bmpcbox.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler);
 
 wxBitmapComboBoxXmlHandler::wxBitmapComboBoxXmlHandler()
                      :wxXmlResourceHandler()
diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index fea736044b..9be8bd7e16 100644
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -22,7 +22,7 @@
     #include "wx/button.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler);
 
 wxButtonXmlHandler::wxButtonXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 28c60ecad4..07e5fef6ad 100644
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/calctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler);
 
 wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 9499c652f1..f4f0c52116 100644
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -22,7 +22,7 @@
     #include "wx/checkbox.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler);
 
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 843571597b..fddfcf97c2 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -26,7 +26,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler);
 
 wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
 : wxXmlResourceHandler(), m_insideBox(false)
diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index fb9b7f2245..445ec6b43a 100644
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler);
 
 wxChoiceXmlHandler::wxChoiceXmlHandler()
 : wxXmlResourceHandler() , m_insideBox(false)
diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index e70bd60ae1..7ee59f2b51 100644
--- a/src/xrc/xh_choicbk.cpp
+++ b/src/xrc/xh_choicbk.cpp
@@ -26,7 +26,7 @@
 #include "wx/choicebk.h"
 #include "wx/imaglist.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler);
 
 wxChoicebookXmlHandler::wxChoicebookXmlHandler()
                        :wxXmlResourceHandler(),
diff --git a/src/xrc/xh_clrpicker.cpp b/src/xrc/xh_clrpicker.cpp
index 690275e67b..e8364bcf5a 100644
--- a/src/xrc/xh_clrpicker.cpp
+++ b/src/xrc/xh_clrpicker.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_clrpicker.h"
 #include "wx/clrpicker.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler, wxXmlResourceHandler);
 
 wxColourPickerCtrlXmlHandler::wxColourPickerCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_cmdlinkbn.cpp b/src/xrc/xh_cmdlinkbn.cpp
index 396827a01b..ce26ac10a5 100644
--- a/src/xrc/xh_cmdlinkbn.cpp
+++ b/src/xrc/xh_cmdlinkbn.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/commandlinkbutton.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler, wxXmlResourceHandler);
 
 wxCommandLinkButtonXmlHandler::wxCommandLinkButtonXmlHandler()
     : wxXmlResourceHandler()
diff --git a/src/xrc/xh_collpane.cpp b/src/xrc/xh_collpane.cpp
index ae48576151..b935fe4243 100644
--- a/src/xrc/xh_collpane.cpp
+++ b/src/xrc/xh_collpane.cpp
@@ -23,7 +23,7 @@
 #include "wx/collpane.h"
 #include "wx/xrc/xh_collpane.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler);
 
 wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler()
 : wxXmlResourceHandler(), m_isInside(false)
diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 8691c4161e..a11d24bef9 100644
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -26,7 +26,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler);
 
 wxComboBoxXmlHandler::wxComboBoxXmlHandler()
                      :wxXmlResourceHandler()
diff --git a/src/xrc/xh_comboctrl.cpp b/src/xrc/xh_comboctrl.cpp
index 9becbbbe3c..eece767134 100644
--- a/src/xrc/xh_comboctrl.cpp
+++ b/src/xrc/xh_comboctrl.cpp
@@ -26,7 +26,7 @@
 #include "wx/combo.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler);
 
 wxComboCtrlXmlHandler::wxComboCtrlXmlHandler()
                      : wxXmlResourceHandler()
diff --git a/src/xrc/xh_datectrl.cpp b/src/xrc/xh_datectrl.cpp
index 634bb9e845..93cbc1f622 100644
--- a/src/xrc/xh_datectrl.cpp
+++ b/src/xrc/xh_datectrl.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_datectrl.h"
 #include "wx/datectrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxDateCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDateCtrlXmlHandler, wxXmlResourceHandler);
 
 wxDateCtrlXmlHandler::wxDateCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_dirpicker.cpp b/src/xrc/xh_dirpicker.cpp
index 8fab3a7fc0..12b9af1244 100644
--- a/src/xrc/xh_dirpicker.cpp
+++ b/src/xrc/xh_dirpicker.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_dirpicker.h"
 #include "wx/filepicker.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler, wxXmlResourceHandler);
 
 wxDirPickerCtrlXmlHandler::wxDirPickerCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 88401f335a..ec3218370d 100644
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -25,7 +25,7 @@
     #include "wx/dialog.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler);
 
 wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_editlbox.cpp b/src/xrc/xh_editlbox.cpp
index 87031b0051..32ab05f525 100644
--- a/src/xrc/xh_editlbox.cpp
+++ b/src/xrc/xh_editlbox.cpp
@@ -49,7 +49,7 @@ const char * const EDITLBOX_ITEM_NAME = "item";
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxEditableListBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxEditableListBoxXmlHandler, wxXmlResourceHandler);
 
 wxEditableListBoxXmlHandler::wxEditableListBoxXmlHandler()
 {
diff --git a/src/xrc/xh_filectrl.cpp b/src/xrc/xh_filectrl.cpp
index da4fc940f8..ded98157ba 100644
--- a/src/xrc/xh_filectrl.cpp
+++ b/src/xrc/xh_filectrl.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_filectrl.h"
 #include "wx/filectrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFileCtrlXmlHandler, wxXmlResourceHandler);
 
 wxFileCtrlXmlHandler::wxFileCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp
index 21d8e51d56..b0c56b2079 100644
--- a/src/xrc/xh_filepicker.cpp
+++ b/src/xrc/xh_filepicker.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_filepicker.h"
 #include "wx/filepicker.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler, wxXmlResourceHandler);
 
 wxFilePickerCtrlXmlHandler::wxFilePickerCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_fontpicker.cpp b/src/xrc/xh_fontpicker.cpp
index 7d76740479..fa9366a548 100644
--- a/src/xrc/xh_fontpicker.cpp
+++ b/src/xrc/xh_fontpicker.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_fontpicker.h"
 #include "wx/fontpicker.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler, wxXmlResourceHandler);
 
 wxFontPickerCtrlXmlHandler::wxFontPickerCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index fb3422e04e..1e1483d4c7 100644
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -25,7 +25,7 @@
     #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler);
 
 wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index f5008c7089..75a1ac6eeb 100644
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -24,7 +24,7 @@
 
 static const long DEFAULT_RANGE = 100;
 
-IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler);
 
 wxGaugeXmlHandler::wxGaugeXmlHandler()
                   :wxXmlResourceHandler()
diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 76ad6ba45d..0f155682f8 100644
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/dirctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler);
 
 wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_grid.cpp b/src/xrc/xh_grid.cpp
index 74ccf19bcf..c99a9bdc64 100644
--- a/src/xrc/xh_grid.cpp
+++ b/src/xrc/xh_grid.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_grid.h"
 #include "wx/grid.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxGridXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxGridXmlHandler, wxXmlResourceHandler);
 
 wxGridXmlHandler::wxGridXmlHandler()
                 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 929c1f0612..efa06589cd 100644
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -21,7 +21,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler);
 
 wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_htmllbox.cpp b/src/xrc/xh_htmllbox.cpp
index f2af2a89c9..2b310e4c4e 100644
--- a/src/xrc/xh_htmllbox.cpp
+++ b/src/xrc/xh_htmllbox.cpp
@@ -23,7 +23,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler, wxXmlResourceHandler);
 
 wxSimpleHtmlListBoxXmlHandler::wxSimpleHtmlListBoxXmlHandler()
 : wxXmlResourceHandler(), m_insideBox(false)
diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index 870b7b4707..0b5d808a9b 100644
--- a/src/xrc/xh_hyperlink.cpp
+++ b/src/xrc/xh_hyperlink.cpp
@@ -46,7 +46,7 @@
 //---------------------------------------------------------------------------
 
 // Register with wxWindows' dynamic class subsystem.
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler, wxXmlResourceHandler);
 
 wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler()
 {
diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index cde163372c..f496023095 100644
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler);
 
 wxListBoxXmlHandler::wxListBoxXmlHandler()
                    : wxXmlResourceHandler(),
diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index f7bf2c58b2..2ea0b90f89 100644
--- a/src/xrc/xh_listbk.cpp
+++ b/src/xrc/xh_listbk.cpp
@@ -26,7 +26,7 @@
 #include "wx/listbook.h"
 #include "wx/imaglist.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler);
 
 wxListbookXmlHandler::wxListbookXmlHandler()
                      :wxXmlResourceHandler(),
diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index c4fb4e4468..0f5041f66d 100644
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -36,7 +36,7 @@ const char *LISTCOL_CLASS_NAME = "listcol";
 } // anonymous namespace
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler);
 
 wxListCtrlXmlHandler::wxListCtrlXmlHandler()
     : wxXmlResourceHandler()
diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 84c036f0db..c67d272adc 100644
--- a/src/xrc/xh_mdi.cpp
+++ b/src/xrc/xh_mdi.cpp
@@ -25,7 +25,7 @@
     #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler);
 
 wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 503c638256..1b3e9b8fac 100644
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -24,7 +24,7 @@
     #include "wx/menu.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler);
 
 wxMenuXmlHandler::wxMenuXmlHandler() :
         wxXmlResourceHandler(), m_insideMenu(false)
@@ -141,7 +141,7 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
            );
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBarXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxMenuBarXmlHandler, wxXmlResourceHandler);
 
 wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index d2fe27103d..45d56946cc 100644
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -26,7 +26,7 @@
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler);
 
 wxNotebookXmlHandler::wxNotebookXmlHandler()
                      :wxXmlResourceHandler(),
diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index 1a863b7e88..955ac1d826 100644
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler, wxXmlResourceHandler);
 
 wxOwnerDrawnComboBoxXmlHandler::wxOwnerDrawnComboBoxXmlHandler()
                      :wxXmlResourceHandler()
diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 47d8917f14..6eccf71961 100644
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -23,7 +23,7 @@
     #include "wx/frame.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler);
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_propdlg.cpp b/src/xrc/xh_propdlg.cpp
index d07e3a6b40..4489c41cc8 100644
--- a/src/xrc/xh_propdlg.cpp
+++ b/src/xrc/xh_propdlg.cpp
@@ -28,7 +28,7 @@
 #include "wx/propdlg.h"
 #include "wx/imaglist.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler, wxXmlResourceHandler);
 
 wxPropertySheetDialogXmlHandler::wxPropertySheetDialogXmlHandler()
                      :wxXmlResourceHandler(),
diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index 07617f264e..576287b9df 100644
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -22,7 +22,7 @@
     #include "wx/radiobut.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler);
 
 wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 2ce7f5c9be..12c9e02a25 100644
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBoxXmlHandler, wxXmlResourceHandler);
 
 wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
 : wxXmlResourceHandler(), m_insideBox(false)
diff --git a/src/xrc/xh_richtext.cpp b/src/xrc/xh_richtext.cpp
index 829939b07c..27bba7dcde 100644
--- a/src/xrc/xh_richtext.cpp
+++ b/src/xrc/xh_richtext.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_richtext.h"
 #include "wx/richtext/richtextctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler, wxXmlResourceHandler);
 
 wxRichTextCtrlXmlHandler::wxRichTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index 0b0af16312..aa0467e578 100644
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -22,7 +22,7 @@
     #include "wx/scrolbar.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxScrollBarXmlHandler, wxXmlResourceHandler);
 
 wxScrollBarXmlHandler::wxScrollBarXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index a13914f14a..ae2160c6fe 100644
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -23,7 +23,7 @@
     #include "wx/scrolwin.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler);
 
 wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 6eb9621557..0a882ce0ea 100644
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -40,7 +40,7 @@
 // wxSizerXmlHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler);
 
 wxSizerXmlHandler::wxSizerXmlHandler()
                   :wxXmlResourceHandler(),
@@ -882,7 +882,7 @@ void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
 //-----------------------------------------------------------------------------
 #if wxUSE_BUTTON
 
-IMPLEMENT_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler, wxXmlResourceHandler);
 
 wxStdDialogButtonSizerXmlHandler::wxStdDialogButtonSizerXmlHandler()
     : m_isInside(false), m_parentSizer(NULL)
diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index 2f7c6233c0..260c743d19 100644
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -27,7 +27,7 @@ static const long DEFAULT_MIN = 0;
 static const long DEFAULT_MAX = 100;
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler);
 
 wxSliderXmlHandler::wxSliderXmlHandler()
                    :wxXmlResourceHandler()
diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 8ee8c8ecf0..ebd452e7ae 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -26,7 +26,7 @@ static const long DEFAULT_VALUE = 0;
 static const long DEFAULT_MIN = 0;
 static const long DEFAULT_MAX = 100;
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinButtonXmlHandler, wxXmlResourceHandler);
 
 wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
 : wxXmlResourceHandler()
@@ -67,7 +67,7 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #include "wx/spinctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler);
 
 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index d2dcf7634f..49b5d09fea 100644
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -26,7 +26,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler);
 
 wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_srchctrl.cpp b/src/xrc/xh_srchctrl.cpp
index 7237f6de24..dbaafdedde 100644
--- a/src/xrc/xh_srchctrl.cpp
+++ b/src/xrc/xh_srchctrl.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_srchctrl.h"
 #include "wx/srchctrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrlXmlHandler, wxXmlResourceHandler);
 
 wxSearchCtrlXmlHandler::wxSearchCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index 311eb512d3..c33c17fe0d 100644
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -25,7 +25,7 @@
     #include "wx/statusbr.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler);
 
 wxStatusBarXmlHandler::wxStatusBarXmlHandler()
                       :wxXmlResourceHandler()
diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp
index d298a37601..aeea8e3ab7 100644
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -22,7 +22,7 @@
     #include "wx/statbmp.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler);
 
 wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
                          :wxXmlResourceHandler()
diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 5e41d882c5..8889c457b5 100644
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -22,7 +22,7 @@
     #include "wx/statbox.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler);
 
 wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
                       :wxXmlResourceHandler()
diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index 4b7238c79a..0d1b8ea5db 100644
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_stlin.h"
 #include "wx/statline.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLineXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStaticLineXmlHandler, wxXmlResourceHandler);
 
 wxStaticLineXmlHandler::wxStaticLineXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index 52c8336cf4..7bd50c72a5 100644
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -22,7 +22,7 @@
    #include "wx/stattext.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler);
 
 wxStaticTextXmlHandler::wxStaticTextXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 7a1b5c139b..6bedf8610d 100644
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -22,7 +22,7 @@
     #include "wx/textctrl.h"
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler);
 
 wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 0b8e2de1d5..31c146b80e 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -20,7 +20,7 @@
 #include "wx/tglbtn.h"
 #include "wx/button.h" // solely for wxBU_EXACTFIT
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButtonXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButtonXmlHandler, wxXmlResourceHandler);
 
 wxToggleButtonXmlHandler::wxToggleButtonXmlHandler()
     : wxXmlResourceHandler()
diff --git a/src/xrc/xh_timectrl.cpp b/src/xrc/xh_timectrl.cpp
index 592186fef2..61adcdbe76 100644
--- a/src/xrc/xh_timectrl.cpp
+++ b/src/xrc/xh_timectrl.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_timectrl.h"
 #include "wx/timectrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimeCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTimeCtrlXmlHandler, wxXmlResourceHandler);
 
 wxTimeCtrlXmlHandler::wxTimeCtrlXmlHandler()
 {
diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 885a3577ed..dedcc44108 100644
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler);
 
 wxToolBarXmlHandler::wxToolBarXmlHandler()
 : wxXmlResourceHandler(), m_isInside(false), m_toolbar(NULL)
diff --git a/src/xrc/xh_toolbk.cpp b/src/xrc/xh_toolbk.cpp
index fce8217d3d..2c4cab7c2f 100644
--- a/src/xrc/xh_toolbk.cpp
+++ b/src/xrc/xh_toolbk.cpp
@@ -28,7 +28,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxToolbookXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxToolbookXmlHandler, wxXmlResourceHandler);
 
 wxToolbookXmlHandler::wxToolbookXmlHandler()
                      :wxXmlResourceHandler(),
diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index 482bff84f0..89a26942e8 100644
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -19,7 +19,7 @@
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler);
 
 wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index 0c8f1c07ba..b478e4ad09 100644
--- a/src/xrc/xh_treebk.cpp
+++ b/src/xrc/xh_treebk.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/xml/xml.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler);
 
 wxTreebookXmlHandler::wxTreebookXmlHandler()
                     : wxXmlResourceHandler(),
diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index e1e2a0adc1..ee398ec8dd 100644
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -122,7 +122,7 @@ void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
 }
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler, wxXmlResourceHandler);
 
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 : wxXmlResourceHandler()
diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index 40c66301b9..f6ca37ea59 100644
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/wizard.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler)
+wxIMPLEMENT_DYNAMIC_CLASS(wxWizardXmlHandler, wxXmlResourceHandler);
 
 wxWizardXmlHandler::wxWizardXmlHandler() : wxXmlResourceHandler()
 {
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index b4044336c3..6e90acb3af 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -2895,7 +2895,7 @@ static struct wxXRCStaticCleanup
 
 class wxXmlResourceModule: public wxModule
 {
-DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
+    wxDECLARE_DYNAMIC_CLASS(wxXmlResourceModule);
 public:
     wxXmlResourceModule() {}
     bool OnInit() wxOVERRIDE
@@ -2920,7 +2920,7 @@ public:
     }
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxXmlResourceModule, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(wxXmlResourceModule, wxModule);
 
 
 // When wxXml is loaded dynamically after the application is already running
diff --git a/src/xrc/xmlreshandler.cpp b/src/xrc/xmlreshandler.cpp
index 3a729ff2f9..a84f92dad2 100644
--- a/src/xrc/xmlreshandler.cpp
+++ b/src/xrc/xmlreshandler.cpp
@@ -17,7 +17,7 @@
 
 #include "wx/xrc/xmlreshandler.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject);
 
 wxXmlResourceHandlerImplBase* wxXmlResourceHandler::GetImpl() const
 {
diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index 9230035caa..d44e509ef5 100644
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -94,7 +94,7 @@ private:
     wxAny   m_anyVoidPtr2;
     wxAny   m_anyDateTime2;
 
-    DECLARE_NO_COPY_CLASS(wxAnyTestCase)
+    wxDECLARE_NO_COPY_CLASS(wxAnyTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index badfb4e01e..769f9aad30 100644
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -190,7 +190,7 @@ private:
     void Swap();
     void IndexFromEnd();
 
-    DECLARE_NO_COPY_CLASS(ArraysTestCase)
+    wxDECLARE_NO_COPY_CLASS(ArraysTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/base64/base64.cpp b/tests/base64/base64.cpp
index c1cc892620..ed7ec5565a 100644
--- a/tests/base64/base64.cpp
+++ b/tests/base64/base64.cpp
@@ -104,7 +104,7 @@ private:
     void EncodeDecodeRandom();
     void DecodeInvalid();
 
-    DECLARE_NO_COPY_CLASS(Base64TestCase)
+    wxDECLARE_NO_COPY_CLASS(Base64TestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/benchmarks/bench.cpp b/tests/benchmarks/bench.cpp
index 90b5f017e3..2473db1f38 100644
--- a/tests/benchmarks/bench.cpp
+++ b/tests/benchmarks/bench.cpp
@@ -75,7 +75,7 @@ private:
     wxString m_strParam;
 };
 
-IMPLEMENT_APP_CONSOLE(BenchApp)
+wxIMPLEMENT_APP_CONSOLE(BenchApp);
 
 // ============================================================================
 // Bench namespace symbols implementation
diff --git a/tests/benchmarks/bench.h b/tests/benchmarks/bench.h
index 128ebf10dd..11c38fdb84 100644
--- a/tests/benchmarks/bench.h
+++ b/tests/benchmarks/bench.h
@@ -74,7 +74,7 @@ private:
     // pointer to the next object in the linked list or NULL
     Function * const m_next;
 
-    DECLARE_NO_COPY_CLASS(Function)
+    wxDECLARE_NO_COPY_CLASS(Function);
 };
 
 /**
diff --git a/tests/benchmarks/graphics.cpp b/tests/benchmarks/graphics.cpp
index 801e8f9a35..16fb7399ea 100644
--- a/tests/benchmarks/graphics.cpp
+++ b/tests/benchmarks/graphics.cpp
@@ -537,4 +537,4 @@ public:
     }
 };
 
-IMPLEMENT_APP_CONSOLE(GraphicsBenchmarkApp)
+wxIMPLEMENT_APP_CONSOLE(GraphicsBenchmarkApp);
diff --git a/tests/benchmarks/htmlparser/htmlpars.cpp b/tests/benchmarks/htmlparser/htmlpars.cpp
index 7a5a5bf578..e685991de4 100644
--- a/tests/benchmarks/htmlparser/htmlpars.cpp
+++ b/tests/benchmarks/htmlparser/htmlpars.cpp
@@ -66,7 +66,7 @@ public:
 // wx28HtmlParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wx28HtmlParser,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wx28HtmlParser, wxObject);
 
 wx28HtmlParser::wx28HtmlParser()
     : wxObject(), m_HandlersHash(wxKEY_STRING),
@@ -439,7 +439,7 @@ wxString wx28HtmlParser::GetInnerSource(const wx28HtmlTag& tag)
 // wx28HtmlTagHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wx28HtmlTagHandler,wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wx28HtmlTagHandler, wxObject);
 
 void wx28HtmlTagHandler::ParseInnerSource(const wxString& source)
 {
@@ -455,7 +455,7 @@ void wx28HtmlTagHandler::ParseInnerSource(const wxString& source)
 // wx28HtmlEntitiesParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject);
 
 wx28HtmlEntitiesParser::wx28HtmlEntitiesParser()
 #if !wxUSE_UNICODE
@@ -895,7 +895,7 @@ public:
 protected:
     virtual void AddText(const wxChar* WXUNUSED(txt)) {}
 
-    DECLARE_NO_COPY_CLASS(wxMetaTagParser)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);
 };
 
 class wxMetaTagHandler : public wx28HtmlTagHandler
@@ -908,7 +908,7 @@ public:
 private:
     wxString *m_retval;
 
-    DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxMetaTagHandler);
 };
 
 bool wxMetaTagHandler::HandleTag(const wx28HtmlTag& tag)
diff --git a/tests/benchmarks/htmlparser/htmlpars.h b/tests/benchmarks/htmlparser/htmlpars.h
index f2e7345277..0913deaaa7 100644
--- a/tests/benchmarks/htmlparser/htmlpars.h
+++ b/tests/benchmarks/htmlparser/htmlpars.h
@@ -38,7 +38,7 @@ enum wx28HtmlURLType
 // 2 tags.
 class  wx28HtmlParser : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wx28HtmlParser)
+    wxDECLARE_ABSTRACT_CLASS(wx28HtmlParser);
 
 public:
     wx28HtmlParser();
@@ -171,7 +171,7 @@ protected:
     wxList m_HandlersList;
     wxHashTable m_HandlersHash;
 
-    DECLARE_NO_COPY_CLASS(wx28HtmlParser)
+    wxDECLARE_NO_COPY_CLASS(wx28HtmlParser);
 
     // class for opening files (file system)
     wxFileSystem *m_FS;
@@ -196,7 +196,7 @@ protected:
 // 3. Handler restores original state of the parser
 class  wx28HtmlTagHandler : public wxObject
 {
-    DECLARE_ABSTRACT_CLASS(wx28HtmlTagHandler)
+    wxDECLARE_ABSTRACT_CLASS(wx28HtmlTagHandler);
 
 public:
     wx28HtmlTagHandler() : wxObject () { m_Parser = NULL; }
@@ -234,7 +234,7 @@ protected:
 
     wx28HtmlParser *m_Parser;
 
-    DECLARE_NO_COPY_CLASS(wx28HtmlTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wx28HtmlTagHandler);
 };
 
 
@@ -242,7 +242,7 @@ protected:
 // both named entities and &#xxxx entries where xxxx is Unicode code.
 class  wx28HtmlEntitiesParser : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wx28HtmlEntitiesParser)
+    wxDECLARE_DYNAMIC_CLASS(wx28HtmlEntitiesParser);
 
 public:
     wx28HtmlEntitiesParser();
@@ -272,7 +272,7 @@ protected:
     wxFontEncoding m_encoding;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wx28HtmlEntitiesParser)
+    wxDECLARE_NO_COPY_CLASS(wx28HtmlEntitiesParser);
 };
 
 
diff --git a/tests/benchmarks/htmlparser/htmltag.cpp b/tests/benchmarks/htmlparser/htmltag.cpp
index 926db2d2a7..485e37fa58 100644
--- a/tests/benchmarks/htmlparser/htmltag.cpp
+++ b/tests/benchmarks/htmlparser/htmltag.cpp
@@ -41,7 +41,7 @@ struct wx28HtmlCacheItem
 };
 
 
-IMPLEMENT_CLASS(wx28HtmlTagsCache,wxObject)
+wxIMPLEMENT_CLASS(wx28HtmlTagsCache,wxObject);
 
 #define CACHE_INCREMENT  64
 
@@ -207,7 +207,7 @@ void wx28HtmlTagsCache::QueryTag(int at, int* end1, int* end2)
 // wx28HtmlTag
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(wx28HtmlTag,wxObject)
+wxIMPLEMENT_CLASS(wx28HtmlTag,wxObject);
 
 wx28HtmlTag::wx28HtmlTag(wx28HtmlTag *parent,
                      const wxString& source, int pos, int end_pos,
diff --git a/tests/benchmarks/htmlparser/htmltag.h b/tests/benchmarks/htmlparser/htmltag.h
index a371f3cd1d..9ede52fe24 100644
--- a/tests/benchmarks/htmlparser/htmltag.h
+++ b/tests/benchmarks/htmlparser/htmltag.h
@@ -25,7 +25,7 @@ struct wx28HtmlCacheItem;
 
 class  wx28HtmlTagsCache : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wx28HtmlTagsCache)
+    wxDECLARE_DYNAMIC_CLASS(wx28HtmlTagsCache);
 
 private:
     wx28HtmlCacheItem *m_Cache;
@@ -40,7 +40,7 @@ public:
     // Finds parameters for tag starting at at and fills the variables
     void QueryTag(int at, int* end1, int* end2);
 
-    DECLARE_NO_COPY_CLASS(wx28HtmlTagsCache)
+    wxDECLARE_NO_COPY_CLASS(wx28HtmlTagsCache);
 };
 
 
@@ -52,7 +52,7 @@ public:
 
 class  wx28HtmlTag : public wxObject
 {
-    DECLARE_CLASS(wx28HtmlTag)
+    wxDECLARE_CLASS(wx28HtmlTag);
 
 protected:
     // constructs wx28HtmlTag object based on HTML tag.
@@ -129,7 +129,7 @@ private:
     wx28HtmlTag *m_FirstChild, *m_LastChild;
     wx28HtmlTag *m_Parent;
 
-    DECLARE_NO_COPY_CLASS(wx28HtmlTag)
+    wxDECLARE_NO_COPY_CLASS(wx28HtmlTag);
 };
 
 
diff --git a/tests/benchmarks/ipcclient.cpp b/tests/benchmarks/ipcclient.cpp
index 02621d1528..5d3808910c 100644
--- a/tests/benchmarks/ipcclient.cpp
+++ b/tests/benchmarks/ipcclient.cpp
@@ -61,7 +61,7 @@ private:
     wxString m_item;
     bool m_gotAdvised;
 
-    DECLARE_NO_COPY_CLASS(PokeAdviseConn)
+    wxDECLARE_NO_COPY_CLASS(PokeAdviseConn);
 };
 
 class PokeAdviseClient : public wxClient
@@ -124,7 +124,7 @@ private:
     PokeAdviseConn *m_conn;
     bool m_initDone;
 
-    DECLARE_NO_COPY_CLASS(PokeAdvisePersistentConnection)
+    wxDECLARE_NO_COPY_CLASS(PokeAdvisePersistentConnection);
 };
 
 PokeAdvisePersistentConnection *theConnection = NULL;
diff --git a/tests/benchmarks/tls.cpp b/tests/benchmarks/tls.cpp
index aa21eeba7a..185e64ccce 100644
--- a/tests/benchmarks/tls.cpp
+++ b/tests/benchmarks/tls.cpp
@@ -92,7 +92,7 @@ public:
 private:
     pthread_key_t m_key;
 
-    DECLARE_NO_COPY_CLASS(PthreadKey)
+    wxDECLARE_NO_COPY_CLASS(PthreadKey);
 };
 
 BENCHMARK_FUNC(PosixTLS)
@@ -132,7 +132,7 @@ public:
 private:
     DWORD m_slot;
 
-    DECLARE_NO_COPY_CLASS(TlsSlot)
+    wxDECLARE_NO_COPY_CLASS(TlsSlot);
 };
 
 BENCHMARK_FUNC(Win32TLS)
diff --git a/tests/cmdline/cmdlinetest.cpp b/tests/cmdline/cmdlinetest.cpp
index 6c98fd99cc..f3b5102bcb 100644
--- a/tests/cmdline/cmdlinetest.cpp
+++ b/tests/cmdline/cmdlinetest.cpp
@@ -49,7 +49,7 @@ private:
     void Usage();
     void Found();
 
-    DECLARE_NO_COPY_CLASS(CmdLineTestCase)
+    wxDECLARE_NO_COPY_CLASS(CmdLineTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/config/config.cpp b/tests/config/config.cpp
index f89a4b1f9e..597f681d27 100644
--- a/tests/config/config.cpp
+++ b/tests/config/config.cpp
@@ -51,7 +51,7 @@ private:
     // return the number of values we (attempted to) read
     int ReadValues(wxConfig *config, bool has_values);
 
-    DECLARE_NO_COPY_CLASS(ConfigTestCase)
+    wxDECLARE_NO_COPY_CLASS(ConfigTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/config/fileconf.cpp b/tests/config/fileconf.cpp
index 4e3d8aa42f..4b9b4f8aab 100644
--- a/tests/config/fileconf.cpp
+++ b/tests/config/fileconf.cpp
@@ -126,7 +126,7 @@ private:
                              size_t nGroups,
                              ...);
 
-    DECLARE_NO_COPY_CLASS(FileConfigTestCase)
+    wxDECLARE_NO_COPY_CLASS(FileConfigTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/config/regconf.cpp b/tests/config/regconf.cpp
index 2d7d429c65..37763583c6 100644
--- a/tests/config/regconf.cpp
+++ b/tests/config/regconf.cpp
@@ -39,7 +39,7 @@ private:
 
     void ReadWrite();
 
-    DECLARE_NO_COPY_CLASS(RegConfigTestCase)
+    wxDECLARE_NO_COPY_CLASS(RegConfigTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp
index 517388d211..5b416d51fa 100644
--- a/tests/controls/bitmapcomboboxtest.cpp
+++ b/tests/controls/bitmapcomboboxtest.cpp
@@ -74,7 +74,7 @@ private:
 
     wxBitmapComboBox *m_combo;
 
-    DECLARE_NO_COPY_CLASS(BitmapComboBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(BitmapComboBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/bitmaptogglebuttontest.cpp b/tests/controls/bitmaptogglebuttontest.cpp
index 45e846b81e..9ba028d93d 100644
--- a/tests/controls/bitmaptogglebuttontest.cpp
+++ b/tests/controls/bitmaptogglebuttontest.cpp
@@ -45,7 +45,7 @@ private:
 
     wxBitmapToggleButton* m_button;
 
-    DECLARE_NO_COPY_CLASS(BitmapToggleButtonTestCase)
+    wxDECLARE_NO_COPY_CLASS(BitmapToggleButtonTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp
index 249fa67464..26638d9583 100644
--- a/tests/controls/buttontest.cpp
+++ b/tests/controls/buttontest.cpp
@@ -54,7 +54,7 @@ private:
 
     wxButton* m_button;
 
-    DECLARE_NO_COPY_CLASS(ButtonTestCase)
+    wxDECLARE_NO_COPY_CLASS(ButtonTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp
index 0bf3c83b9a..5f38a61f2c 100644
--- a/tests/controls/checkboxtest.cpp
+++ b/tests/controls/checkboxtest.cpp
@@ -61,7 +61,7 @@ private:
 
     wxCheckBox* m_check;
 
-    DECLARE_NO_COPY_CLASS(CheckBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(CheckBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/checklistboxtest.cpp b/tests/controls/checklistboxtest.cpp
index 49c466ed32..b81ea7cf43 100644
--- a/tests/controls/checklistboxtest.cpp
+++ b/tests/controls/checklistboxtest.cpp
@@ -43,7 +43,7 @@ private:
 
     wxCheckListBox* m_check;
 
-    DECLARE_NO_COPY_CLASS(CheckListBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(CheckListBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/choicebooktest.cpp b/tests/controls/choicebooktest.cpp
index 5cb4509827..23683cbdf4 100644
--- a/tests/controls/choicebooktest.cpp
+++ b/tests/controls/choicebooktest.cpp
@@ -48,7 +48,7 @@ private:
 
     wxChoicebook *m_choicebook;
 
-    DECLARE_NO_COPY_CLASS(ChoicebookTestCase)
+    wxDECLARE_NO_COPY_CLASS(ChoicebookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/choicetest.cpp b/tests/controls/choicetest.cpp
index 5f12a9370b..14e2f4600f 100644
--- a/tests/controls/choicetest.cpp
+++ b/tests/controls/choicetest.cpp
@@ -42,7 +42,7 @@ private:
 
     wxChoice* m_choice;
 
-    DECLARE_NO_COPY_CLASS(ChoiceTestCase)
+    wxDECLARE_NO_COPY_CLASS(ChoiceTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index 96e349b4ed..1fe0d004e0 100644
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -85,7 +85,7 @@ private:
 
     wxComboBox *m_combo;
 
-    DECLARE_NO_COPY_CLASS(ComboBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(ComboBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/dataviewctrltest.cpp b/tests/controls/dataviewctrltest.cpp
index c0ddb14ab5..339b389dad 100644
--- a/tests/controls/dataviewctrltest.cpp
+++ b/tests/controls/dataviewctrltest.cpp
@@ -62,7 +62,7 @@ private:
                    m_child2,
                    m_grandchild;
 
-    DECLARE_NO_COPY_CLASS(DataViewCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(DataViewCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp
index 722942b8d6..5d80e6c339 100644
--- a/tests/controls/datepickerctrltest.cpp
+++ b/tests/controls/datepickerctrltest.cpp
@@ -42,7 +42,7 @@ private:
 
     wxDatePickerCtrl* m_datepicker;
 
-    DECLARE_NO_COPY_CLASS(DatePickerCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(DatePickerCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/dialogtest.cpp b/tests/controls/dialogtest.cpp
index be852910b6..bc65c2f0ac 100644
--- a/tests/controls/dialogtest.cpp
+++ b/tests/controls/dialogtest.cpp
@@ -42,7 +42,7 @@ private:
     void FileDialog();
     void CustomDialog();
 
-    DECLARE_NO_COPY_CLASS(ModalDialogsTestCase)
+    wxDECLARE_NO_COPY_CLASS(ModalDialogsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp
index f1d28a3a72..fff1dfbff1 100644
--- a/tests/controls/frametest.cpp
+++ b/tests/controls/frametest.cpp
@@ -38,7 +38,7 @@ private:
 
     wxFrame *m_frame;
 
-    DECLARE_NO_COPY_CLASS(FrameTestCase)
+    wxDECLARE_NO_COPY_CLASS(FrameTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/gaugetest.cpp b/tests/controls/gaugetest.cpp
index 962b122b58..a07872f826 100644
--- a/tests/controls/gaugetest.cpp
+++ b/tests/controls/gaugetest.cpp
@@ -40,7 +40,7 @@ private:
 
     wxGauge* m_gauge;
 
-    DECLARE_NO_COPY_CLASS(GaugeTestCase)
+    wxDECLARE_NO_COPY_CLASS(GaugeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 3219e9ea16..7f79e8f48d 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -104,7 +104,7 @@ private:
 
     wxGrid *m_grid;
 
-    DECLARE_NO_COPY_CLASS(GridTestCase)
+    wxDECLARE_NO_COPY_CLASS(GridTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/headerctrltest.cpp b/tests/controls/headerctrltest.cpp
index e1fed94ae4..eb41b3210c 100644
--- a/tests/controls/headerctrltest.cpp
+++ b/tests/controls/headerctrltest.cpp
@@ -47,7 +47,7 @@ private:
 
     wxHeaderCtrlSimple *m_header;
 
-    DECLARE_NO_COPY_CLASS(HeaderCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(HeaderCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/htmllboxtest.cpp b/tests/controls/htmllboxtest.cpp
index ce0003736e..764d2b861f 100644
--- a/tests/controls/htmllboxtest.cpp
+++ b/tests/controls/htmllboxtest.cpp
@@ -38,7 +38,7 @@ private:
 
     wxSimpleHtmlListBox* m_htmllbox;
 
-    DECLARE_NO_COPY_CLASS(HtmlListBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(HtmlListBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/hyperlinkctrltest.cpp b/tests/controls/hyperlinkctrltest.cpp
index 8f710f4e72..420490b4d6 100644
--- a/tests/controls/hyperlinkctrltest.cpp
+++ b/tests/controls/hyperlinkctrltest.cpp
@@ -44,7 +44,7 @@ private:
 
     wxHyperlinkCtrl* m_hyperlink;
 
-    DECLARE_NO_COPY_CLASS(HyperlinkCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(HyperlinkCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/label.cpp b/tests/controls/label.cpp
index 6afb7856c8..2a272f7a65 100644
--- a/tests/controls/label.cpp
+++ b/tests/controls/label.cpp
@@ -52,7 +52,7 @@ private:
     // we cannot test wxControl directly (it's abstract) so we rather test wxCheckBox
     wxCheckBox *m_cb;
 
-    DECLARE_NO_COPY_CLASS(LabelTestCase)
+    wxDECLARE_NO_COPY_CLASS(LabelTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/listbooktest.cpp b/tests/controls/listbooktest.cpp
index d1d6374f1b..9790adc632 100644
--- a/tests/controls/listbooktest.cpp
+++ b/tests/controls/listbooktest.cpp
@@ -49,7 +49,7 @@ private:
 
     wxListbook *m_listbook;
 
-    DECLARE_NO_COPY_CLASS(ListbookTestCase)
+    wxDECLARE_NO_COPY_CLASS(ListbookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp
index 543b3e1245..ec2897ad94 100644
--- a/tests/controls/listboxtest.cpp
+++ b/tests/controls/listboxtest.cpp
@@ -65,7 +65,7 @@ private:
 
     wxListBox* m_list;
 
-    DECLARE_NO_COPY_CLASS(ListBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(ListBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp
index fb0695eda9..61098bfdf9 100644
--- a/tests/controls/listctrltest.cpp
+++ b/tests/controls/listctrltest.cpp
@@ -60,7 +60,7 @@ private:
 
     wxListCtrl *m_list;
 
-    DECLARE_NO_COPY_CLASS(ListCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(ListCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/listviewtest.cpp b/tests/controls/listviewtest.cpp
index 5ace8bb5ea..ceec1ed0ae 100644
--- a/tests/controls/listviewtest.cpp
+++ b/tests/controls/listviewtest.cpp
@@ -41,7 +41,7 @@ private:
 
     wxListView *m_list;
 
-    DECLARE_NO_COPY_CLASS(ListViewTestCase)
+    wxDECLARE_NO_COPY_CLASS(ListViewTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/notebooktest.cpp b/tests/controls/notebooktest.cpp
index 9e4a4b5144..d8a6fb44a0 100644
--- a/tests/controls/notebooktest.cpp
+++ b/tests/controls/notebooktest.cpp
@@ -50,7 +50,7 @@ private:
 
     wxNotebook *m_notebook;
 
-    DECLARE_NO_COPY_CLASS(NotebookTestCase)
+    wxDECLARE_NO_COPY_CLASS(NotebookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp
index ca18d25da3..4d187e8446 100644
--- a/tests/controls/ownerdrawncomboboxtest.cpp
+++ b/tests/controls/ownerdrawncomboboxtest.cpp
@@ -72,7 +72,7 @@ private:
 
     wxOwnerDrawnComboBox *m_combo;
 
-    DECLARE_NO_COPY_CLASS(OwnerDrawnComboBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(OwnerDrawnComboBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/pickertest.cpp b/tests/controls/pickertest.cpp
index c7ca967478..86e687e90f 100644
--- a/tests/controls/pickertest.cpp
+++ b/tests/controls/pickertest.cpp
@@ -42,7 +42,7 @@ private:
 
     wxColourPickerCtrl *m_colour;
 
-    DECLARE_NO_COPY_CLASS(ColourPickerCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(ColourPickerCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -86,7 +86,7 @@ private:
 
     wxDirPickerCtrl *m_dir;
 
-    DECLARE_NO_COPY_CLASS(DirPickerCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(DirPickerCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -131,7 +131,7 @@ private:
 
     wxFilePickerCtrl *m_file;
 
-    DECLARE_NO_COPY_CLASS(FilePickerCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(FilePickerCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -180,7 +180,7 @@ private:
 
     wxFontPickerCtrl *m_font;
 
-    DECLARE_NO_COPY_CLASS(FontPickerCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(FontPickerCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/radioboxtest.cpp b/tests/controls/radioboxtest.cpp
index e66fc60409..f64546c34f 100644
--- a/tests/controls/radioboxtest.cpp
+++ b/tests/controls/radioboxtest.cpp
@@ -54,7 +54,7 @@ private:
 
     wxRadioBox* m_radio;
 
-    DECLARE_NO_COPY_CLASS(RadioBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(RadioBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/radiobuttontest.cpp b/tests/controls/radiobuttontest.cpp
index e3bc6839cc..102d1a3532 100644
--- a/tests/controls/radiobuttontest.cpp
+++ b/tests/controls/radiobuttontest.cpp
@@ -43,7 +43,7 @@ private:
 
     wxRadioButton* m_radio;
 
-    DECLARE_NO_COPY_CLASS(RadioButtonTestCase)
+    wxDECLARE_NO_COPY_CLASS(RadioButtonTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/rearrangelisttest.cpp b/tests/controls/rearrangelisttest.cpp
index 617d5f06fd..3049b87c06 100644
--- a/tests/controls/rearrangelisttest.cpp
+++ b/tests/controls/rearrangelisttest.cpp
@@ -43,7 +43,7 @@ private:
 
     wxRearrangeList* m_rearrange;
 
-    DECLARE_NO_COPY_CLASS(RearrangeListTestCase)
+    wxDECLARE_NO_COPY_CLASS(RearrangeListTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp
index 7aac03a6d9..2b5036fba5 100644
--- a/tests/controls/richtextctrltest.cpp
+++ b/tests/controls/richtextctrltest.cpp
@@ -95,7 +95,7 @@ private:
 
     wxRichTextCtrl* m_rich;
 
-    DECLARE_NO_COPY_CLASS(RichTextCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(RichTextCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/searchctrltest.cpp b/tests/controls/searchctrltest.cpp
index f69fcd9014..a9bfb68103 100644
--- a/tests/controls/searchctrltest.cpp
+++ b/tests/controls/searchctrltest.cpp
@@ -37,7 +37,7 @@ private:
 
     wxSearchCtrl* m_search;
 
-    DECLARE_NO_COPY_CLASS(SearchCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(SearchCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/simplebooktest.cpp b/tests/controls/simplebooktest.cpp
index f1cc819728..b1452b9305 100644
--- a/tests/controls/simplebooktest.cpp
+++ b/tests/controls/simplebooktest.cpp
@@ -45,7 +45,7 @@ private:
 
     wxSimplebook *m_simplebook;
 
-    DECLARE_NO_COPY_CLASS(SimplebookTestCase)
+    wxDECLARE_NO_COPY_CLASS(SimplebookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp
index 8d84c2ea52..d02b3ee0be 100644
--- a/tests/controls/slidertest.cpp
+++ b/tests/controls/slidertest.cpp
@@ -57,7 +57,7 @@ private:
 
     wxSlider* m_slider;
 
-    DECLARE_NO_COPY_CLASS(SliderTestCase)
+    wxDECLARE_NO_COPY_CLASS(SliderTestCase);
 };
 
 bool SliderTestCase::ms_inversed = false;
diff --git a/tests/controls/spinctrldbltest.cpp b/tests/controls/spinctrldbltest.cpp
index dcc6d09e08..76cfe783d2 100644
--- a/tests/controls/spinctrldbltest.cpp
+++ b/tests/controls/spinctrldbltest.cpp
@@ -49,7 +49,7 @@ private:
 
     wxSpinCtrlDouble* m_spin;
 
-    DECLARE_NO_COPY_CLASS(SpinCtrlDoubleTestCase)
+    wxDECLARE_NO_COPY_CLASS(SpinCtrlDoubleTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp
index 037a46918a..0692b55e63 100644
--- a/tests/controls/spinctrltest.cpp
+++ b/tests/controls/spinctrltest.cpp
@@ -49,7 +49,7 @@ private:
 
     wxSpinCtrl* m_spin;
 
-    DECLARE_NO_COPY_CLASS(SpinCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(SpinCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index 0e503915e2..761b38d561 100644
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -122,7 +122,7 @@ private:
 
     static long ms_style;
 
-    DECLARE_NO_COPY_CLASS(TextCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(TextCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/togglebuttontest.cpp b/tests/controls/togglebuttontest.cpp
index a3da93de58..a06ede48d0 100644
--- a/tests/controls/togglebuttontest.cpp
+++ b/tests/controls/togglebuttontest.cpp
@@ -41,7 +41,7 @@ private:
 
     wxToggleButton* m_button;
 
-    DECLARE_NO_COPY_CLASS(ToggleButtonTestCase)
+    wxDECLARE_NO_COPY_CLASS(ToggleButtonTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/toolbooktest.cpp b/tests/controls/toolbooktest.cpp
index 6b8adf2e21..90047eb848 100644
--- a/tests/controls/toolbooktest.cpp
+++ b/tests/controls/toolbooktest.cpp
@@ -51,7 +51,7 @@ private:
 
     wxToolbook *m_toolbook;
 
-    DECLARE_NO_COPY_CLASS(ToolbookTestCase)
+    wxDECLARE_NO_COPY_CLASS(ToolbookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/treebooktest.cpp b/tests/controls/treebooktest.cpp
index 7c36d1aec3..aa855bf6f3 100644
--- a/tests/controls/treebooktest.cpp
+++ b/tests/controls/treebooktest.cpp
@@ -53,7 +53,7 @@ private:
 
     wxTreebook *m_treebook;
 
-    DECLARE_NO_COPY_CLASS(TreebookTestCase)
+    wxDECLARE_NO_COPY_CLASS(TreebookTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index e7ce5d97bf..8a6c822e9a 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -107,7 +107,7 @@ private:
                  m_child2,
                  m_grandchild;
 
-    DECLARE_NO_COPY_CLASS(TreeCtrlTestCase)
+    wxDECLARE_NO_COPY_CLASS(TreeCtrlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index 9397843ee8..83a8f31c87 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -62,7 +62,7 @@ private:
     wxWebView* m_browser;
     EventCounter* m_loaded;
 
-    DECLARE_NO_COPY_CLASS(WebTestCase)
+    wxDECLARE_NO_COPY_CLASS(WebTestCase);
 };
 
 //Convenience macro
diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp
index 3e43919fd4..9d6457c905 100644
--- a/tests/controls/windowtest.cpp
+++ b/tests/controls/windowtest.cpp
@@ -74,7 +74,7 @@ private:
 
     wxWindow *m_window;
 
-    DECLARE_NO_COPY_CLASS(WindowTestCase)
+    wxDECLARE_NO_COPY_CLASS(WindowTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 5ef360ff84..9a13b3d7f1 100644
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -255,7 +255,7 @@ private:
     void TestDateOnly();
     void TestTranslateFromUnicodeFormat();
 
-    DECLARE_NO_COPY_CLASS(DateTimeTestCase)
+    wxDECLARE_NO_COPY_CLASS(DateTimeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/drawing/drawing.h b/tests/drawing/drawing.h
index bc04a0d258..bf6606500b 100644
--- a/tests/drawing/drawing.h
+++ b/tests/drawing/drawing.h
@@ -176,7 +176,7 @@ private:
 
     wxVector<PluginInfo> m_drawingPlugins;
 
-    DECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase)
+    wxDECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase);
 };
 
 
diff --git a/tests/events/clone.cpp b/tests/events/clone.cpp
index eec6b56471..0d98548806 100644
--- a/tests/events/clone.cpp
+++ b/tests/events/clone.cpp
@@ -36,7 +36,7 @@ private:
 
     void CheckAll();
 
-    DECLARE_NO_COPY_CLASS(EventCloneTestCase)
+    wxDECLARE_NO_COPY_CLASS(EventCloneTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/events/evthandler.cpp b/tests/events/evthandler.cpp
index 290c6ef194..1488c44839 100644
--- a/tests/events/evthandler.cpp
+++ b/tests/events/evthandler.cpp
@@ -124,10 +124,10 @@ public:
     void OnIdle(wxIdleEvent&) { g_called.method = true; }
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
-BEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
+wxBEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
     EVT_IDLE(MyClassWithEventTable::OnIdle)
 
     EVT_MYEVENT(MyClassWithEventTable::OnMyEvent)
@@ -136,7 +136,7 @@ BEGIN_EVENT_TABLE(MyClassWithEventTable, wxEvtHandler)
     // this shouldn't compile:
     //EVT_MYEVENT(MyClassWithEventTable::OnIdle)
     //EVT_IDLE(MyClassWithEventTable::OnAnotherEvent)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 } // anonymous namespace
 
@@ -185,7 +185,7 @@ private:
     MyHandler handler;
     MyEvent e;
 
-    DECLARE_NO_COPY_CLASS(EvtHandlerTestCase)
+    wxDECLARE_NO_COPY_CLASS(EvtHandlerTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/events/evtlooptest.cpp b/tests/events/evtlooptest.cpp
index 099ef17302..d9516f8eb6 100644
--- a/tests/events/evtlooptest.cpp
+++ b/tests/events/evtlooptest.cpp
@@ -42,7 +42,7 @@ private:
 
     void TestExit();
 
-    DECLARE_NO_COPY_CLASS(EvtloopTestCase)
+    wxDECLARE_NO_COPY_CLASS(EvtloopTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp
index 20cb000f2a..2019b9c019 100644
--- a/tests/events/propagation.cpp
+++ b/tests/events/propagation.cpp
@@ -153,7 +153,7 @@ private:
 
     const char m_tag;
 
-    DECLARE_NO_COPY_CLASS(TestWindow)
+    wxDECLARE_NO_COPY_CLASS(TestWindow);
 };
 
 // a scroll window handling paint event: we want to have a special test case
@@ -261,7 +261,7 @@ private:
     void DocView();
     void ContextMenuEvent();
 
-    DECLARE_NO_COPY_CLASS(EventPropagationTestCase)
+    wxDECLARE_NO_COPY_CLASS(EventPropagationTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/events/stopwatch.cpp b/tests/events/stopwatch.cpp
index 0b608f3352..4b8db8cbac 100644
--- a/tests/events/stopwatch.cpp
+++ b/tests/events/stopwatch.cpp
@@ -53,7 +53,7 @@ private:
     void BackwardsClockBug();
     void RestartBug();
 
-    DECLARE_NO_COPY_CLASS(StopWatchTestCase)
+    wxDECLARE_NO_COPY_CLASS(StopWatchTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/events/timertest.cpp b/tests/events/timertest.cpp
index 953977a230..f43b7a3d75 100644
--- a/tests/events/timertest.cpp
+++ b/tests/events/timertest.cpp
@@ -52,7 +52,7 @@ private:
 
     int m_events;
 
-    DECLARE_NO_COPY_CLASS(TimerCounterHandler)
+    wxDECLARE_NO_COPY_CLASS(TimerCounterHandler);
 };
 
 // --------------------------------------------------------------------------
@@ -73,7 +73,7 @@ private:
     void OneShot();
     void Multiple();
 
-    DECLARE_NO_COPY_CLASS(TimerEventTestCase)
+    wxDECLARE_NO_COPY_CLASS(TimerEventTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -98,7 +98,7 @@ void TimerEventTestCase::OneShot()
 
         wxEventLoopBase& m_loop;
 
-        // don't use DECLARE_NO_COPY_CLASS() to avoid upsetting MSVC
+        // don't use wxDECLARE_NO_COPY_CLASS() to avoid upsetting MSVC
     };
 
     wxEventLoop loop;
diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp
index ed27f04d74..d102b43d6d 100644
--- a/tests/exec/exec.cpp
+++ b/tests/exec/exec.cpp
@@ -154,7 +154,7 @@ private:
         long wxExecuteReturnCode;
     };
 
-    DECLARE_NO_COPY_CLASS(ExecTestCase)
+    wxDECLARE_NO_COPY_CLASS(ExecTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index b44a288dbe..9d4402a776 100644
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -178,7 +178,7 @@ private:
     void TestShortcuts();
 #endif // __WINDOWS__
 
-    DECLARE_NO_COPY_CLASS(FileNameTestCase)
+    wxDECLARE_NO_COPY_CLASS(FileNameTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/filesys/filesystest.cpp b/tests/filesys/filesystest.cpp
index 36b5f975be..e30d4515e0 100644
--- a/tests/filesys/filesystest.cpp
+++ b/tests/filesys/filesystest.cpp
@@ -67,7 +67,7 @@ private:
     void FileNameToUrlConversion();
     void UnicodeFileNameToUrlConversion();
 
-    DECLARE_NO_COPY_CLASS(FileSystemTestCase)
+    wxDECLARE_NO_COPY_CLASS(FileSystemTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp
index b0ab6aaf71..f7d58197c2 100644
--- a/tests/font/fonttest.cpp
+++ b/tests/font/fonttest.cpp
@@ -65,7 +65,7 @@ private:
         return testfonts;
     }
 
-    DECLARE_NO_COPY_CLASS(FontTestCase)
+    wxDECLARE_NO_COPY_CLASS(FontTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/fontmap/fontmaptest.cpp b/tests/fontmap/fontmaptest.cpp
index dabee8ffd6..efd05bc6dd 100644
--- a/tests/fontmap/fontmaptest.cpp
+++ b/tests/fontmap/fontmaptest.cpp
@@ -41,7 +41,7 @@ private:
 
     void NamesAndDesc();
 
-    DECLARE_NO_COPY_CLASS(FontMapperTestCase)
+    wxDECLARE_NO_COPY_CLASS(FontMapperTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index ead7bf7272..2aaf600308 100644
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -456,7 +456,7 @@ private:
     void TestTrees();
     void TestNoEventsAfterRemove();
 
-    DECLARE_NO_COPY_CLASS(FileSystemWatcherTestCase)
+    wxDECLARE_NO_COPY_CLASS(FileSystemWatcherTestCase);
 };
 
 // the test currently hangs under OS X for some reason and this prevents tests
diff --git a/tests/geometry/point.cpp b/tests/geometry/point.cpp
index c345bfd78b..f15fc45506 100644
--- a/tests/geometry/point.cpp
+++ b/tests/geometry/point.cpp
@@ -38,7 +38,7 @@ private:
 
     void Operators();
 
-    DECLARE_NO_COPY_CLASS(PointTestCase)
+    wxDECLARE_NO_COPY_CLASS(PointTestCase);
 };
 
 class RealPointTestCase : public CppUnit::TestCase
@@ -53,7 +53,7 @@ private:
 
     void Operators();
 
-    DECLARE_NO_COPY_CLASS(RealPointTestCase)
+    wxDECLARE_NO_COPY_CLASS(RealPointTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/geometry/rect.cpp b/tests/geometry/rect.cpp
index 55420342f4..07634a3ce6 100644
--- a/tests/geometry/rect.cpp
+++ b/tests/geometry/rect.cpp
@@ -57,7 +57,7 @@ private:
     void Operators();
     void Union();
 
-    DECLARE_NO_COPY_CLASS(RectTestCase)
+    wxDECLARE_NO_COPY_CLASS(RectTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/geometry/size.cpp b/tests/geometry/size.cpp
index bd7d0febae..885e262ab3 100644
--- a/tests/geometry/size.cpp
+++ b/tests/geometry/size.cpp
@@ -36,7 +36,7 @@ private:
 
     void Operators();
 
-    DECLARE_NO_COPY_CLASS(SizeTestCase)
+    wxDECLARE_NO_COPY_CLASS(SizeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp
index 22ade75033..8c2717ea2a 100644
--- a/tests/graphics/affinematrix.cpp
+++ b/tests/graphics/affinematrix.cpp
@@ -61,7 +61,7 @@ private:
     wxBitmap m_bmpOrig;
 #endif // wxUSE_DC_TRANSFORM_MATRIX
 
-    DECLARE_NO_COPY_CLASS(AffineTransformTestCase)
+    wxDECLARE_NO_COPY_CLASS(AffineTransformTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp
index ba36df7b2a..a3f2b8c58f 100644
--- a/tests/graphics/bitmap.cpp
+++ b/tests/graphics/bitmap.cpp
@@ -40,7 +40,7 @@ private:
 
     wxBitmap m_bmp;
 
-    DECLARE_NO_COPY_CLASS(BitmapTestCase)
+    wxDECLARE_NO_COPY_CLASS(BitmapTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/boundingbox.cpp b/tests/graphics/boundingbox.cpp
index b884db56d7..5d3e1cba1e 100644
--- a/tests/graphics/boundingbox.cpp
+++ b/tests/graphics/boundingbox.cpp
@@ -135,7 +135,7 @@ private:
     void GradientFillConcentric();
     void DrawCheckMark();
 
-    DECLARE_NO_COPY_CLASS(GCDCBoundingBoxTestCase)
+    wxDECLARE_NO_COPY_CLASS(GCDCBoundingBoxTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/colour.cpp b/tests/graphics/colour.cpp
index b7df2cc527..fbfa96870a 100644
--- a/tests/graphics/colour.cpp
+++ b/tests/graphics/colour.cpp
@@ -54,7 +54,7 @@ private:
     void GetSetRGB();
     void FromString();
 
-    DECLARE_NO_COPY_CLASS(ColourTestCase)
+    wxDECLARE_NO_COPY_CLASS(ColourTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/ellipsization.cpp b/tests/graphics/ellipsization.cpp
index bce6235ea4..1b6a20cb04 100644
--- a/tests/graphics/ellipsization.cpp
+++ b/tests/graphics/ellipsization.cpp
@@ -41,7 +41,7 @@ private:
     void VeryLittleSpace();
     void HasThreeDots();
 
-    DECLARE_NO_COPY_CLASS(EllipsizationTestCase)
+    wxDECLARE_NO_COPY_CLASS(EllipsizationTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/graphics/measuring.cpp b/tests/graphics/measuring.cpp
index 36b100be0e..8bcd85e88a 100644
--- a/tests/graphics/measuring.cpp
+++ b/tests/graphics/measuring.cpp
@@ -63,7 +63,7 @@ private:
     void GraphicsGetTextExtent();
 #endif // TEST_GC
 
-    DECLARE_NO_COPY_CLASS(MeasuringTextTestCase)
+    wxDECLARE_NO_COPY_CLASS(MeasuringTextTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/hashes/hashes.cpp b/tests/hashes/hashes.cpp
index b9553f098e..b89241f5fd 100644
--- a/tests/hashes/hashes.cpp
+++ b/tests/hashes/hashes.cpp
@@ -103,7 +103,7 @@ private:
 #endif
     void wxHashSetTest();
 
-    DECLARE_NO_COPY_CLASS(HashesTestCase)
+    wxDECLARE_NO_COPY_CLASS(HashesTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp
index 7734466149..a1e8befd5e 100644
--- a/tests/html/htmlwindow.cpp
+++ b/tests/html/htmlwindow.cpp
@@ -57,7 +57,7 @@ private:
 
     wxHtmlWindow *m_win;
 
-    DECLARE_NO_COPY_CLASS(HtmlWindowTestCase)
+    wxDECLARE_NO_COPY_CLASS(HtmlWindowTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index 3f775b8cd2..dec7c5a0c4 100644
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -96,7 +96,7 @@ private:
     void BMPFlippingAndRLECompression();
     void ScaleCompare();
 
-    DECLARE_NO_COPY_CLASS(ImageTestCase)
+    wxDECLARE_NO_COPY_CLASS(ImageTestCase);
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( ImageTestCase );
diff --git a/tests/image/rawbmp.cpp b/tests/image/rawbmp.cpp
index e2cafad32f..5a00a56464 100644
--- a/tests/image/rawbmp.cpp
+++ b/tests/image/rawbmp.cpp
@@ -50,7 +50,7 @@ private:
 
     void RGBImage();
 
-    DECLARE_NO_COPY_CLASS(ImageRawTestCase)
+    wxDECLARE_NO_COPY_CLASS(ImageRawTestCase);
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( ImageRawTestCase );
diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp
index 11f6451afe..ecf8770640 100644
--- a/tests/intl/intltest.cpp
+++ b/tests/intl/intltest.cpp
@@ -60,7 +60,7 @@ private:
 
     wxLocale *m_locale;
 
-    DECLARE_NO_COPY_CLASS(IntlTestCase)
+    wxDECLARE_NO_COPY_CLASS(IntlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp
index 53fbbc1caa..b5be06d72d 100644
--- a/tests/lists/lists.cpp
+++ b/tests/lists/lists.cpp
@@ -42,7 +42,7 @@ private:
     void wxStdListTest();
     void wxListCtorTest();
 
-    DECLARE_NO_COPY_CLASS(ListsTestCase)
+    wxDECLARE_NO_COPY_CLASS(ListsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/longlong/longlongtest.cpp b/tests/longlong/longlongtest.cpp
index b66d8bb6a4..62a59354a6 100644
--- a/tests/longlong/longlongtest.cpp
+++ b/tests/longlong/longlongtest.cpp
@@ -81,7 +81,7 @@ private:
     void LoHi();
     void Limits();
 
-    DECLARE_NO_COPY_CLASS(LongLongTestCase)
+    wxDECLARE_NO_COPY_CLASS(LongLongTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp
index 49369327b4..932ba3f416 100644
--- a/tests/mbconv/mbconvtest.cpp
+++ b/tests/mbconv/mbconvtest.cpp
@@ -210,7 +210,7 @@ private:
     void UTF8(const char *charSequence, const wchar_t *wideSequence, int option);
 #endif // HAVE_WCHAR_H
 
-    DECLARE_NO_COPY_CLASS(MBConvTestCase)
+    wxDECLARE_NO_COPY_CLASS(MBConvTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index efc2f0a170..4d921cec3f 100644
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -120,7 +120,7 @@ private:
     // The menu containing the item with MenuTestCase_Bar id.
     wxMenu* m_menuWithBar;
 
-    DECLARE_NO_COPY_CLASS(MenuTestCase)
+    wxDECLARE_NO_COPY_CLASS(MenuTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/dynamiclib.cpp b/tests/misc/dynamiclib.cpp
index af9ca06a00..b93e2889ae 100644
--- a/tests/misc/dynamiclib.cpp
+++ b/tests/misc/dynamiclib.cpp
@@ -38,8 +38,8 @@ private:
     CPPUNIT_TEST_SUITE_END();
 
     void Load();
-    
-    DECLARE_NO_COPY_CLASS(DynamicLibraryTestCase)
+
+    wxDECLARE_NO_COPY_CLASS(DynamicLibraryTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/environ.cpp b/tests/misc/environ.cpp
index efa6c8940c..10dac64f07 100644
--- a/tests/misc/environ.cpp
+++ b/tests/misc/environ.cpp
@@ -35,8 +35,8 @@ private:
 
     void GetSet();
     void Path();
-    
-    DECLARE_NO_COPY_CLASS(EnvTestCase)
+
+    wxDECLARE_NO_COPY_CLASS(EnvTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/garbage.cpp b/tests/misc/garbage.cpp
index 8ca3db88f8..f2be8cf10a 100644
--- a/tests/misc/garbage.cpp
+++ b/tests/misc/garbage.cpp
@@ -45,7 +45,7 @@ private:
     void DoLoadFile(const wxString& fullname);
     void DoLoadStream(wxInputStream& stream);
 
-    DECLARE_NO_COPY_CLASS(GarbageTestCase)
+    wxDECLARE_NO_COPY_CLASS(GarbageTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/guifuncs.cpp b/tests/misc/guifuncs.cpp
index 3e300b2cf3..27bf5654a4 100644
--- a/tests/misc/guifuncs.cpp
+++ b/tests/misc/guifuncs.cpp
@@ -55,7 +55,7 @@ private:
     void ClientToScreen();
     void FindWindowAtPoint();
 
-    DECLARE_NO_COPY_CLASS(MiscGUIFuncsTestCase)
+    wxDECLARE_NO_COPY_CLASS(MiscGUIFuncsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/metatest.cpp b/tests/misc/metatest.cpp
index 3d77d5d1e8..cf8d7b9dd6 100644
--- a/tests/misc/metatest.cpp
+++ b/tests/misc/metatest.cpp
@@ -43,7 +43,7 @@ private:
     void ImplicitConversion();
     void MinMax();
 
-    DECLARE_NO_COPY_CLASS(MetaProgrammingTestCase)
+    wxDECLARE_NO_COPY_CLASS(MetaProgrammingTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp
index 3ad7d3aea2..05df993a4a 100644
--- a/tests/misc/misctests.cpp
+++ b/tests/misc/misctests.cpp
@@ -47,7 +47,7 @@ private:
     void Delete();
     void StaticCast();
 
-    DECLARE_NO_COPY_CLASS(MiscTestCase)
+    wxDECLARE_NO_COPY_CLASS(MiscTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/module.cpp b/tests/misc/module.cpp
index d549273249..caaa960114 100644
--- a/tests/misc/module.cpp
+++ b/tests/misc/module.cpp
@@ -37,7 +37,7 @@ class ModuleA : public Module
 public:
     ModuleA();
 private:
-    DECLARE_DYNAMIC_CLASS(ModuleA)
+    wxDECLARE_DYNAMIC_CLASS(ModuleA);
 };
 
 class ModuleB : public Module
@@ -45,7 +45,7 @@ class ModuleB : public Module
 public:
     ModuleB();
 private:
-    DECLARE_DYNAMIC_CLASS(ModuleB)
+    wxDECLARE_DYNAMIC_CLASS(ModuleB);
 };
 
 class ModuleC : public Module
@@ -53,7 +53,7 @@ class ModuleC : public Module
 public:
     ModuleC();
 private:
-    DECLARE_DYNAMIC_CLASS(ModuleC)
+    wxDECLARE_DYNAMIC_CLASS(ModuleC);
 };
 
 class ModuleD : public Module
@@ -61,30 +61,30 @@ class ModuleD : public Module
 public:
     ModuleD();
 private:
-    DECLARE_DYNAMIC_CLASS(ModuleD)
+    wxDECLARE_DYNAMIC_CLASS(ModuleD);
 };
 
-IMPLEMENT_DYNAMIC_CLASS(ModuleA, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(ModuleA, wxModule);
 ModuleA::ModuleA()
 {
     AddDependency(CLASSINFO(ModuleB));
     AddDependency(CLASSINFO(ModuleD));
 }
 
-IMPLEMENT_DYNAMIC_CLASS(ModuleB, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(ModuleB, wxModule);
 ModuleB::ModuleB()
 {
     AddDependency(CLASSINFO(ModuleC));
     AddDependency(CLASSINFO(ModuleD));
 }
 
-IMPLEMENT_DYNAMIC_CLASS(ModuleC, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(ModuleC, wxModule);
 ModuleC::ModuleC()
 {
     AddDependency(CLASSINFO(ModuleD));
 }
 
-IMPLEMENT_DYNAMIC_CLASS(ModuleD, wxModule)
+wxIMPLEMENT_DYNAMIC_CLASS(ModuleD, wxModule);
 ModuleD::ModuleD()
 {
 }
@@ -104,7 +104,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 
     void LoadOrder();
-    DECLARE_NO_COPY_CLASS(ModuleTestCase)
+    wxDECLARE_NO_COPY_CLASS(ModuleTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/pathlist.cpp b/tests/misc/pathlist.cpp
index 9c8c145397..4a4e2a9c95 100644
--- a/tests/misc/pathlist.cpp
+++ b/tests/misc/pathlist.cpp
@@ -34,7 +34,7 @@ private:
 
     void FindValidPath();
 
-    DECLARE_NO_COPY_CLASS(PathListTestCase)
+    wxDECLARE_NO_COPY_CLASS(PathListTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/safearrayconverttest.cpp b/tests/misc/safearrayconverttest.cpp
index 51c7f16d65..495245a805 100644
--- a/tests/misc/safearrayconverttest.cpp
+++ b/tests/misc/safearrayconverttest.cpp
@@ -49,7 +49,7 @@ private:
     void VariantListReturnSafeArray();
     void StringsReturnSafeArray();
 
-    DECLARE_NO_COPY_CLASS(SafeArrayConvertTestCase )
+    wxDECLARE_NO_COPY_CLASS(SafeArrayConvertTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/selstoretest.cpp b/tests/misc/selstoretest.cpp
index b1169625b5..e05ebf0cd9 100644
--- a/tests/misc/selstoretest.cpp
+++ b/tests/misc/selstoretest.cpp
@@ -61,7 +61,7 @@ private:
 
     wxSelectionStore *m_store;
 
-    DECLARE_NO_COPY_CLASS(SelStoreTestCase)
+    wxDECLARE_NO_COPY_CLASS(SelStoreTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/settings.cpp b/tests/misc/settings.cpp
index 8c94f0a3c1..ab6f5712f2 100644
--- a/tests/misc/settings.cpp
+++ b/tests/misc/settings.cpp
@@ -49,7 +49,7 @@ private:
     void GlobalBrushes();
     void GlobalPens();
 
-    DECLARE_NO_COPY_CLASS(SettingsTestCase)
+    wxDECLARE_NO_COPY_CLASS(SettingsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/misc/typeinfotest.cpp b/tests/misc/typeinfotest.cpp
index 5805ad8f40..9d31ccf877 100644
--- a/tests/misc/typeinfotest.cpp
+++ b/tests/misc/typeinfotest.cpp
@@ -30,7 +30,7 @@ private:
 
     void Test();
 
-    DECLARE_NO_COPY_CLASS(TypeInfoTestCase)
+    wxDECLARE_NO_COPY_CLASS(TypeInfoTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/net/ipc.cpp b/tests/net/ipc.cpp
index 8eb0f9cbdb..e68167b6e8 100644
--- a/tests/net/ipc.cpp
+++ b/tests/net/ipc.cpp
@@ -58,7 +58,7 @@ public:
     }
 
 private:
-    DECLARE_NO_COPY_CLASS(IPCTestConnection)
+    wxDECLARE_NO_COPY_CLASS(IPCTestConnection);
 };
 
 // ----------------------------------------------------------------------------
@@ -83,7 +83,7 @@ protected:
         return NULL;
     }
 
-    DECLARE_NO_COPY_CLASS(EventThread)
+    wxDECLARE_NO_COPY_CLASS(EventThread);
 };
 
 // ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ private:
     EventThread *m_thread;
     IPCTestConnection *m_conn;
 
-    DECLARE_NO_COPY_CLASS(IPCTestServer)
+    wxDECLARE_NO_COPY_CLASS(IPCTestServer);
 };
 
 static IPCTestServer *gs_server = NULL;
@@ -184,7 +184,7 @@ public:
 private:
     wxConnectionBase *m_conn;
 
-    DECLARE_NO_COPY_CLASS(IPCTestClient)
+    wxDECLARE_NO_COPY_CLASS(IPCTestClient);
 };
 
 static IPCTestClient *gs_client = NULL;
@@ -209,7 +209,7 @@ private:
     void Execute();
     void Disconnect();
 
-    DECLARE_NO_COPY_CLASS(IPCTestCase)
+    wxDECLARE_NO_COPY_CLASS(IPCTestCase);
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( IPCTestCase );
diff --git a/tests/net/socket.cpp b/tests/net/socket.cpp
index acd91aee6a..2def27f4a6 100644
--- a/tests/net/socket.cpp
+++ b/tests/net/socket.cpp
@@ -107,7 +107,7 @@ private:
 
     static bool ms_useLoop;
 
-    DECLARE_NO_COPY_CLASS(SocketTestCase)
+    wxDECLARE_NO_COPY_CLASS(SocketTestCase);
 };
 
 bool SocketTestCase::ms_useLoop = false;
diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp
index 813ff27f5b..54597d097f 100644
--- a/tests/sizers/boxsizer.cpp
+++ b/tests/sizers/boxsizer.cpp
@@ -58,7 +58,7 @@ private:
     wxWindow *m_win;
     wxSizer *m_sizer;
 
-    DECLARE_NO_COPY_CLASS(BoxSizerTestCase)
+    wxDECLARE_NO_COPY_CLASS(BoxSizerTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/sizers/gridsizer.cpp b/tests/sizers/gridsizer.cpp
index dd7b42fb01..0253ed8e1d 100644
--- a/tests/sizers/gridsizer.cpp
+++ b/tests/sizers/gridsizer.cpp
@@ -53,7 +53,7 @@ private:
     wxWindow *m_win;
     wxFlexGridSizer *m_sizer;
 
-    DECLARE_NO_COPY_CLASS(GridSizerTestCase)
+    wxDECLARE_NO_COPY_CLASS(GridSizerTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/sizers/wrapsizer.cpp b/tests/sizers/wrapsizer.cpp
index d3bda8ebaa..2d43863df5 100644
--- a/tests/sizers/wrapsizer.cpp
+++ b/tests/sizers/wrapsizer.cpp
@@ -46,7 +46,7 @@ private:
     wxWindow *m_win;
     wxSizer *m_sizer;
 
-    DECLARE_NO_COPY_CLASS(WrapSizerTestCase)
+    wxDECLARE_NO_COPY_CLASS(WrapSizerTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/streams/datastreamtest.cpp b/tests/streams/datastreamtest.cpp
index 0b5b09f847..77c5662e06 100644
--- a/tests/streams/datastreamtest.cpp
+++ b/tests/streams/datastreamtest.cpp
@@ -85,7 +85,7 @@ private:
     static bool ms_useIEEE754;
 #endif // wxUSE_APPLE_IEEE
 
-    DECLARE_NO_COPY_CLASS(DataStreamTestCase)
+    wxDECLARE_NO_COPY_CLASS(DataStreamTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/streams/iostreams.cpp b/tests/streams/iostreams.cpp
index c150144595..f51bd474f3 100644
--- a/tests/streams/iostreams.cpp
+++ b/tests/streams/iostreams.cpp
@@ -65,7 +65,7 @@ private:
 
     wxString m_fnTemp;
 
-    DECLARE_NO_COPY_CLASS(IOStreamsTestCase)
+    wxDECLARE_NO_COPY_CLASS(IOStreamsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/streams/socketstream.cpp b/tests/streams/socketstream.cpp
index 4574892a9a..d0b8856f0b 100644
--- a/tests/streams/socketstream.cpp
+++ b/tests/streams/socketstream.cpp
@@ -91,7 +91,7 @@ protected:
     int m_port;
     void (*m_accept)(wxSocketBase&);
 
-    DECLARE_NO_COPY_CLASS(SocketServerThread)
+    wxDECLARE_NO_COPY_CLASS(SocketServerThread);
 };
 
 // The test case for socket streams
diff --git a/tests/streams/stdstream.cpp b/tests/streams/stdstream.cpp
index 472e427c33..568be19b76 100644
--- a/tests/streams/stdstream.cpp
+++ b/tests/streams/stdstream.cpp
@@ -96,7 +96,7 @@ private:
 
     char m_testData[TEST_SIZE];
 
-    DECLARE_NO_COPY_CLASS(StdStreamTestCase)
+    wxDECLARE_NO_COPY_CLASS(StdStreamTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp
index f71f4324af..ec88c01ec8 100644
--- a/tests/streams/textstreamtest.cpp
+++ b/tests/streams/textstreamtest.cpp
@@ -79,7 +79,7 @@ private:
 #endif // wxUSE_UNICODE
 
 
-    DECLARE_NO_COPY_CLASS(TextStreamTestCase)
+    wxDECLARE_NO_COPY_CLASS(TextStreamTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/crt.cpp b/tests/strings/crt.cpp
index 7f108749c0..1fd1914c1f 100644
--- a/tests/strings/crt.cpp
+++ b/tests/strings/crt.cpp
@@ -63,7 +63,7 @@ private:
     void Strpbrk();
     void Strnlen();
 
-    DECLARE_NO_COPY_CLASS(CrtTestCase)
+    wxDECLARE_NO_COPY_CLASS(CrtTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index 8a1bd3d17d..9c7a56471c 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -72,7 +72,7 @@ private:
     void StdConversion();
 #endif
 
-    DECLARE_NO_COPY_CLASS(StdStringTestCase)
+    wxDECLARE_NO_COPY_CLASS(StdStringTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index b016294724..f31c57988e 100644
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -99,7 +99,7 @@ private:
     void BeforeAndAfter();
     void ScopedBuffers();
 
-    DECLARE_NO_COPY_CLASS(StringTestCase)
+    wxDECLARE_NO_COPY_CLASS(StringTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/tokenizer.cpp b/tests/strings/tokenizer.cpp
index 0b01b680ac..092e9de4ca 100644
--- a/tests/strings/tokenizer.cpp
+++ b/tests/strings/tokenizer.cpp
@@ -50,7 +50,7 @@ private:
     void CopyObj();
     void AssignObj();
 
-    DECLARE_NO_COPY_CLASS(TokenizerTestCase)
+    wxDECLARE_NO_COPY_CLASS(TokenizerTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/unichar.cpp b/tests/strings/unichar.cpp
index ec098cb780..f9603cb61e 100644
--- a/tests/strings/unichar.cpp
+++ b/tests/strings/unichar.cpp
@@ -177,7 +177,7 @@ private:
     wxIF_LONG_LONG_TYPE( void RefwxULongLongCompare(); )
     wxIF_WCHAR_T_TYPE( void RefWideCharCompare(); )
 
-    DECLARE_NO_COPY_CLASS(UniCharTestCase)
+    wxDECLARE_NO_COPY_CLASS(UniCharTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp
index dd5844c855..610949ee7a 100644
--- a/tests/strings/unicode.cpp
+++ b/tests/strings/unicode.cpp
@@ -167,7 +167,7 @@ private:
     void Iteration();
 #endif
 
-    DECLARE_NO_COPY_CLASS(UnicodeTestCase)
+    wxDECLARE_NO_COPY_CLASS(UnicodeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index cc5d4d51c4..b7e51eab14 100644
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -61,7 +61,7 @@ private:
     void RepeatedPrintf();
     void ArgsValidation();
 
-    DECLARE_NO_COPY_CLASS(VarArgTestCase)
+    wxDECLARE_NO_COPY_CLASS(VarArgTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index 049eadd423..4018229cea 100644
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -182,7 +182,7 @@ private:
     void GlibcMisc1();
     void GlibcMisc2();
 
-    DECLARE_NO_COPY_CLASS(VsnprintfTestCase)
+    wxDECLARE_NO_COPY_CLASS(VsnprintfTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/test.cpp b/tests/test.cpp
index 97d12d75ec..d511f97a81 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -386,7 +386,7 @@ private:
 #endif // wxUSE_GUI
 };
 
-IMPLEMENT_APP_NO_MAIN(TestApp)
+wxIMPLEMENT_APP_NO_MAIN(TestApp);
 
 
 // ----------------------------------------------------------------------------
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index 1dccc80deb..7fa475c54c 100644
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -91,7 +91,7 @@ private:
     static void CreateTestFile(size_t len, const char *contents);
 
 
-    DECLARE_NO_COPY_CLASS(TextFileTestCase)
+    wxDECLARE_NO_COPY_CLASS(TextFileTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/thread/atomic.cpp b/tests/thread/atomic.cpp
index 69123f7566..b85c99d849 100644
--- a/tests/thread/atomic.cpp
+++ b/tests/thread/atomic.cpp
@@ -86,7 +86,7 @@ private:
     void TestTwoThreadsSeparate() { TestWithThreads(2, IncOnly); }
     void TestWithThreads(int count, ETestType testtype);
 
-    DECLARE_NO_COPY_CLASS(AtomicTestCase)
+    wxDECLARE_NO_COPY_CLASS(AtomicTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/thread/misc.cpp b/tests/thread/misc.cpp
index d637748bda..b26d83da79 100644
--- a/tests/thread/misc.cpp
+++ b/tests/thread/misc.cpp
@@ -223,7 +223,7 @@ private:
     void TestThreadRun();
     void TestThreadConditions();
 
-    DECLARE_NO_COPY_CLASS(MiscThreadTestCase)
+    wxDECLARE_NO_COPY_CLASS(MiscThreadTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/thread/queue.cpp b/tests/thread/queue.cpp
index 2bfb5456ad..be6e886fa5 100644
--- a/tests/thread/queue.cpp
+++ b/tests/thread/queue.cpp
@@ -80,7 +80,7 @@ private:
     void TestReceive();
     void TestReceiveTimeout();
 
-    DECLARE_NO_COPY_CLASS(QueueTestCase)
+    wxDECLARE_NO_COPY_CLASS(QueueTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/thread/tls.cpp b/tests/thread/tls.cpp
index 235cae6626..49add9158e 100644
--- a/tests/thread/tls.cpp
+++ b/tests/thread/tls.cpp
@@ -88,7 +88,7 @@ private:
     void TestInt();
     void TestStruct();
 
-    DECLARE_NO_COPY_CLASS(TLSTestCase)
+    wxDECLARE_NO_COPY_CLASS(TLSTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp
index 29c68f3906..61c52207ed 100644
--- a/tests/toplevel/toplevel.cpp
+++ b/tests/toplevel/toplevel.cpp
@@ -44,7 +44,7 @@ private:
     void FrameShowTest();
     void TopLevelWindowShowTest(wxTopLevelWindow* tlw);
 
-    DECLARE_NO_COPY_CLASS(TopLevelWindowTestCase)
+    wxDECLARE_NO_COPY_CLASS(TopLevelWindowTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/uris/ftp.cpp b/tests/uris/ftp.cpp
index 4644bc85b5..0f07e86d8d 100644
--- a/tests/uris/ftp.cpp
+++ b/tests/uris/ftp.cpp
@@ -71,7 +71,7 @@ private:
 
     wxFTP *m_ftp;
 
-    DECLARE_NO_COPY_CLASS(FTPTestCase)
+    wxDECLARE_NO_COPY_CLASS(FTPTestCase);
 };
 
 // NOTE: we do not run FTPTestCase suite by default because buildslaves typically
diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index c5ee7ca944..65eede5a02 100644
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -81,7 +81,7 @@ private:
 #endif
 #endif
 
-    DECLARE_NO_COPY_CLASS(URITestCase)
+    wxDECLARE_NO_COPY_CLASS(URITestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/uris/url.cpp b/tests/uris/url.cpp
index 57c556c636..32f6e3221c 100644
--- a/tests/uris/url.cpp
+++ b/tests/uris/url.cpp
@@ -42,7 +42,7 @@ private:
     void GetInputStream();
     void CopyAndAssignment();
 
-    DECLARE_NO_COPY_CLASS(URLTestCase)
+    wxDECLARE_NO_COPY_CLASS(URLTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index d00e78bc52..001f79eabc 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -96,7 +96,7 @@ private:
     void Swap();
     void Sort();
 
-    DECLARE_NO_COPY_CLASS(VectorsTestCase)
+    wxDECLARE_NO_COPY_CLASS(VectorsTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/weakref/evtconnection.cpp b/tests/weakref/evtconnection.cpp
index 99445abee4..3d1a856c58 100644
--- a/tests/weakref/evtconnection.cpp
+++ b/tests/weakref/evtconnection.cpp
@@ -84,7 +84,7 @@ private:
     void SourceDestroyTest();
     void MultiConnectionTest();
 
-    DECLARE_NO_COPY_CLASS(EvtConnectionTestCase)
+    wxDECLARE_NO_COPY_CLASS(EvtConnectionTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/weakref/weakref.cpp b/tests/weakref/weakref.cpp
index a3e3335f2b..ce3f9de72d 100644
--- a/tests/weakref/weakref.cpp
+++ b/tests/weakref/weakref.cpp
@@ -66,7 +66,7 @@ private:
     void DynamicRefTest();
 #endif
 
-    DECLARE_NO_COPY_CLASS(WeakRefTestCase)
+    wxDECLARE_NO_COPY_CLASS(WeakRefTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/window/clientsize.cpp b/tests/window/clientsize.cpp
index 172bcd2597..421a442f43 100644
--- a/tests/window/clientsize.cpp
+++ b/tests/window/clientsize.cpp
@@ -46,7 +46,7 @@ private:
 
     wxWindow *m_win;
 
-    DECLARE_NO_COPY_CLASS(ClientSizeTestCase)
+    wxDECLARE_NO_COPY_CLASS(ClientSizeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/window/setsize.cpp b/tests/window/setsize.cpp
index 43482c111d..56caaded36 100644
--- a/tests/window/setsize.cpp
+++ b/tests/window/setsize.cpp
@@ -61,7 +61,7 @@ private:
 
     wxWindow *m_win;
 
-    DECLARE_NO_COPY_CLASS(SetSizeTestCase)
+    wxDECLARE_NO_COPY_CLASS(SetSizeTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/xlocale/xlocale.cpp b/tests/xlocale/xlocale.cpp
index d2e8b68bb1..dda5c0e362 100644
--- a/tests/xlocale/xlocale.cpp
+++ b/tests/xlocale/xlocale.cpp
@@ -51,7 +51,7 @@ private:
     void TestCtypeFunctionsWith(const wxXLocale& loc);
     void TestStdlibFunctionsWith(const wxXLocale& loc);
 
-    DECLARE_NO_COPY_CLASS(XLocaleTestCase)
+    wxDECLARE_NO_COPY_CLASS(XLocaleTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/xml/xmltest.cpp b/tests/xml/xmltest.cpp
index 8a824e7e4a..e7f35ae7c9 100644
--- a/tests/xml/xmltest.cpp
+++ b/tests/xml/xmltest.cpp
@@ -95,7 +95,7 @@ private:
     void SetRoot();
     void CopyNode();
 
-    DECLARE_NO_COPY_CLASS(XmlTestCase)
+    wxDECLARE_NO_COPY_CLASS(XmlTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/tests/xml/xrctest.cpp b/tests/xml/xrctest.cpp
index 69ac931c27..ef98caa76b 100644
--- a/tests/xml/xrctest.cpp
+++ b/tests/xml/xrctest.cpp
@@ -149,7 +149,7 @@ private:
     void ObjectReferences();
     void IDRanges();
 
-    DECLARE_NO_COPY_CLASS(XrcTestCase)
+    wxDECLARE_NO_COPY_CLASS(XrcTestCase);
 };
 
 // register in the unnamed registry so that these tests are run by default
diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 74a2a832b9..556135825c 100644
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -58,18 +58,18 @@
 // the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
+wxBEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
     EVT_MENU(Emulator_Quit,  wxEmulatorFrame::OnQuit)
     EVT_MENU(Emulator_About, wxEmulatorFrame::OnAbout)
     EVT_CLOSE(wxEmulatorFrame::OnCloseWindow)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. wxEmulatorApp and
 // not wxApp)
-IMPLEMENT_APP(wxEmulatorApp)
+wxIMPLEMENT_APP(wxEmulatorApp);
 
 static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
 {
@@ -325,13 +325,13 @@ void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     }
 }
 
-IMPLEMENT_CLASS(wxEmulatorContainer, wxWindow)
+wxIMPLEMENT_CLASS(wxEmulatorContainer, wxWindow);
 
-BEGIN_EVENT_TABLE(wxEmulatorContainer, wxWindow)
+wxBEGIN_EVENT_TABLE(wxEmulatorContainer, wxWindow)
     EVT_SIZE(wxEmulatorContainer::OnSize)
     EVT_PAINT(wxEmulatorContainer::OnPaint)
     EVT_ERASE_BACKGROUND(wxEmulatorContainer::OnEraseBackground)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 wxEmulatorContainer::wxEmulatorContainer(wxWindow* parent, wxWindowID id):
     wxWindow(parent, id, wxDefaultPosition, wxDefaultSize)
diff --git a/utils/emulator/src/emulator.h b/utils/emulator/src/emulator.h
index 2dcd0c7aa2..dfd84ae8ca 100644
--- a/utils/emulator/src/emulator.h
+++ b/utils/emulator/src/emulator.h
@@ -108,8 +108,8 @@ public:
     void OnPaint(wxPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
 
-DECLARE_CLASS(wxEmulatorContainer)
-DECLARE_EVENT_TABLE()
+    wxDECLARE_CLASS(wxEmulatorContainer);
+    wxDECLARE_EVENT_TABLE();
 
 };
 
@@ -127,7 +127,7 @@ public:
 
 private:
     // any class wishing to process wxWidgets events must use this macro
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/utils/helpview/src/client.cpp b/utils/helpview/src/client.cpp
index eae0ede021..b84d664fc9 100644
--- a/utils/helpview/src/client.cpp
+++ b/utils/helpview/src/client.cpp
@@ -55,25 +55,25 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(MyApp)
+wxIMPLEMENT_APP(MyApp);
 
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
-EVT_MENU(CLIENT_HELPMAIN, MyFrame::OnHelp_Main)
-EVT_MENU(CLIENT_HELPBOOK1, MyFrame::OnHelp_Book1)
-EVT_MENU(CLIENT_HELPBOOK2, MyFrame::OnHelp_Book2)
+wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
+    EVT_MENU(CLIENT_HELPMAIN, MyFrame::OnHelp_Main)
+    EVT_MENU(CLIENT_HELPBOOK1, MyFrame::OnHelp_Book1)
+    EVT_MENU(CLIENT_HELPBOOK2, MyFrame::OnHelp_Book2)
 
-EVT_MENU(CLIENT_HELPINDEX, MyFrame::OnHelp_Index)
-EVT_MENU(CLIENT_HELPCONTENTS, MyFrame::OnHelp_Contents)
-EVT_MENU(CLIENT_HELPSEARCH, MyFrame::OnHelp_Search)
-EVT_MENU(CLIENT_HELPTITLE, MyFrame::OnHelp_Title)
-EVT_MENU(CLIENT_HELPADDBOOK, MyFrame::OnHelp_Addbook)
-EVT_MENU(CLIENT_HELPTEMPDIR, MyFrame::OnHelp_Tempdir)
-EVT_MENU(CLIENT_HELPQUIT, MyFrame::OnHelp_Quitserver)
+    EVT_MENU(CLIENT_HELPINDEX, MyFrame::OnHelp_Index)
+    EVT_MENU(CLIENT_HELPCONTENTS, MyFrame::OnHelp_Contents)
+    EVT_MENU(CLIENT_HELPSEARCH, MyFrame::OnHelp_Search)
+    EVT_MENU(CLIENT_HELPTITLE, MyFrame::OnHelp_Title)
+    EVT_MENU(CLIENT_HELPADDBOOK, MyFrame::OnHelp_Addbook)
+    EVT_MENU(CLIENT_HELPTEMPDIR, MyFrame::OnHelp_Tempdir)
+    EVT_MENU(CLIENT_HELPQUIT, MyFrame::OnHelp_Quitserver)
 
-EVT_MENU(DIALOG_MODAL, MyFrame::ModalDlg)
-EVT_BUTTON(BUTTON_MODAL, MyFrame::ModalDlg)
-END_EVENT_TABLE()
+    EVT_MENU(DIALOG_MODAL, MyFrame::ModalDlg)
+    EVT_BUTTON(BUTTON_MODAL, MyFrame::ModalDlg)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // globals
@@ -245,9 +245,9 @@ void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
     dlg.ShowModal();
 }
 
-BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
-EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton)
-END_EVENT_TABLE()
+wxBEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
+    EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton)
+wxEND_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 // MyModalDialog
diff --git a/utils/helpview/src/client.h b/utils/helpview/src/client.h
index 784e21dd05..159102cc48 100644
--- a/utils/helpview/src/client.h
+++ b/utils/helpview/src/client.h
@@ -22,7 +22,7 @@ public:
 #endif
 };
 
-DECLARE_APP(MyApp)
+wxDECLARE_APP(MyApp);
 
 // Define a new frame
 class MyFrame: public wxFrame
@@ -48,7 +48,7 @@ private:
     wxPanel *m_panel;
     wxButton *m_modalbutton;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 class MyModalDialog : public wxDialog
@@ -63,7 +63,7 @@ private:
     wxButton *m_book1;
     wxButton *m_book2;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 6e28684573..83010e61f5 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -39,7 +39,7 @@ protected:
                                   const wxSize& size);
 };
 
-IMPLEMENT_APP(hvApp)
+wxIMPLEMENT_APP(hvApp);
 
 hvApp::hvApp()
 {
diff --git a/utils/helpview/src/remhelp.cpp b/utils/helpview/src/remhelp.cpp
index d8c247d658..af7ceea7e7 100644
--- a/utils/helpview/src/remhelp.cpp
+++ b/utils/helpview/src/remhelp.cpp
@@ -84,7 +84,7 @@ bool rhhcConnection::OnDisconnect()
 
 // wxRemoteHtmlHelpController class
 
-IMPLEMENT_CLASS(wxRemoteHtmlHelpController, wxHelpControllerBase)
+wxIMPLEMENT_CLASS(wxRemoteHtmlHelpController, wxHelpControllerBase);
 
 wxRemoteHtmlHelpController::wxRemoteHtmlHelpController(int style )
 {
diff --git a/utils/helpview/src/remhelp.h b/utils/helpview/src/remhelp.h
index 02121f7b1d..5822043faf 100644
--- a/utils/helpview/src/remhelp.h
+++ b/utils/helpview/src/remhelp.h
@@ -40,7 +40,7 @@ public:
 
 class wxRemoteHtmlHelpController : public wxHelpControllerBase
 {
-    DECLARE_CLASS(wxRemoteHtmlHelpController)
+    wxDECLARE_CLASS(wxRemoteHtmlHelpController);
 public:
     wxRemoteHtmlHelpController(int style = wxHF_DEFAULT_STYLE);
     virtual ~wxRemoteHtmlHelpController();
diff --git a/utils/hhp2cached/hhp2cached.cpp b/utils/hhp2cached/hhp2cached.cpp
index ffcd539982..b3281e74fd 100644
--- a/utils/hhp2cached/hhp2cached.cpp
+++ b/utils/hhp2cached/hhp2cached.cpp
@@ -26,7 +26,7 @@ public:
     virtual bool OnInit();
 };
 
-IMPLEMENT_APP(MyApp);
+wxIMPLEMENT_APP(MyApp);
 
 bool MyApp::OnInit()
 {
diff --git a/utils/ifacecheck/src/ifacecheck.cpp b/utils/ifacecheck/src/ifacecheck.cpp
index 75831e5994..bef1c75c0e 100644
--- a/utils/ifacecheck/src/ifacecheck.cpp
+++ b/utils/ifacecheck/src/ifacecheck.cpp
@@ -117,7 +117,7 @@ protected:
     wxString m_strToMatch;
 };
 
-IMPLEMENT_APP_CONSOLE(IfaceCheckApp)
+wxIMPLEMENT_APP_CONSOLE(IfaceCheckApp);
 
 int IfaceCheckApp::OnRun()
 {
diff --git a/utils/screenshotgen/src/customcombo.cpp b/utils/screenshotgen/src/customcombo.cpp
index 6467af88c2..6d133d02b0 100644
--- a/utils/screenshotgen/src/customcombo.cpp
+++ b/utils/screenshotgen/src/customcombo.cpp
@@ -24,21 +24,21 @@
 #include "customcombo.h"
 
 
-BEGIN_EVENT_TABLE(ListViewComboPopup, wxListView)
+wxBEGIN_EVENT_TABLE(ListViewComboPopup, wxListView)
     EVT_MOTION(ListViewComboPopup::OnMouseMove)
     // NOTE: Left down event is used instead of left up right now
     //       since MSW wxListCtrl doesn't seem to emit left ups
     //       consistently.
     EVT_LEFT_DOWN(ListViewComboPopup::OnMouseClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl)
+wxBEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl)
     EVT_MOTION(TreeCtrlComboPopup::OnMouseMove)
     // NOTE: Left down event is used instead of left up right now
     //       since MSW wxTreeCtrl doesn't seem to emit left ups
     //       consistently.
     EVT_LEFT_DOWN(TreeCtrlComboPopup::OnMouseClick)
-END_EVENT_TABLE()
+wxEND_EVENT_TABLE()
 
 
 
diff --git a/utils/screenshotgen/src/customcombo.h b/utils/screenshotgen/src/customcombo.h
index 8105ee4c14..6e8a0f89e0 100644
--- a/utils/screenshotgen/src/customcombo.h
+++ b/utils/screenshotgen/src/customcombo.h
@@ -117,7 +117,7 @@ protected:
     int             m_itemHere;     // hot item in popup
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
@@ -241,7 +241,7 @@ protected:
     wxTreeItemId        m_itemHere;     // hot item in popup
 
 private:
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 
diff --git a/utils/screenshotgen/src/screenshot_app.cpp b/utils/screenshotgen/src/screenshot_app.cpp
index ab90c03653..f7580e8c85 100644
--- a/utils/screenshotgen/src/screenshot_app.cpp
+++ b/utils/screenshotgen/src/screenshot_app.cpp
@@ -27,7 +27,7 @@
 // ScreenshotApp
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_APP(ScreenshotApp);
+wxIMPLEMENT_APP(ScreenshotApp);
 
 bool ScreenshotApp::OnInit()
 {
diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index accc755f96..f9c1b5c0de 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -254,7 +254,7 @@ private:
         void GenCPPHeader();
 };
 
-IMPLEMENT_APP_CONSOLE(XmlResApp)
+wxIMPLEMENT_APP_CONSOLE(XmlResApp);
 
 int XmlResApp::OnRun()
 {