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

Decrease the size of the message box test dialog in the sample.

Browse Source 
This dialog was getting too tall, especially in the rich message boxes case,
so reduce its vertical size.

Also centre it on screen to prevent it from being displayed partially off it
because contents was added to the dialog after creating it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-02 22:39:06 +00:00
parent ec7d7f6356
commit cb2de3b400
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/dialogs/dialogs.cpp
View File

@@ -3018,7 +3018,7 @@ bool TestMessageBoxDialog::Create()
m_textExtMsg = new wxTextCtrl(this, wxID_ANY, "", m_textExtMsg = new wxTextCtrl(this, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE); wxTE_MULTILINE);
sizerMsgs->Add(m_textExtMsg, wxSizerFlags(1).Expand()); sizerMsgs->Add(m_textExtMsg, wxSizerFlags().Expand());
sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border()); sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border());
@@ -3041,7 +3041,7 @@ bool TestMessageBoxDialog::Create()
sizerBtns->Add(m_buttons[n], wxSizerFlags().Centre().Left()); sizerBtns->Add(m_buttons[n], wxSizerFlags().Centre().Left());
m_labels[n] = new wxTextCtrl(this, wxID_ANY); m_labels[n] = new wxTextCtrl(this, wxID_ANY);
sizerBtns->Add(m_labels[n], wxSizerFlags(1).Centre().Expand()); sizerBtns->Add(m_labels[n], wxSizerFlags().Centre().Expand());
m_labels[n]->Connect(wxEVT_UPDATE_UI, m_labels[n]->Connect(wxEVT_UPDATE_UI,
wxUpdateUIEventHandler( wxUpdateUIEventHandler(
@@ -3050,7 +3050,7 @@ bool TestMessageBoxDialog::Create()
this); this);
} }
sizerBtnsBox->Add(sizerBtns, wxSizerFlags(1).Expand()); sizerBtnsBox->Add(sizerBtns, wxSizerFlags().Expand());
sizerTop->Add(sizerBtnsBox, wxSizerFlags().Expand().Border()); sizerTop->Add(sizerBtnsBox, wxSizerFlags().Expand().Border());
@@ -3087,10 +3087,10 @@ bool TestMessageBoxDialog::Create()
TestMessageBoxDialog::OnUpdateNoDefaultUI), TestMessageBoxDialog::OnUpdateNoDefaultUI),
NULL, NULL,
this); this);
sizerFlags->Add(m_chkNoDefault, wxSizerFlags(1).Border()); sizerFlags->Add(m_chkNoDefault, wxSizerFlags().Border());
m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent"); m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent");
sizerFlags->Add(m_chkCentre, wxSizerFlags(1).Border()); sizerFlags->Add(m_chkCentre, wxSizerFlags().Border());
// add any additional flag from subclasses // add any additional flag from subclasses
AddAdditionalFlags(sizerFlags); AddAdditionalFlags(sizerFlags);
@@ -3105,6 +3105,8 @@ bool TestMessageBoxDialog::Create()
m_buttons[Btn_Ok]->SetValue(true); m_buttons[Btn_Ok]->SetValue(true);
CentreOnScreen();
return true; return true;
} }
@@ -3281,21 +3283,21 @@ void TestRichMessageDialog::AddAdditionalTextOptions(wxSizer *sizer)
"&Additional Elements"); "&Additional Elements");
// add a option to show a check box. // add a option to show a check box.
wxFlexGridSizer * const sizerCheckBox = new wxFlexGridSizer(2, 5, 5); wxSizer * const sizerCheckBox = new wxBoxSizer(wxHORIZONTAL);
sizerCheckBox->AddGrowableCol(1); sizerCheckBox->Add(new wxStaticText(this, wxID_ANY, "&Check box:"),
sizerCheckBox->Add(new wxStaticText(this, wxID_ANY, "&Check box:")); wxSizerFlags().Centre().Border(wxRIGHT));
m_textCheckBox = new wxTextCtrl(this, wxID_ANY); m_textCheckBox = new wxTextCtrl(this, wxID_ANY);
sizerCheckBox->Add(m_textCheckBox, wxSizerFlags(1).Expand().Border(wxBOTTOM)); sizerCheckBox->Add(m_textCheckBox, wxSizerFlags(1).Centre());
sizerMsgs->Add(sizerCheckBox, wxSizerFlags(1).Expand()); sizerMsgs->Add(sizerCheckBox, wxSizerFlags().Expand().Border(wxBOTTOM));
// add option to show a detailed text. // add option to show a detailed text.
sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Detailed message:")); sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Detailed message:"));
m_textDetailed = new wxTextCtrl(this, wxID_ANY, "", m_textDetailed = new wxTextCtrl(this, wxID_ANY, "",
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE); wxTE_MULTILINE);
sizerMsgs->Add(m_textDetailed, wxSizerFlags(1).Expand()); sizerMsgs->Add(m_textDetailed, wxSizerFlags().Expand());
sizer->Add(sizerMsgs, wxSizerFlags(1).Expand().Border()); sizer->Add(sizerMsgs, wxSizerFlags().Expand().Border());
} }
void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer) void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer)
@@ -3304,7 +3306,7 @@ void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer)
// in the dialog. // in the dialog.
m_initialValueCheckBox = m_initialValueCheckBox =
new wxCheckBox(this, wxID_ANY, "Checkbox initially checked"); new wxCheckBox(this, wxID_ANY, "Checkbox initially checked");
sizer->Add(m_initialValueCheckBox, wxSizerFlags(1).Border()); sizer->Add(m_initialValueCheckBox, wxSizerFlags().Border());
} }
void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event)) void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event))