fixed checking/unchecking find/replace items in the menu problem (they becameo ut of sync with the real status)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
99cd20beb9
commit
df26c4c640
@ -655,6 +655,7 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
|
|||||||
this, // parent
|
this, // parent
|
||||||
wxPD_CAN_ABORT |
|
wxPD_CAN_ABORT |
|
||||||
wxPD_APP_MODAL |
|
wxPD_APP_MODAL |
|
||||||
|
// wxPD_AUTO_HIDE | -- try this as well
|
||||||
wxPD_ELAPSED_TIME |
|
wxPD_ELAPSED_TIME |
|
||||||
wxPD_ESTIMATED_TIME |
|
wxPD_ESTIMATED_TIME |
|
||||||
wxPD_REMAINING_TIME);
|
wxPD_REMAINING_TIME);
|
||||||
@ -796,25 +797,34 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
|
|||||||
{
|
{
|
||||||
wxFindReplaceDialog *dlg = event.GetDialog();
|
wxFindReplaceDialog *dlg = event.GetDialog();
|
||||||
|
|
||||||
|
int idMenu;
|
||||||
const wxChar *txt;
|
const wxChar *txt;
|
||||||
if ( dlg == m_dlgFind )
|
if ( dlg == m_dlgFind )
|
||||||
{
|
{
|
||||||
txt = _T("Find");
|
txt = _T("Find");
|
||||||
|
idMenu = DIALOGS_FIND;
|
||||||
m_dlgFind = NULL;
|
m_dlgFind = NULL;
|
||||||
}
|
}
|
||||||
else if ( dlg == m_dlgReplace )
|
else if ( dlg == m_dlgReplace )
|
||||||
{
|
{
|
||||||
txt = _T("Replace");
|
txt = _T("Replace");
|
||||||
|
idMenu = DIALOGS_REPLACE;
|
||||||
m_dlgReplace = NULL;
|
m_dlgReplace = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
txt = _T("Unknown");
|
txt = _T("Unknown");
|
||||||
|
idMenu = -1;
|
||||||
|
|
||||||
wxFAIL_MSG( _T("unexpected event") );
|
wxFAIL_MSG( _T("unexpected event") );
|
||||||
}
|
}
|
||||||
|
|
||||||
wxLogMessage(wxT("%s dialog is being closed."), txt),
|
wxLogMessage(wxT("%s dialog is being closed."), txt);
|
||||||
|
|
||||||
|
if ( idMenu != -1 )
|
||||||
|
{
|
||||||
|
GetMenuBar()->Check(idMenu, FALSE);
|
||||||
|
}
|
||||||
|
|
||||||
dlg->Destroy();
|
dlg->Destroy();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user