X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2903e6998a46a0b3504da30e21a9c28b344680ae..27d79a5027bee4f46e57c813d072422065cb1592:/src/common/fddlgcmn.cpp diff --git a/src/common/fddlgcmn.cpp b/src/common/fddlgcmn.cpp index 8783c725d9..210d36e6d1 100644 --- a/src/common/fddlgcmn.cpp +++ b/src/common/fddlgcmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fdrepdlg.cpp +// Name: src/common/fddlgcmn.cpp // Purpose: common parts of wxFindReplaceDialog implementations // Author: Vadim Zeitlin // Modified by: @@ -37,11 +37,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE) +wxDEFINE_EVENT( wxEVT_FIND, wxFindDialogEvent ); +wxDEFINE_EVENT( wxEVT_FIND_NEXT, wxFindDialogEvent ); +wxDEFINE_EVENT( wxEVT_FIND_REPLACE, wxFindDialogEvent ); +wxDEFINE_EVENT( wxEVT_FIND_REPLACE_ALL, wxFindDialogEvent ); +wxDEFINE_EVENT( wxEVT_FIND_CLOSE, wxFindDialogEvent ); // ============================================================================ // implementations @@ -71,18 +71,18 @@ void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event) m_FindReplaceData->m_Flags = event.GetFlags(); m_FindReplaceData->m_FindWhat = event.GetFindString(); if ( HasFlag(wxFR_REPLACEDIALOG) && - (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE || - event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) ) + (event.GetEventType() == wxEVT_FIND_REPLACE || + event.GetEventType() == wxEVT_FIND_REPLACE_ALL) ) { m_FindReplaceData->m_ReplaceWith = event.GetReplaceString(); } - // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed - if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT ) + // translate wxEVT_FIND_NEXT to wxEVT_FIND if needed + if ( event.GetEventType() == wxEVT_FIND_NEXT ) { if ( m_FindReplaceData->m_FindWhat != m_lastSearch ) { - event.SetEventType(wxEVT_COMMAND_FIND); + event.SetEventType(wxEVT_FIND); m_lastSearch = m_FindReplaceData->m_FindWhat; }