Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wx-prefixed macros throughout the repository.

Browse Source 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
Dimitri Schoolwerth
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/univ/bmpbuttn.cpp
View File

@@ -37,10 +37,10 @@
// implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
wxBEGIN_EVENT_TABLE(wxBitmapButton, wxButton)
EVT_SET_FOCUS(wxBitmapButton::OnSetFocus)
EVT_KILL_FOCUS(wxBitmapButton::OnKillFocus)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// wxBitmapButton

4
src/univ/choice.cpp
View File

@@ -30,9 +30,9 @@
#include "wx/arrstr.h"
#endif
BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
wxBEGIN_EVENT_TABLE(wxChoice, wxComboBox)
EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos,

6
src/univ/combobox.cpp
View File

@@ -93,16 +93,16 @@ protected:
private:
friend class wxComboBox; // it accesses our DoGetItemClientData()
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
// event tables and such
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
wxBEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
EVT_LEFT_UP(wxComboListBox::OnLeftUp)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ============================================================================
// implementation

6
src/univ/control.cpp
View File

@@ -39,11 +39,11 @@
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
wxIMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow);
BEGIN_EVENT_TABLE(wxControl, wxControlBase)
wxBEGIN_EVENT_TABLE(wxControl, wxControlBase)
WX_EVENT_TABLE_INPUT_CONSUMER(wxControl)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
WX_FORWARD_TO_INPUT_CONSUMER(wxControl)

4
src/univ/dialog.cpp
View File

@@ -34,12 +34,12 @@
// wxDialog
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
wxBEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
EVT_BUTTON (wxID_OK, wxDialog::OnOK)
EVT_BUTTON (wxID_CANCEL, wxDialog::OnCancel)
EVT_BUTTON (wxID_APPLY, wxDialog::OnApply)
EVT_CLOSE (wxDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxDialog::Init()
{

4
src/univ/framuniv.cpp
View File

@@ -36,10 +36,10 @@
// implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
wxBEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_SIZE(wxFrame::OnSize)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// ctors

4
src/univ/listbox.cpp
View File

@@ -96,9 +96,9 @@ protected:
// implementation of wxListBox
// ============================================================================
BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
wxBEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
EVT_SIZE(wxListBox::OnSize)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// construction

10
src/univ/menu.cpp
View File

@@ -246,7 +246,7 @@ private:
// do we currently have an opened submenu?
bool m_hasOpenSubMenu;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -280,7 +280,7 @@ private:
// wxWin macros
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
wxBEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
EVT_KEY_DOWN(wxPopupMenuWindow::OnKeyDown)
EVT_LEFT_UP(wxPopupMenuWindow::OnLeftUp)
@@ -289,16 +289,16 @@ BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
#ifdef __WXMSW__
EVT_IDLE(wxPopupMenuWindow::OnIdle)
#endif
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)
wxBEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)
EVT_KILL_FOCUS(wxMenuBar::OnKillFocus)
EVT_KEY_DOWN(wxMenuBar::OnKeyDown)
EVT_LEFT_DOWN(wxMenuBar::OnLeftDown)
EVT_MOTION(wxMenuBar::OnMouseMove)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ============================================================================
// implementation

6
src/univ/notebook.cpp
View File

@@ -93,12 +93,12 @@ protected:
private:
wxNotebook *m_nb;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
wxBEGIN_EVENT_TABLE(wxNotebookSpinBtn, wxSpinButton)
EVT_SPIN(wxID_ANY, wxNotebookSpinBtn::OnSpin)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ============================================================================
// implementation

2
src/univ/radiobox.cpp
View File

@@ -86,7 +86,7 @@ private:
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
// ----------------------------------------------------------------------------
// wxRadioBox creation

4
src/univ/scrolbar.cpp
View File

@@ -73,8 +73,8 @@ private:
// implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
END_EVENT_TABLE()
wxBEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// creation

4
src/univ/slider.cpp
View File

@@ -95,9 +95,9 @@ static const wxCoord SLIDER_LABEL_MARGIN = 2;
// implementation of wxSlider
// ============================================================================
BEGIN_EVENT_TABLE(wxSlider, wxControl)
wxBEGIN_EVENT_TABLE(wxSlider, wxControl)
EVT_SIZE(wxSlider::OnSize)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// wxSlider creation

4
src/univ/statusbr.cpp
View File

@@ -38,11 +38,11 @@
// implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxStatusBarUniv, wxStatusBarBase)
wxBEGIN_EVENT_TABLE(wxStatusBarUniv, wxStatusBarBase)
EVT_SIZE(wxStatusBarUniv::OnSize)
WX_EVENT_TABLE_INPUT_CONSUMER(wxStatusBarUniv)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
WX_FORWARD_TO_INPUT_CONSUMER(wxStatusBarUniv)

4
src/univ/textctrl.cpp
View File

@@ -626,11 +626,11 @@ private:
// implementation
// ============================================================================
BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
wxBEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_SIZE(wxTextCtrl::OnSize)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// creation

2
src/univ/tglbtn.cpp
View File

@@ -25,7 +25,7 @@
wxDEFINE_EVENT( wxEVT_TOGGLEBUTTON, wxCommandEvent );
IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase)
wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase);
wxToggleButton::wxToggleButton()
{

6
src/univ/themes/win32.cpp
View File

@@ -3603,7 +3603,7 @@ public:
void Detach();
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
void OnSystemMenu(wxCommandEvent &event);
void OnCloseFrame(wxCommandEvent &event);
void OnClose(wxCloseEvent &event);
@@ -3652,11 +3652,11 @@ void wxWin32SystemMenuEvtHandler::Detach()
}
}
BEGIN_EVENT_TABLE(wxWin32SystemMenuEvtHandler, wxEvtHandler)
wxBEGIN_EVENT_TABLE(wxWin32SystemMenuEvtHandler, wxEvtHandler)
EVT_MENU(wxID_SYSTEM_MENU, wxWin32SystemMenuEvtHandler::OnSystemMenu)
EVT_MENU(wxID_CLOSE_FRAME, wxWin32SystemMenuEvtHandler::OnCloseFrame)
EVT_CLOSE(wxWin32SystemMenuEvtHandler::OnClose)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxWin32SystemMenuEvtHandler::OnSystemMenu(wxCommandEvent &WXUNUSED(event))
{

2
src/univ/toolbar.cpp
View File

@@ -153,7 +153,7 @@ private:
// wxToolBar implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
wxIMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl);
// ----------------------------------------------------------------------------
// wxToolBar creation

10
src/univ/topluniv.cpp
View File

@@ -62,11 +62,11 @@ private:
// event tables
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
wxBEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
WX_EVENT_TABLE_INPUT_CONSUMER(wxTopLevelWindow)
EVT_NC_PAINT(wxTopLevelWindow::OnNcPaint)
EVT_MENU_RANGE(wxID_CLOSE_FRAME, wxID_RESTORE_FRAME, wxTopLevelWindow::OnSystemMenu)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow)
@@ -407,7 +407,7 @@ public:
wxInteractiveMoveHandler(wxInteractiveMoveData& data) : m_data(data) {}
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
void OnMouseMove(wxMouseEvent& event);
void OnMouseDown(wxMouseEvent& event);
void OnMouseUp(wxMouseEvent& event);
@@ -416,12 +416,12 @@ private:
wxInteractiveMoveData& m_data;
};
BEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
wxBEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
EVT_MOTION(wxInteractiveMoveHandler::OnMouseMove)
EVT_LEFT_DOWN(wxInteractiveMoveHandler::OnMouseDown)
EVT_LEFT_UP(wxInteractiveMoveHandler::OnMouseUp)
EVT_KEY_DOWN(wxInteractiveMoveHandler::OnKeyDown)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
static inline LINKAGEMODE

14
src/univ/winuniv.cpp
View File

@@ -88,18 +88,18 @@ public:
// we can't use wxWindowNative here as it won't be expanded inside the macro
#if defined(__WXMSW__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMSW)
wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMSW);
#elif defined(__WXGTK__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK);
#elif defined(__WXOSX__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)
wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac);
#elif defined(__WXDFB__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)
wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB);
#elif defined(__WXX11__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11)
wxIMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11);
#endif
BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
wxBEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
EVT_SIZE(wxWindow::OnSize)
#if wxUSE_ACCEL || wxUSE_MENUS
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
EVT_PAINT(wxWindow::OnPaint)
EVT_NC_PAINT(wxWindow::OnNcPaint)
EVT_ERASE_BACKGROUND(wxWindow::OnErase)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// creation