Fix using wxStaticBoxSizer in samples
If a control is contained in a wxStaticBoxSizer or its child sizer, wxStaticBoxSizer::GetStaticBox() should be used as the control's parent. However, widgets and dialogs samples did not do that, which resulted in flooding the message log in widgets sample with warnings about this; in dialogs sample the warnings were shown in the debug output. Fix this by always using the static box as the control's parent when the control is contained (directly or indirectly) in a wxStaticBoxSizer. Closes #23967.
This commit is contained in:
PB
Vadim Zeitlin
parent
cc41fa5458
commit
a69fabecb1
32 changed files with 657 additions and 567 deletions
|
|
@ -329,90 +329,93 @@ void ODComboboxWidgetsPage::CreateContent()
|
|||
wxSizer *sizerLeft = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// left pane - style box
|
||||
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, "&Set style");
|
||||
wxStaticBoxSizer *sizerStyle = new wxStaticBoxSizer(wxVERTICAL, this, "&Set style");
|
||||
wxStaticBox* const sizerStyleBox = sizerStyle->GetStaticBox();
|
||||
|
||||
wxSizer *sizerStyle = new wxStaticBoxSizer(box, wxVERTICAL);
|
||||
|
||||
m_chkSort = CreateCheckBoxAndAddToSizer(sizerStyle, "&Sort items");
|
||||
m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerStyle, "&Read only");
|
||||
m_chkDclickcycles = CreateCheckBoxAndAddToSizer(sizerStyle, "&Double-click Cycles");
|
||||
m_chkSort = CreateCheckBoxAndAddToSizer(sizerStyle, "&Sort items", wxID_ANY, sizerStyleBox);
|
||||
m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerStyle, "&Read only", wxID_ANY, sizerStyleBox);
|
||||
m_chkDclickcycles = CreateCheckBoxAndAddToSizer(sizerStyle, "&Double-click Cycles", wxID_ANY, sizerStyleBox);
|
||||
|
||||
sizerStyle->AddSpacer(4);
|
||||
|
||||
m_chkBitmapbutton = CreateCheckBoxAndAddToSizer(sizerStyle, "&Bitmap button");
|
||||
m_chkStdbutton = CreateCheckBoxAndAddToSizer(sizerStyle, "B&lank button background");
|
||||
m_chkBitmapbutton = CreateCheckBoxAndAddToSizer(sizerStyle, "&Bitmap button", wxID_ANY, sizerStyleBox);
|
||||
m_chkStdbutton = CreateCheckBoxAndAddToSizer(sizerStyle, "B&lank button background", wxID_ANY, sizerStyleBox);
|
||||
|
||||
wxButton *btn = new wxButton(this, ODComboPage_Reset, "&Reset");
|
||||
wxButton *btn = new wxButton(sizerStyleBox, ODComboPage_Reset, "&Reset");
|
||||
sizerStyle->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 3);
|
||||
|
||||
sizerLeft->Add(sizerStyle, wxSizerFlags().Expand());
|
||||
|
||||
// left pane - popup adjustment box
|
||||
box = new wxStaticBox(this, wxID_ANY, "Adjust &popup");
|
||||
|
||||
wxSizer *sizerPopupPos = new wxStaticBoxSizer(box, wxVERTICAL);
|
||||
wxStaticBoxSizer *sizerPopupPos = new wxStaticBoxSizer(wxVERTICAL, this, "Adjust &popup");
|
||||
wxStaticBox* const sizerPopupPosBox = sizerPopupPos->GetStaticBox();
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Min. Width:",
|
||||
ODComboPage_PopupMinWidth,
|
||||
&m_textPopupMinWidth);
|
||||
&m_textPopupMinWidth,
|
||||
sizerPopupPosBox);
|
||||
m_textPopupMinWidth->SetValue("-1");
|
||||
sizerPopupPos->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Max. Height:",
|
||||
ODComboPage_PopupHeight,
|
||||
&m_textPopupHeight);
|
||||
&m_textPopupHeight,
|
||||
sizerPopupPosBox);
|
||||
m_textPopupHeight->SetValue("-1");
|
||||
sizerPopupPos->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
m_chkAlignpopupright = CreateCheckBoxAndAddToSizer(sizerPopupPos, "Align Right");
|
||||
m_chkAlignpopupright = CreateCheckBoxAndAddToSizer(sizerPopupPos, "Align Right", wxID_ANY, sizerPopupPosBox);
|
||||
|
||||
sizerLeft->Add(sizerPopupPos, wxSizerFlags().Expand().Border(wxTOP, 2));
|
||||
|
||||
// left pane - button adjustment box
|
||||
box = new wxStaticBox(this, wxID_ANY, "Adjust &button");
|
||||
|
||||
wxSizer *sizerButtonPos = new wxStaticBoxSizer(box, wxVERTICAL);
|
||||
wxStaticBoxSizer *sizerButtonPos = new wxStaticBoxSizer(wxVERTICAL, this, "Adjust &button");
|
||||
wxStaticBox* const sizerButtonPosBox = sizerButtonPos->GetStaticBox();
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Width:",
|
||||
ODComboPage_ButtonWidth,
|
||||
&m_textButtonWidth);
|
||||
&m_textButtonWidth,
|
||||
sizerButtonPosBox);
|
||||
m_textButtonWidth->SetValue("-1");
|
||||
sizerButtonPos->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("VSpacing:",
|
||||
ODComboPage_ButtonSpacing,
|
||||
&m_textButtonSpacing);
|
||||
&m_textButtonSpacing,
|
||||
sizerButtonPosBox);
|
||||
m_textButtonSpacing->SetValue("0");
|
||||
sizerButtonPos->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Height:",
|
||||
ODComboPage_ButtonHeight,
|
||||
&m_textButtonHeight);
|
||||
&m_textButtonHeight,
|
||||
sizerButtonPosBox);
|
||||
m_textButtonHeight->SetValue("-1");
|
||||
sizerButtonPos->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
m_chkAlignbutleft = CreateCheckBoxAndAddToSizer(sizerButtonPos, "Align Left");
|
||||
m_chkAlignbutleft = CreateCheckBoxAndAddToSizer(sizerButtonPos, "Align Left", wxID_ANY, sizerButtonPosBox);
|
||||
|
||||
sizerLeft->Add(sizerButtonPos, wxSizerFlags().Expand().Border(wxTOP, 2));
|
||||
|
||||
// middle pane
|
||||
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
|
||||
"&Change combobox contents");
|
||||
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
|
||||
wxStaticBoxSizer *sizerMiddle = new wxStaticBoxSizer(wxVERTICAL, this, "&Change combobox contents");
|
||||
wxStaticBox* const sizerMiddleBox = sizerMiddle->GetStaticBox();
|
||||
|
||||
btn = new wxButton(this, ODComboPage_ContainerTests, "Run &tests");
|
||||
btn = new wxButton(sizerMiddleBox, ODComboPage_ContainerTests, "Run &tests");
|
||||
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Current selection",
|
||||
ODComboPage_CurText,
|
||||
&text);
|
||||
&text,
|
||||
sizerMiddleBox);
|
||||
text->SetEditable(false);
|
||||
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndLabel("Insertion Point",
|
||||
ODComboPage_InsertionPointText,
|
||||
&text);
|
||||
&text,
|
||||
sizerMiddleBox);
|
||||
text->SetEditable(false);
|
||||
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
|
@ -420,37 +423,41 @@ void ODComboboxWidgetsPage::CreateContent()
|
|||
sizerRow = CreateSizerWithTextAndButton(ODComboPage_Insert,
|
||||
"&Insert this string",
|
||||
ODComboPage_InsertText,
|
||||
&m_textInsert);
|
||||
&m_textInsert,
|
||||
sizerMiddleBox);
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndButton(ODComboPage_Add,
|
||||
"&Add this string",
|
||||
ODComboPage_AddText,
|
||||
&m_textAdd);
|
||||
&m_textAdd,
|
||||
sizerMiddleBox);
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
btn = new wxButton(this, ODComboPage_AddSeveral, "&Append a few strings");
|
||||
btn = new wxButton(sizerMiddleBox, ODComboPage_AddSeveral, "&Append a few strings");
|
||||
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
|
||||
|
||||
btn = new wxButton(this, ODComboPage_AddMany, "Append &many strings");
|
||||
btn = new wxButton(sizerMiddleBox, ODComboPage_AddMany, "Append &many strings");
|
||||
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndButton(ODComboPage_Change,
|
||||
"C&hange current",
|
||||
ODComboPage_ChangeText,
|
||||
&m_textChange);
|
||||
&m_textChange,
|
||||
sizerMiddleBox);
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
sizerRow = CreateSizerWithTextAndButton(ODComboPage_Delete,
|
||||
"&Delete this item",
|
||||
ODComboPage_DeleteText,
|
||||
&m_textDelete);
|
||||
&m_textDelete,
|
||||
sizerMiddleBox);
|
||||
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
|
||||
|
||||
btn = new wxButton(this, ODComboPage_DeleteSel, "Delete &selection");
|
||||
btn = new wxButton(sizerMiddleBox, ODComboPage_DeleteSel, "Delete &selection");
|
||||
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
|
||||
|
||||
btn = new wxButton(this, ODComboPage_Clear, "&Clear");
|
||||
btn = new wxButton(sizerMiddleBox, ODComboPage_Clear, "&Clear");
|
||||
sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
|
||||
|
||||
// right pane
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue