From 6f3899e14ebe8efebb60e6884957642816e561ff Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Thu, 25 Oct 2012 06:08:51 -0700 Subject: [PATCH] Fix a bad FlexGridSizer in Simple Preferences dialog which caused assert --- checkin_notes | 2 ++ clientgui/sg_DlgPreferences.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index bb4477781c..f32c102ec9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6221,6 +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. clientgui/ BOINCGUIApp.cpp @@ -6228,3 +6229,4 @@ Charlie 25 Oct 2012 mac/ MacBitmapComboBox.cpp,.h sg_CustomControls.cpp,.h + sg_DlgPreferences.cpp \ No newline at end of file diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp index e1e018985f..52cf111c2b 100644 --- a/clientgui/sg_DlgPreferences.cpp +++ b/clientgui/sg_DlgPreferences.cpp @@ -276,7 +276,7 @@ void CPanelPreferences::CreateControls() wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); itemDialog1->SetSizer(itemBoxSizer2); - wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(1, 1, 0, 0); + wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(1, 0, 0); itemBoxSizer2->Add(itemFlexGridSizer3, 0, wxGROW|wxALL, 5); CTransparentStaticText* itemStaticText4 = new CTransparentStaticText( itemDialog1, wxID_ANY, _("This dialog controls preferences for this computer only."), wxDefaultPosition, wxDefaultSize, 0 );