Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event type constants themselves. This makes them much more comfortable to use, e.g. Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED). The old long names are still kept for backwards compatibility and shouldn't be removed as it doesn't really cost anything to continue providing them, but all new event types should only use the short versions. Closes #10661. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -202,7 +202,7 @@ protected:
|
||||
wxCommandEvent event(m_eventType, m_search->GetId());
|
||||
event.SetEventObject(m_search);
|
||||
|
||||
if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
|
||||
if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
|
||||
{
|
||||
// it's convenient to have the string to search for directly in the
|
||||
// event instead of having to retrieve it from the control in the
|
||||
@@ -215,7 +215,7 @@ protected:
|
||||
m_search->SetFocus();
|
||||
|
||||
#if wxUSE_MENUS
|
||||
if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
|
||||
if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
|
||||
{
|
||||
// this happens automatically, just like on Mac OS X
|
||||
m_search->PopupSearchMenu();
|
||||
@@ -329,10 +329,10 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
|
||||
m_text = new wxSearchTextCtrl(this, value, style);
|
||||
|
||||
m_searchButton = new wxSearchButton(this,
|
||||
wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
|
||||
wxEVT_SEARCHCTRL_SEARCH_BTN,
|
||||
m_searchBitmap);
|
||||
m_cancelButton = new wxSearchButton(this,
|
||||
wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
|
||||
wxEVT_SEARCHCTRL_CANCEL_BTN,
|
||||
m_cancelBitmap);
|
||||
|
||||
SetBackgroundColour( m_text->GetBackgroundColour() );
|
||||
|
Reference in New Issue
Block a user