AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use wxALIGN_CENTRE_VERTICAL flags when adding item to the vertical sizer in wxPG.

Browse Source 
This flag shouldn't be used in vertical sizers (in wxLongStringProperty and wxPGArrayEditorDialog) because vertical alignment flags are ignored in such sizers and the assertion message is thrown in wxBoxSizer::DoInsert. This can be observed e.g. in propgrid sample when there is launched wxLongStringProperty or ArrayDoubleProperty editor.
This commit is contained in:
Artur Wieczorek 2015-05-29 20:56:42 +02:00
parent ee0536f964
commit a210cb0bbf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/propgrid/props.cpp
View File

@ -2256,7 +2256,7 @@ bool wxLongStringProperty::DisplayEditorDialog( wxPGProperty* prop, wxPropertyGr
buttonSizer->AddButton(new wxButton(dlg, wxID_CANCEL));
buttonSizer->Realize();
topsizer->Add( buttonSizer, 0,
wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxRIGHT,
wxALIGN_RIGHT|wxBOTTOM|wxRIGHT,
spacing );
dlg->SetSizer( topsizer );
@ -2396,7 +2396,7 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent,
// Message
if ( !message.empty() )
topsizer->Add( new wxStaticText(this,-1,message),
0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing );
0, wxALIGN_LEFT|wxALL, spacing );
m_elb = new wxEditableListBox(this, wxID_ANY, message,
wxDefaultPosition,
@ -2452,7 +2452,7 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent,
buttonSizer->AddButton(new wxButton(this, wxID_CANCEL));
buttonSizer->Realize();
topsizer->Add( buttonSizer, 0,
wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL,
wxALIGN_RIGHT|wxALL,
spacing );
m_elb->SetFocus();