[Greater-commits] r350 - trunk/Administration

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Jul 5 12:34:58 CEST 2011


Author: bricks
Date: 2011-07-05 12:34:57 +0200 (Tue, 05 Jul 2011)
New Revision: 350

Modified:
   trunk/Administration/PanelParatree.cpp
Log:
Fix handling of utf-8 strings


Modified: trunk/Administration/PanelParatree.cpp
===================================================================
--- trunk/Administration/PanelParatree.cpp	2011-07-04 13:49:15 UTC (rev 349)
+++ trunk/Administration/PanelParatree.cpp	2011-07-05 10:34:57 UTC (rev 350)
@@ -274,7 +274,7 @@
   {
     //Inform user, that no data is existing to delete
     wxMessageBox(wxT("No parameter tree data loaded to delete.\nDelete not possible!"),
-                 wxT("Delete not possible"), wxOK | wxICON_INFORMATION);
+                 wxT("Delete not possible"), wxOK | wxICON_INFORMATION, this);
     return;
   }
   
@@ -293,10 +293,10 @@
 
   //User has to confirm or cancel, before parameter tree data is deleted
   message = message.Format(wxT("Do you really want to delete the selected parameter tree data\n\"%s\" ?"),
-                           fieldid);  
+                           wxString::FromUTF8(fieldid).c_str());  
 
   result = wxMessageBox(message, wxT("Confirm deletion"),
-                        wxYES_NO|wxNO_DEFAULT | wxICON_QUESTION);
+                        wxYES_NO|wxNO_DEFAULT | wxICON_QUESTION, this);
 
   //Delete paratree
   if (result == wxYES)
@@ -324,7 +324,7 @@
       else
       {  
         //Inform user, that parameter tree data was deleted
-        message = message.Format(wxT("Parameter tree data \"%s\" was deleted"), fieldid);
+        message = message.Format(wxT("Parameter tree data \"%s\" was deleted"), wxString::FromUTF8(fieldid).c_str());
         wxMessageBox(message, wxT("Info"), wxOK | wxICON_INFORMATION, this);
 
         //Reload data from database to refresh grid



More information about the Greater-commits mailing list