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

Add a public wxModalDialogHook class for intercepting modal dialogs.

Browse Source 
Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h,
extend it to allow to be notified not only about showing modal dialogs but
also about dismissing them and document it and show its use in the dialogs
sample.

Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with
WX_HOOK_MODAL_DIALOG.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-20 13:15:41 +00:00
parent 9bc3af3e64
commit 691745ab41
64 changed files with 712 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
samples/dialogs/dialogs.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/minifram.h"
#include "wx/sysopt.h"
#include "wx/notifmsg.h"
#include "wx/modalhook.h"
#if wxUSE_RICHMSGDLG
#include "wx/richmsgdlg.h"
@@ -249,6 +250,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, MyFrame::OnStandardButtonsSizerDialog)
EVT_MENU(DIALOGS_TEST_DEFAULT_ACTION, MyFrame::OnTestDefaultActionDialog)
EVT_MENU(DIALOGS_MODAL_HOOK, MyFrame::OnModalHook)
EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention)
#if wxUSE_NOTIFICATION_MESSAGE
@@ -538,6 +540,7 @@ bool MyApp::OnInit()
menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, wxT("&Standard Buttons Sizer Dialog"));
menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, wxT("&Test dialog default action"));
menuDlg->AppendCheckItem(DIALOGS_MODAL_HOOK, "Enable modal dialog hook");
menuDlg->AppendSeparator();
menuDlg->Append(wxID_EXIT, wxT("E&xit\tAlt-X"));
@@ -2105,6 +2108,32 @@ void MyFrame::OnTestDefaultActionDialog(wxCommandEvent& WXUNUSED(event))
dialog.ShowModal();
}
void MyFrame::OnModalHook(wxCommandEvent& event)
{
class TestModalHook : public wxModalDialogHook
{
protected:
virtual int Enter(wxDialog* dialog)
{
wxLogStatus("Showing %s modal dialog",
dialog->GetClassInfo()->GetClassName());
return wxID_NONE;
}
virtual void Exit(wxDialog* dialog)
{
wxLogStatus("Leaving %s modal dialog",
dialog->GetClassInfo()->GetClassName());
}
};
static TestModalHook s_hook;
if ( event.IsChecked() )
s_hook.Register();
else
s_hook.Unregister();
}
void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
{
Close(true);