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

*** empty log message *** 

svn path=/trunk/boinc/; revision=10744
This commit is contained in:
Rom Walton 2006-07-25 07:33:09 +00:00
parent d5f92bd751
commit 53cebac30c
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -7957,3 +7957,10 @@ Charlie 24 July 2006
clientgui/res/
macsnoozebadge.xpm (Added)
macdisconnectbadge.xpm (Added)
Rom 25 July 2006
- Bug Fix: Mac compiler handles std::string a little differently than Windows.
clientgui/
sg_ViewTabPage.cpp
ViewWork.cpp

9
clientgui/ViewWork.cpp
View File

@ -224,13 +224,16 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) {
if (wxYES == iAnswer) {
RESULT* result = pDoc->result(m_pListPane->GetFirstSelected());
std::string strDefaultWindowStation = std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str());
std::string strDefaultDesktop = std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str());
std::string strDefaultDisplay = std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str());
pDoc->WorkShowGraphics(
result->project_url,
result->name,
MODE_WINDOW,
std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str()),
std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str()),
std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str())
strDefaultWindowStation,
strDefaultDesktop,
strDefaultDisplay
);
}

11
clientgui/sg_ViewTabPage.cpp
View File

@ -340,13 +340,16 @@ void CViewTabPage::OnWorkShowGraphics() {
#endif
if (wxYES == iAnswer) {
pDoc->WorkShowGraphics(
std::string strDefaultWindowStation = std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str());
std::string strDefaultDesktop = std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str());
std::string strDefaultDisplay = std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str());
pDoc->WorkShowGraphics(
m_prjUrl,
m_name,
MODE_WINDOW,
std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str()),
std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str()),
std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str())
strDefaultWindowStation,
strDefaultDesktop,
strDefaultDisplay
);
}