minor changes here and there

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-07-02 22:04:57 +00:00
parent 41c3173dde
commit 2e18172773
4 changed files with 73 additions and 49 deletions

View File

@@ -166,24 +166,25 @@ MyFrame::MyFrame(wxWindow *parent,
void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
{
wxColourData data;
data.SetChooseFull(TRUE);
for (int i = 0; i < 16; i++)
{
wxColourData data;
data.SetChooseFull(TRUE);
for (int i = 0; i < 16; i++)
{
wxColour colour(i*16, i*16, i*16);
data.SetCustomColour(i, colour);
}
}
wxColourDialog *dialog = new wxColourDialog(this, &data);
if (dialog->ShowModal() == wxID_OK)
{
wxColourDialog *dialog = new wxColourDialog(this, &data);
dialog->SetTitle("Choose the background colour");
if (dialog->ShowModal() == wxID_OK)
{
wxColourData retData = dialog->GetColourData();
wxColour col = retData.GetColour();
myCanvas->SetBackgroundColour(col);
myCanvas->Clear();
myCanvas->Refresh();
}
dialog->Destroy();
}
dialog->Destroy();
}
void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
@@ -609,6 +610,11 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
m_btnDelete->Disable();
}
else if ( event.GetEventObject() == m_btnFocused )
{
wxGetTextFromUser("Dummy prompt", "Modal dialog called from dialog",
"", this);
}
else
{
event.Skip();