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

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

include/wx/gtk1/bmpbuttn.h

@@ -66,7 +66,7 @@ protected:
     void Init();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // __BMPBUTTONH__

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__

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__

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__

include/wx/gtk1/checklst.h

@@ -53,7 +53,7 @@ public:
     int GetItemHeight() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif   //__GTKCHECKLISTH__

include/wx/gtk1/choice.h

@@ -104,7 +104,7 @@ public:
     int m_selection_hack;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 };
 
 

include/wx/gtk1/clipbrd.h

@@ -67,7 +67,7 @@ public:
     wxDataObject     *m_receivedData;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif

include/wx/gtk1/colordlg.h

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

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__

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

include/wx/gtk1/control.h

@@ -98,7 +98,7 @@ protected:
     wxString m_label;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxControl)
+    wxDECLARE_DYNAMIC_CLASS(wxControl);
 };
 
 #endif // __GTKCONTROLH__

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__

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

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__

include/wx/gtk1/dcmemory.h

@@ -61,7 +61,7 @@ public:
 private:
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
+    wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl);
 };
 
 #endif // __GTKDCMEMORYH__

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__

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__

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

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__

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

include/wx/gtk1/frame.h

@@ -100,7 +100,7 @@ public:
 
 #endif // wxUSE_MENUS_NATIVE
 
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif // __GTKFRAMEH__

include/wx/gtk1/gauge.h

@@ -69,7 +69,7 @@ protected:
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS(wxGauge);
 };
 
 #endif

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_

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__

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_

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

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

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

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

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

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__

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__

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_

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__

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

include/wx/gtk1/scrolbar.h

@@ -77,7 +77,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
 };
 
 #endif

include/wx/gtk1/slider.h

@@ -67,7 +67,7 @@ public:
     float           m_oldPos;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 };
 
 #endif // __GTKSLIDERH__

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

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

include/wx/gtk1/statbmp.h

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

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__

include/wx/gtk1/statline.h

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

include/wx/gtk1/stattext.h

@@ -49,7 +49,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticText);
 };
 
 #endif // __GTKSTATICTEXTH__

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__

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_

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

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__

include/wx/gtk1/treectrl.h

@@ -357,7 +357,7 @@ protected:
                               wxTreeItemData *data);
 
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 };
 
 #endif

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