Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fix a bad wxFlexGridSizer in Options dialog which caused assert. 

Note: wxWidgets 2.9.4 now throws an assert if you add more rows to a
        wxFlexGridSizer than you specified in its constructor.
This commit is contained in:
Charlie Fenton 2012-10-26 01:36:19 -07:00 committed by Oliver Bock
parent a9ba4c0659
commit 8d0f89813d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -6221,7 +6221,7 @@ Charlie 25 Oct 2012
- Mac: Fix icons in Simple View Task and Project selection combo boxes.
- Mac: Eliminate some unnecessary code.
- Mac: Fix Quit command in Simple View and a crash bug with Quit AppleEvent.
- Fix a bad FlexGridSizer in Simple Preferences dialog which caused assert.
- Fix a bad wxFlexGridSizer in Simple Preferences dialog which caused assert.
- Fix assert in Simple Preferences: use window foreground color for
CTransparentStaticLine if skin does not specify <static_line_color> tag.
- Fix assert in SkinManager when file referenced by <application_logo> tag
@ -6238,6 +6238,10 @@ Charlie 25 Oct 2012
Charlie 25 Oct 2012
- Mac: Work around wxMemoryDC::Clear() bug in drawing Simple View background.
- Fix a bad wxFlexGridSizer in Options dialog which caused assert.
Note: wxWidgets 2.9.4 now throws an assert if you add more rows to a
wxFlexGridSizer than you specified in its constructor.
clientgui/
DlgOptions.cpp
sg_BoincSimpleFrame.cpp

4
clientgui/DlgOptions.cpp
View File

@ -260,7 +260,7 @@ void CDlgOptions::CreateControls() {
itemBoxSizer28->Add(itemStaticBoxSizer30, 0, wxGROW|wxALL, 5);
wxGridSizer* itemGridSizer31 = new wxGridSizer(2, 1, 0, 0);
itemStaticBoxSizer30->Add(itemGridSizer31, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer32 = new wxFlexGridSizer(2, 2, 0, 0);
wxFlexGridSizer* itemFlexGridSizer32 = new wxFlexGridSizer(3, 2, 0, 0);
itemGridSizer31->Add(itemFlexGridSizer32, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText33 = new wxStaticText;
itemStaticText33->Create( itemPanel27, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 );
@ -324,7 +324,7 @@ void CDlgOptions::CreateControls() {
itemBoxSizer44->Add(itemStaticBoxSizer46, 0, wxGROW|wxALL, 5);
wxGridSizer* itemGridSizer47 = new wxGridSizer(2, 1, 0, 0);
itemStaticBoxSizer46->Add(itemGridSizer47, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer48 = new wxFlexGridSizer(2, 2, 0, 0);
wxFlexGridSizer* itemFlexGridSizer48 = new wxFlexGridSizer(3, 2, 0, 0);
itemGridSizer47->Add(itemFlexGridSizer48, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText49 = new wxStaticText;
itemStaticText49->Create( itemPanel43, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 );