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

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;

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_

include/wx/qt/choice.h

@@ -75,7 +75,7 @@ protected:
 
 private:
 
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 #endif // _WX_QT_CHOICE_H_

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_

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_

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_

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_

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_

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_

include/wx/qt/dcscreen.h

@@ -21,7 +21,7 @@ public:
 
 private:
 
-    DECLARE_ABSTRACT_CLASS(wxScreenDCImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl);
 };
 
 #endif // _WX_QT_DCSCREEN_H_

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_

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_

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

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_

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_

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_

include/wx/qt/mdi.h

@@ -39,7 +39,7 @@ public:
 protected:
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 

include/wx/qt/minifram.h

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

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_

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_

include/wx/qt/scrolbar.h

@@ -47,7 +47,7 @@ public:
 private:
     QScrollBar *m_qtScrollBar;
 
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 

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 >

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_

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

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_

include/wx/qt/tglbtn.h

@@ -39,7 +39,7 @@ public:
     virtual QPushButton *GetHandle() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
 
 };
 

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_

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_