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

Author: dpage
Date: 2006-01-23 20:25:32 +0000 (Mon, 23 Jan 2006)
New Revision: 4954

Modified:
branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp
Log:
Use wxConvLibc, not wxConvUTF8, per Andreas

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt 2006-01-23 20:21:03 UTC (rev 4953)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt 2006-01-23 20:25:32 UTC (rev 4954)
@@ -19,7 +19,7 @@
</ul>
<br>
<ul>
- <li>2006-01-23 MH 1.4.2 Read config files as uTF-8
+ <li>2006-01-23 MH 1.4.2 Read config files in the local encoding scheme
<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.

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-23 20:21:03 UTC (rev 4953)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 20:25:32 UTC (rev 4954)
@@ -312,7 +312,7 @@
buffer[cnt] = 0;
file.Close();

- DisplayFile(wxString(buffer, wxConvUTF8));
+ DisplayFile(wxString(buffer, wxConvLibc));

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