SVN Commit by dpage: r4953 - in trunk/pgadmin3: . src/frm

Author: dpage
Date: 2006-01-23 20:21:03 +0000 (Mon, 23 Jan 2006)
New Revision: 4953

Modified:
trunk/pgadmin3/CHANGELOG
trunk/pgadmin3/src/frm/frmConfig.cpp
Log:
Use wxConvLibc not wxConvUtf8, per Andreas

Modified: trunk/pgadmin3/CHANGELOG
===================================================================
--- trunk/pgadmin3/CHANGELOG 2006-01-23 13:48:10 UTC (rev 4952)
+++ trunk/pgadmin3/CHANGELOG 2006-01-23 20:21:03 UTC (rev 4953)
@@ -35,7 +35,7 @@

Date Dev Ver Change details
---------- --- ----- --------------
-2006-01-23 MH 1.4.2 Read config files as UTF-8
+2006-01-23 MH 1.4.2 Read config files in the local encoding scheme
2006-01-22 DP 1.6.0 Rename text docs to match GNUish standards, remove all
HTML markup and wrap at col 80.
2006-01-19 DP 1.6.0 Fix capitalisation of menu items. Add '...' to the end of

Modified: trunk/pgadmin3/src/frm/frmConfig.cpp
===================================================================
--- trunk/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 13:48:10 UTC (rev 4952)
+++ trunk/pgadmin3/src/frm/frmConfig.cpp 2006-01-23 20:21:03 UTC (rev 4953)
@@ -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()));