[pkg-boinc-devel] Re: [boinc_alpha] BOINC 5.3.28 released for Windows and Linux

[Frank S. Thomas]

Hi Rom,

On Thursday 23 March 2006 02:20, Rom Walton wrote:
> I've checked in the changes, I only had to tweak a couple of lines.

Thank you very much! This really eases our work with the BOINC Manager.

> Can you go ahead and give it a test drive and let me know how it goes?

Of course. There are only two errors now:
BOINCBaseView.cpp:298: error: call of overloaded ‘wxString(const char [10])’ is ambiguous
BOINCBaseView.cpp:475: error: ‘LwxString’ was not declared in this scope

The fix for the first one is easy, but I'm not sure about the second one.
I think the macro _() is primarily for literal strings and in unicode
builds it prefixes 'L' to its argument. Since the argument isn't a
literal string I've replaced it with wxGetTranslation(), to which _()
also expands. A patch is below.

Thanks again,
Frank

--- boinc-5.3.28.orig/clientgui/BOINCBaseView.cpp	2006-03-23 02:17:06.000000000 +0100
+++ boinc-5.3.28/clientgui/BOINCBaseView.cpp	2006-03-23 09:09:25.000000000 +0100
@@ -295,7 +295,7 @@
 wxString CBOINCBaseView::OnListGetItemText(
     long WXUNUSED(item), long WXUNUSED(column)
 ) const {
-    return wxString("Undefined");
+    return wxString(wxT("Undefined"));
 }
 
 
@@ -472,8 +472,8 @@
                 // Project defined urls
                 for (i=0;(i<project->gui_urls.size())&&(i<=ID_TASK_PROJECT_WEB_PROJDEF_MAX);i++) {
                     pItem = new CTaskItem(
-                        _(wxString(project->gui_urls[i].name.c_str(), wxConvUTF8)),
-                        _(wxString(project->gui_urls[i].description.c_str(), wxConvUTF8)),
+                        wxGetTranslation(wxString(project->gui_urls[i].name.c_str(), wxConvUTF8).c_str()),
+                        wxGetTranslation(wxString(project->gui_urls[i].description.c_str(), wxConvUTF8).c_str()),
                         wxString(project->gui_urls[i].url.c_str(), wxConvUTF8),
                         ID_TASK_PROJECT_WEB_PROJDEF_MIN + 1 + i
                     );


-- 
Die Garde stirbt, aber sie ergibt sich nicht!