diff --git a/checkin_notes b/checkin_notes
index 6766b31ffd..3d6b972202 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -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
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 81bb646063..7e8ef5cd16 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -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
         );
     }
 
diff --git a/clientgui/sg_ViewTabPage.cpp b/clientgui/sg_ViewTabPage.cpp
index 9ca7bc04b1..83c5efdd96 100644
--- a/clientgui/sg_ViewTabPage.cpp
+++ b/clientgui/sg_ViewTabPage.cpp
@@ -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
         );
     }