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

test for the bug with showing a modeless dialog from a modal one in wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-02-25 12:33:35 +00:00
parent e549bec483
commit 5315ebfaed
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/dialogs/dialogs.cpp
View File

@@ -923,10 +923,13 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
{ {
wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
m_btnFocused = new wxButton(this, -1, _T("Default button")); m_btnModal = new wxButton(this, -1, _T("&Modal dialog..."));
m_btnModeless = new wxButton(this, -1, _T("Mode&less dialog"));
m_btnDelete = new wxButton(this, -1, _T("&Delete button")); m_btnDelete = new wxButton(this, -1, _T("&Delete button"));
wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close")); wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close"));
sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5);
sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5);
sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);
sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5); sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5);
@@ -936,25 +939,29 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
sizerTop->SetSizeHints(this); sizerTop->SetSizeHints(this);
sizerTop->Fit(this); sizerTop->Fit(this);
m_btnFocused->SetFocus(); m_btnModal->SetFocus();
m_btnFocused->SetDefault(); m_btnModal->SetDefault();
} }
void MyModalDialog::OnButton(wxCommandEvent& event) void MyModalDialog::OnButton(wxCommandEvent& event)
{ {
if ( event.GetEventObject() == m_btnDelete ) if ( event.GetEventObject() == m_btnDelete )
{ {
delete m_btnFocused; delete m_btnModal;
m_btnFocused = NULL; m_btnModal = NULL;
m_btnDelete->Disable(); m_btnDelete->Disable();
} }
else if ( event.GetEventObject() == m_btnFocused ) else if ( event.GetEventObject() == m_btnModal )
{ {
wxGetTextFromUser(_T("Dummy prompt"), wxGetTextFromUser(_T("Dummy prompt"),
_T("Modal dialog called from dialog"), _T("Modal dialog called from dialog"),
_T(""), this); _T(""), this);
} }
else if ( event.GetEventObject() == m_btnModeless )
{
(new MyModelessDialog(this))->Show();
}
else else
{ {
event.Skip(); event.Skip();

5
samples/dialogs/dialogs.h
View File

@@ -44,8 +44,9 @@ public:
void OnButton(wxCommandEvent& event); void OnButton(wxCommandEvent& event);
private: private:
wxButton *m_btnFocused; wxButton *m_btnModal,
wxButton *m_btnDelete; *m_btnModeless,
*m_btnDelete;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };