Use wx-prefixed macros throughout the repository.

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

include/wx/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

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__

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

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_

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_

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_

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

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_

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

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_

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

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_

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_

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

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

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_

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

include/wx/msw/cursor.h

@@ -42,7 +42,7 @@ protected:
     virtual wxGDIImageRefData *CreateData() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 #endif

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_

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

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

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

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

include/wx/msw/dcscreen.h

@@ -25,7 +25,7 @@ public:
         GetDeviceSize(w, h);
     }
 
-    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_CLASS(wxScreenDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 

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

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

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

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

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

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

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

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_

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

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

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

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_

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

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

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

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

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

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

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
    */

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

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

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_

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_

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

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

include/wx/msw/minifram.h

@@ -44,7 +44,7 @@ public:
   }
 
 protected:
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame)
+  wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame);
 };
 
 #endif

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

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_

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_

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_

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

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

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

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_

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

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_

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

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_

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

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

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

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_

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_

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

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

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_

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;
 

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_

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

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

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

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

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

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

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

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

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

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

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