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

Better conditions within dialogs sample.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-06-21 10:31:39 +00:00
parent 9d701f0ebf
commit b4954d198e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/dialogs/dialogs.cpp
View File

@ -480,6 +480,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
}
#endif // USE_FONTDLG_GENERIC
#if wxUSE_LOG_DIALOG
void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
{
// calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
@ -501,6 +502,7 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
wxLogMessage(wxT("And this is the same dialog but with only one message."));
}
#endif // wxUSE_LOG_DIALOG
void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
{
@ -576,8 +578,7 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
if (dialog.ShowModal() == wxID_OK)
{
wxMessageDialog dialog2(this, dialog.GetValue(), _T("Got string"));
dialog2.ShowModal();
wxMessageBox(dialog.GetValue(), _T("Got string"), wxOK | wxICON_INFORMATION, this);
}
}
#endif // wxUSE_TEXTDLG
@ -1137,6 +1138,8 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
dc.DrawText(_T("wxWidgets common dialogs test application"), 10, 10);
}
#if USE_MODAL_PRESENTATION
// ----------------------------------------------------------------------------
// MyModelessDialog
// ----------------------------------------------------------------------------
@ -1233,3 +1236,6 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
event.Skip();
}
}
#endif // USE_MODAL_PRESENTATION

4
samples/dialogs/dialogs.h
View File

@ -54,6 +54,8 @@ public:
wxColour m_canvasTextColour;
};
#if USE_MODAL_PRESENTATION
// A custom modeless dialog
class MyModelessDialog : public wxDialog
{
@ -83,6 +85,8 @@ private:
DECLARE_EVENT_TABLE()
};
#endif // USE_MODAL_PRESENTATION
// Define a new frame type
class MyFrame: public wxFrame
{