mirror of https://github.com/BOINC/boinc.git
Handle string conversion at compile time instead of run time.
svn path=/trunk/boinc/; revision=23833
This commit is contained in:
parent
62efafbb26
commit
ae2d0837f2
|
@ -150,7 +150,6 @@ bool CProjectInfoPage::Create( CBOINCBaseWizard* parent )
|
|||
m_pProjectsStaticCtrl = NULL;
|
||||
m_pProjectsCtrl = NULL;
|
||||
m_pProjectDetailsStaticCtrl = NULL;
|
||||
m_pProjectDetailsDescriptionStaticCtrl = NULL;
|
||||
m_pProjectDetailsDescriptionCtrl = NULL;
|
||||
m_pProjectDetailsResearchAreaStaticCtrl = NULL;
|
||||
m_pProjectDetailsResearchAreaCtrl = NULL;
|
||||
|
@ -252,11 +251,6 @@ void CProjectInfoPage::CreateControls()
|
|||
wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(m_pProjectDetailsStaticCtrl, wxVERTICAL);
|
||||
itemFlexGridSizer6->Add(itemStaticBoxSizer13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
|
||||
#if 0
|
||||
m_pProjectDetailsDescriptionStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
itemStaticBoxSizer13->Add(m_pProjectDetailsDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5);
|
||||
#endif
|
||||
|
||||
m_pProjectDetailsDescriptionCtrl = new wxHtmlWindow( itemWizardPage23, ID_PROJECTDESCRIPTION, wxDefaultPosition, wxSize(DESCRIPTIONSWIDTH, 100), wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION );
|
||||
itemStaticBoxSizer13->Add(m_pProjectDetailsDescriptionCtrl, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
|
||||
|
||||
|
@ -489,7 +483,7 @@ void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) {
|
|||
|
||||
// Populate the project details area
|
||||
#ifdef _WIN32
|
||||
wxString desc = wxString("<font size=-2>", wxConvUTF8)+pProjectInfo->m_strDescription+wxString("</font>", wxConvUTF8);
|
||||
wxString desc = wxT("<font size=-2>") + pProjectInfo->m_strDescription + wxT("</font>");
|
||||
#else
|
||||
wxString desc = pProjectInfo->m_strDescription;
|
||||
#endif
|
||||
|
@ -561,7 +555,6 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
|
|||
wxASSERT(m_pProjectsStaticCtrl);
|
||||
wxASSERT(m_pProjectsCtrl);
|
||||
wxASSERT(m_pProjectDetailsStaticCtrl);
|
||||
// wxASSERT(m_pProjectDetailsDescriptionStaticCtrl);
|
||||
wxASSERT(m_pProjectDetailsDescriptionCtrl);
|
||||
wxASSERT(m_pProjectDetailsResearchAreaStaticCtrl);
|
||||
wxASSERT(m_pProjectDetailsResearchAreaCtrl);
|
||||
|
@ -599,11 +592,6 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
|
|||
_("Project details")
|
||||
);
|
||||
|
||||
#if 0
|
||||
m_pProjectDetailsDescriptionStaticCtrl->SetLabel(
|
||||
_("Description:")
|
||||
);
|
||||
#endif
|
||||
m_pProjectDetailsResearchAreaStaticCtrl->SetLabel(
|
||||
_("Research area:")
|
||||
);
|
||||
|
|
|
@ -115,7 +115,6 @@ public:
|
|||
wxStaticText* m_pProjectsStaticCtrl;
|
||||
wxListBox* m_pProjectsCtrl;
|
||||
wxStaticBox* m_pProjectDetailsStaticCtrl;
|
||||
wxStaticText* m_pProjectDetailsDescriptionStaticCtrl;
|
||||
wxHtmlWindow* m_pProjectDetailsDescriptionCtrl;
|
||||
wxStaticText* m_pProjectDetailsResearchAreaStaticCtrl;
|
||||
wxStaticText* m_pProjectDetailsResearchAreaCtrl;
|
||||
|
|
Loading…
Reference in New Issue