[Greater-commits] r226 - trunk/Administration

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-06-21 16:49:46 +0200 (Tue, 21 Jun 2011)
New Revision: 226

Modified:
   trunk/Administration/MainWindow.cpp
   trunk/Administration/UserDialog.cpp
Log:
Correct formatting of utf-8 encoded string from pgsql


Modified: trunk/Administration/MainWindow.cpp
===================================================================
--- trunk/Administration/MainWindow.cpp	2011-06-21 12:03:46 UTC (rev 225)
+++ trunk/Administration/MainWindow.cpp	2011-06-21 14:49:46 UTC (rev 226)
@@ -919,9 +919,9 @@
   }
 
   //Format error message
-  errMessage = errMessage.Format(wxT("%s:\nError type %c: number %ld: parameter: %s"), 
-                                 errMessage.c_str(), errinfo->err_type, errinfo->err_no, 
-                                 errinfo->err_param);
+  errMessage = errMessage.Format(wxT("%s:\nError type %c: number %ld: parameter: %s"),
+                                 errMessage.c_str(), errinfo->err_type, errinfo->err_no,
+                                 wxString::FromUTF8(errinfo->err_param).c_str());
 
   //Display error message box
   wxMessageBox(errMessage, wxT("Error"), wxOK | wxICON_ERROR);

Modified: trunk/Administration/UserDialog.cpp
===================================================================
--- trunk/Administration/UserDialog.cpp	2011-06-21 12:03:46 UTC (rev 225)
+++ trunk/Administration/UserDialog.cpp	2011-06-21 14:49:46 UTC (rev 226)
@@ -487,5 +487,5 @@
 {
   //Display error message box
   wxMessageBox(errMessage,
-               wxT("Error"), wxOK | wxICON_ERROR);  
+               wxT("Error"), wxOK | wxICON_ERROR);
 }