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

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_

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_

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_

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

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_

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

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

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_

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_

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_

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_

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_

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_

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_

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_

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

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_

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

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_

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_

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_

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_

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

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

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_

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_

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

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_