*** empty log message ***

svn path=/trunk/boinc/; revision=7746

clientgui/BOINCBaseView.cpp

@@ -105,8 +105,9 @@ CBOINCBaseView::~CBOINCBaseView() {}
 // The user friendly name of the view.
 //   If it has not been defined by the view "Undefined" is returned.
 //
-wxString CBOINCBaseView::GetViewName() {
-    return wxString(wxT("Undefined"));
+wxString& CBOINCBaseView::GetViewName() {
+    static wxString strViewName(wxT("Undefined"));
+    return strViewName;
 }
 
 

clientgui/BOINCBaseView.h

@@ -90,7 +90,7 @@ public:
 
     ~CBOINCBaseView();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
     bool                    FireOnSaveState( wxConfigBase* pConfig );

clientgui/ViewMessages.cpp

@@ -120,7 +120,7 @@ CViewMessages::~CViewMessages() {
 }
 
 
-wxString CViewMessages::GetViewName() {
+wxString& CViewMessages::GetViewName() {
     static wxString strViewName(_("Messages"));
     return strViewName;
 }

clientgui/ViewMessages.h

@@ -38,7 +38,7 @@ public:
 
     ~CViewMessages();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
     void                    OnMessagesCopyAll( wxCommandEvent& event );

clientgui/ViewProjects.cpp

@@ -189,7 +189,7 @@ CViewProjects::~CViewProjects() {
 }
 
 
-wxString CViewProjects::GetViewName() {
+wxString& CViewProjects::GetViewName() {
     static wxString strViewName(_("Projects"));
     return strViewName;
 }

clientgui/ViewProjects.h

@@ -54,7 +54,7 @@ public:
 
     ~CViewProjects();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
     void                    OnProjectUpdate( wxCommandEvent& event );

clientgui/ViewResources.cpp

@@ -86,7 +86,7 @@ CViewResources::~CViewResources() {
 }
 
 
-wxString CViewResources::GetViewName() {
+wxString& CViewResources::GetViewName() {
     static wxString strViewName(_("Disk"));
     return strViewName;
 }

clientgui/ViewResources.h

@@ -49,7 +49,7 @@ public:
 
     ~CViewResources();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
 protected:

clientgui/ViewStatistics.cpp

@@ -356,7 +356,7 @@ CViewStatistics::~CViewStatistics() {
 }
 
 
-wxString CViewStatistics::GetViewName() {
+wxString& CViewStatistics::GetViewName() {
     static wxString strViewName(_("Statistics"));
     return strViewName;
 }

clientgui/ViewStatistics.h

@@ -53,7 +53,7 @@ public:
 
     ~CViewStatistics();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
 
     void                    OnStatisticsUserTotal( wxCommandEvent& event );
     void                    OnStatisticsUserAverage( wxCommandEvent& event );

clientgui/ViewTransfers.cpp

@@ -130,7 +130,7 @@ CViewTransfers::~CViewTransfers() {
 }
 
 
-wxString CViewTransfers::GetViewName() {
+wxString& CViewTransfers::GetViewName() {
     static wxString strViewName(_("Transfers"));
     return strViewName;
 }

clientgui/ViewTransfers.h

@@ -52,7 +52,7 @@ public:
 
     ~CViewTransfers();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
     void                    OnTransfersRetryNow( wxCommandEvent& event );

clientgui/ViewWork.cpp

@@ -141,7 +141,7 @@ CViewWork::~CViewWork() {
 }
 
 
-wxString CViewWork::GetViewName() {
+wxString& CViewWork::GetViewName() {
     static wxString strViewName(_("Work"));
     return strViewName;
 }

clientgui/ViewWork.h

@@ -55,7 +55,7 @@ public:
 
     ~CViewWork();
 
-    virtual wxString        GetViewName();
+    virtual wxString&       GetViewName();
     virtual const char**    GetViewIcon();
 
     void                    OnWorkSuspend( wxCommandEvent& event );