added tests for centering dialogs on screen/parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -154,6 +154,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
|||||||
#if USE_MODAL_PRESENTATION
|
#if USE_MODAL_PRESENTATION
|
||||||
EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg)
|
EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg)
|
||||||
EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg)
|
EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg)
|
||||||
|
EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen)
|
||||||
|
EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent)
|
||||||
#endif // USE_MODAL
|
#endif // USE_MODAL
|
||||||
|
|
||||||
#if wxUSE_STARTUP_TIPS
|
#if wxUSE_STARTUP_TIPS
|
||||||
@@ -353,10 +355,12 @@ bool MyApp::OnInit()
|
|||||||
#endif // wxUSE_FINDREPLDLG
|
#endif // wxUSE_FINDREPLDLG
|
||||||
|
|
||||||
#if USE_MODAL_PRESENTATION
|
#if USE_MODAL_PRESENTATION
|
||||||
wxMenu *modal_menu = new wxMenu;
|
wxMenu *dialogs_menu = new wxMenu;
|
||||||
modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
|
dialogs_menu->Append(DIALOGS_MODAL, _T("&Modal dialog\tCtrl-W"));
|
||||||
modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"));
|
dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z"));
|
||||||
file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu);
|
dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1"));
|
||||||
|
dialogs_menu->AppendCheckItem(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2"));
|
||||||
|
file_menu->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu);
|
||||||
#endif // USE_MODAL_PRESENTATION
|
#endif // USE_MODAL_PRESENTATION
|
||||||
|
|
||||||
#if USE_SETTINGS_DIALOG
|
#if USE_SETTINGS_DIALOG
|
||||||
@@ -942,6 +946,25 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
|
|||||||
m_dialog->Hide();
|
m_dialog->Hide();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event))
|
||||||
|
{
|
||||||
|
wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"),
|
||||||
|
wxDefaultPosition, wxSize(200, 100));
|
||||||
|
new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10));
|
||||||
|
dlg.CentreOnScreen();
|
||||||
|
dlg.ShowModal();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
|
||||||
|
{
|
||||||
|
wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"),
|
||||||
|
wxDefaultPosition, wxSize(200, 100));
|
||||||
|
new wxButton(&dlg, wxID_OK, _T("Close"), wxPoint(10, 10));
|
||||||
|
dlg.CentreOnParent();
|
||||||
|
dlg.ShowModal();
|
||||||
|
}
|
||||||
|
|
||||||
#endif // USE_MODAL_PRESENTATION
|
#endif // USE_MODAL_PRESENTATION
|
||||||
|
|
||||||
#if wxUSE_STARTUP_TIPS
|
#if wxUSE_STARTUP_TIPS
|
||||||
|
@@ -231,6 +231,8 @@ public:
|
|||||||
#if USE_MODAL_PRESENTATION
|
#if USE_MODAL_PRESENTATION
|
||||||
void ModalDlg(wxCommandEvent& event);
|
void ModalDlg(wxCommandEvent& event);
|
||||||
void ModelessDlg(wxCommandEvent& event);
|
void ModelessDlg(wxCommandEvent& event);
|
||||||
|
void DlgCenteredScreen(wxCommandEvent& event);
|
||||||
|
void DlgCenteredParent(wxCommandEvent& event);
|
||||||
#endif // USE_MODAL_PRESENTATION
|
#endif // USE_MODAL_PRESENTATION
|
||||||
|
|
||||||
#if wxUSE_PROGRESSDLG
|
#if wxUSE_PROGRESSDLG
|
||||||
@@ -320,6 +322,8 @@ enum
|
|||||||
DIALOGS_LOG_DIALOG,
|
DIALOGS_LOG_DIALOG,
|
||||||
DIALOGS_MODAL,
|
DIALOGS_MODAL,
|
||||||
DIALOGS_MODELESS,
|
DIALOGS_MODELESS,
|
||||||
|
DIALOGS_CENTRE_SCREEN,
|
||||||
|
DIALOGS_CENTRE_PARENT,
|
||||||
DIALOGS_MODELESS_BTN,
|
DIALOGS_MODELESS_BTN,
|
||||||
DIALOGS_PROGRESS,
|
DIALOGS_PROGRESS,
|
||||||
DIALOGS_BUSYINFO,
|
DIALOGS_BUSYINFO,
|
||||||
|
Reference in New Issue
Block a user