Use wx-prefixed macros throughout the repository.

Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.

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

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

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

tests/benchmarks/bench.cpp

@@ -75,7 +75,7 @@ private:
     wxString m_strParam;
 };
 
-IMPLEMENT_APP_CONSOLE(BenchApp)
+wxIMPLEMENT_APP_CONSOLE(BenchApp);
 
 // ============================================================================
 // Bench namespace symbols implementation

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);
 };
 
 /**

tests/benchmarks/graphics.cpp

@@ -537,4 +537,4 @@ public:
     }
 };
 
-IMPLEMENT_APP_CONSOLE(GraphicsBenchmarkApp)
+wxIMPLEMENT_APP_CONSOLE(GraphicsBenchmarkApp);

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)

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);
 };
 
 

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,

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);
 };
 
 

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;

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

tests/drawing/drawing.h

@@ -176,7 +176,7 @@ private:
 
     wxVector<PluginInfo> m_drawingPlugins;
 
-    DECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase)
+    wxDECLARE_NO_COPY_CLASS(GraphicsContextDrawingTestCase);
 };
 
 

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

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

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

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

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

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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 );

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 );

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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