diff --git a/checkin_notes b/checkin_notes index 7c124f7776..ad3a256622 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2296,3 +2296,9 @@ Rom 9 Mar 2007 WizardAccountManager.cpp WizardAttachProject.cpp wizardex.cpp, .h + +Rom 9 Mar 2007 + - MGR: Fix a segfault on Linux. + + clientgui/ + ProjectInfoPage.cpp, .h diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp index c7911bb6a1..150b1f9c1d 100644 --- a/clientgui/ProjectInfoPage.cpp +++ b/clientgui/ProjectInfoPage.cpp @@ -287,14 +287,14 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) { // pDoc->rpc.get_project_list(pl); for (i=0; iAppend(ConstructProjectTitle(i)); + m_pProjectSelectionCtrl->Append(wxString(pl.projects[i]->name.c_str(), wxConvUTF8)); } m_pProjectSelectionCtrl->Append(_("Other")); Fit(); m_pProjectSelectionCtrl->SetValue( - ConstructProjectTitle(0) + ConstructProjectTitle(wxString(pl.projects[0]->name.c_str(), wxConvUTF8)) ); m_pProjectSelectionDescriptionStaticCtrl->SetLabel( wxString(pl.projects[0]->description.c_str(), wxConvUTF8) @@ -356,17 +356,3 @@ void CProjectInfoPage::OnCancel( wxWizardExEvent& event ) { PROCESS_CANCELEVENT(event); } - -/*! - * Construct what the string should look like for a project in the - * drop down combo box. - */ - -wxString CProjectInfoPage::ConstructProjectTitle( int iIndex ) { - wxString strReturnValue; - - strReturnValue = wxString(pl.projects[iIndex]->name.c_str(), wxConvUTF8); - - return strReturnValue; -} - diff --git a/clientgui/ProjectInfoPage.h b/clientgui/ProjectInfoPage.h index 265dc171a9..4cfda9ba01 100644 --- a/clientgui/ProjectInfoPage.h +++ b/clientgui/ProjectInfoPage.h @@ -82,9 +82,6 @@ public: /// Should we show tooltips? static bool ShowToolTips(); - /// Construct project title - wxString ConstructProjectTitle( int iIndex ); - ////@begin CProjectInfoPage member variables wxStaticText* m_pTitleStaticCtrl; wxStaticText* m_pDescriptionStaticCtrl;