fix dialog layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7e86b10b7b
commit
e01ea38b49
@ -176,8 +176,9 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
|
|||||||
const wxPoint& pos, const wxSize& size, const long WXUNUSED(style) ) :
|
const wxPoint& pos, const wxSize& size, const long WXUNUSED(style) ) :
|
||||||
wxDialog(parent, VALIDATE_DIALOG_ID, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
|
wxDialog(parent, VALIDATE_DIALOG_ID, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
|
||||||
{
|
{
|
||||||
// Sizers automatically ensure a workable layout.
|
// setup the flex grid sizer
|
||||||
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
|
// -------------------------
|
||||||
|
|
||||||
wxFlexGridSizer *flexgridsizer = new wxFlexGridSizer(2, 2, 5, 5);
|
wxFlexGridSizer *flexgridsizer = new wxFlexGridSizer(2, 2, 5, 5);
|
||||||
|
|
||||||
// Create and add controls to sizers. Note that a member variable
|
// Create and add controls to sizers. Note that a member variable
|
||||||
@ -188,8 +189,8 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
|
|||||||
// Pointers to some of these controls are saved in member variables
|
// Pointers to some of these controls are saved in member variables
|
||||||
// so that we can use them elsewhere, like this one.
|
// so that we can use them elsewhere, like this one.
|
||||||
text = new wxTextCtrl(this, VALIDATE_TEXT, wxEmptyString,
|
text = new wxTextCtrl(this, VALIDATE_TEXT, wxEmptyString,
|
||||||
wxPoint(10, 10), wxSize(120, wxDefaultCoord), 0,
|
wxPoint(10, 10), wxSize(120, wxDefaultCoord), 0,
|
||||||
wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
|
wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
|
||||||
flexgridsizer->Add(text);
|
flexgridsizer->Add(text);
|
||||||
|
|
||||||
// This wxCheckBox* doesn't need to be assigned to any pointer
|
// This wxCheckBox* doesn't need to be assigned to any pointer
|
||||||
@ -197,36 +198,44 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
|
|||||||
// We don't need any such pointer to query its state, which
|
// We don't need any such pointer to query its state, which
|
||||||
// can be gotten directly from g_data.
|
// can be gotten directly from g_data.
|
||||||
flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, wxT("Sample checkbox"),
|
flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, wxT("Sample checkbox"),
|
||||||
wxPoint(130, 10), wxSize(120, wxDefaultCoord), 0,
|
wxPoint(130, 10), wxSize(120, wxDefaultCoord), 0,
|
||||||
wxGenericValidator(&g_data.m_checkbox_state)));
|
wxGenericValidator(&g_data.m_checkbox_state)));
|
||||||
|
|
||||||
flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,
|
flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,
|
||||||
wxPoint(10, 30), wxSize(120, wxDefaultCoord),
|
wxPoint(10, 30), wxSize(120, wxDefaultCoord),
|
||||||
3, g_listbox_choices, wxLB_MULTIPLE,
|
3, g_listbox_choices, wxLB_MULTIPLE,
|
||||||
wxGenericValidator(&g_data.m_listbox_choices)));
|
wxGenericValidator(&g_data.m_listbox_choices)));
|
||||||
|
|
||||||
combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, wxEmptyString,
|
combobox = new wxComboBox((wxWindow*)this, VALIDATE_COMBO, wxEmptyString,
|
||||||
wxPoint(130, 30), wxSize(120, wxDefaultCoord),
|
wxPoint(130, 30), wxSize(120, wxDefaultCoord),
|
||||||
3, g_combobox_choices, 0L,
|
3, g_combobox_choices, 0L,
|
||||||
wxGenericValidator(&g_data.m_combobox_choice));
|
wxGenericValidator(&g_data.m_combobox_choice));
|
||||||
flexgridsizer->Add(combobox);
|
flexgridsizer->Add(combobox);
|
||||||
|
|
||||||
|
|
||||||
|
// setup the button sizer
|
||||||
|
// ----------------------
|
||||||
|
|
||||||
|
wxStdDialogButtonSizer *btn = new wxStdDialogButtonSizer();
|
||||||
|
btn->AddButton(new wxButton(this, wxID_OK));
|
||||||
|
btn->AddButton(new wxButton(this, wxID_CANCEL));
|
||||||
|
btn->Realize();
|
||||||
|
|
||||||
|
|
||||||
|
// setup the main sizer
|
||||||
|
// --------------------
|
||||||
|
|
||||||
|
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
|
mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
|
||||||
|
|
||||||
mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
|
mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
|
||||||
wxPoint(10, 100), wxDefaultSize,
|
wxPoint(10, 100), wxDefaultSize,
|
||||||
3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
|
3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
|
||||||
wxGenericValidator(&g_data.m_radiobox_choice)),
|
wxGenericValidator(&g_data.m_radiobox_choice)),
|
||||||
0, wxGROW | wxALL, 10);
|
0, wxGROW | wxALL, 10);
|
||||||
|
|
||||||
wxGridSizer *gridsizer = new wxGridSizer(2, 2, 5, 5);
|
mainsizer->Add(btn, 0, wxGROW | wxALL, 10);
|
||||||
|
|
||||||
wxButton *ok_button = new wxButton(this, wxID_OK, wxT("OK"), wxPoint(250, 70), wxSize(80, 30));
|
|
||||||
ok_button->SetDefault();
|
|
||||||
gridsizer->Add(ok_button);
|
|
||||||
gridsizer->Add(new wxButton(this, wxID_CANCEL, wxT("Cancel"), wxPoint(250, 100), wxSize(80, 30)));
|
|
||||||
|
|
||||||
mainsizer->Add(gridsizer, 0, wxGROW | wxALL, 10);
|
|
||||||
|
|
||||||
SetSizer(mainsizer);
|
SetSizer(mainsizer);
|
||||||
mainsizer->SetSizeHints(this);
|
mainsizer->SetSizeHints(this);
|
||||||
|
Loading…
Reference in New Issue
Block a user