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.
This commit is contained in:
@@ -144,15 +144,15 @@ protected:
|
||||
private:
|
||||
wxSearchCtrl* m_search;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
|
||||
wxBEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
|
||||
EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText)
|
||||
EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
|
||||
EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
|
||||
EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxSearchButton: search button used by search control
|
||||
@@ -231,21 +231,21 @@ private:
|
||||
wxEventType m_eventType;
|
||||
wxBitmap m_bmp;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(wxSearchButton, wxControl)
|
||||
wxBEGIN_EVENT_TABLE(wxSearchButton, wxControl)
|
||||
EVT_LEFT_UP(wxSearchButton::OnLeftUp)
|
||||
EVT_PAINT(wxSearchButton::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
|
||||
wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
|
||||
EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
|
||||
EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
|
||||
EVT_SIZE(wxSearchCtrl::OnSize)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase);
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
Reference in New Issue
Block a user