SVN Commit by dpage: r4951 - in branches/REL-1_4_0_PATCHES/pgadmin3: . src/frm

Author: dpage
Date: 2006-01-23 13:39:29 +0000 (Mon, 23 Jan 2006)
New Revision: 4951

Modified:
branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp
Log:
Read config files as uTF-8 [Magnus Hagander]

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt 2006-01-22 13:44:30 UTC (rev 4950)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt 2006-01-23 13:39:29 UTC (rev 4951)
@@ -8,6 +8,7 @@
<li>MP - Marc Persuy
<li>DAP - Darko Prenosil
<li>FGP - Florian G. Pflug
+ <li>MH - Magnus Hagander
</ul>
<b>Versions and releases</b><br>
The following list contains all changes to pgAdmin III, as present in svn.
@@ -18,11 +19,12 @@
</ul>
<br>
<ul>
+ <li>2006-01-23 MH 1.4.2 Read config files as uTF-8
<li>2006-01-17 DP 1.4.2 Display the defintion of set returning procedures correctly.
<li>2006-01-17 DP 1.4.2 Fix drop procedure by including IN/OUT parameter flags in the name.
<li>2006-01-13 DP 1.4.2 Fix role SQL - correctly define CREATEROLE/NOCREATEROLE per Andrus.
- <li>2006-01-09 DP 1.4.2 Honour the copy quoting setting properly in the SQL results pane [Magnus Hagander]
- <li>2006-01-09 DP 1.4.2 Set the initial Unicode/Local charset options correctly in the Export dialogue [Magnus Hagander]
+ <li>2006-01-09 MH 1.4.2 Honour the copy quoting setting properly in the SQL results pane
+ <li>2006-01-09 MH 1.4.2 Set the initial Unicode/Local charset options correctly in the Export dialogue
<li>2005-12-26 AP 1.4.2 Fix PK detection in EditGrid per Andrus Moor
<li>2005-12-26 AP 1.4.2 Fix Bitmap Index explain per Alexander Kirpa
<li>2005-12-23 DP 1.4.2 Use ELSIF not ELSEIF in pgagent.sql for compatibility with 7.x servers [Glen Sasek]

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp 2006-01-22 13:44:30 UTC (rev 4950)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 13:39:29 UTC (rev 4951)
@@ -312,7 +312,7 @@
buffer[cnt] = 0;
file.Close();

- DisplayFile(wxString::FromAscii(buffer));
+ DisplayFile(wxString(buffer, wxConvUTF8));

delete buffer;
statusBar->SetStatusText(wxString::Format(_(" Configuration read from %s"), lastPath.c_str()));