[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1707
Date       : Thu Aug 17 17:48:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/filters/SVGFilter/svgfilter.cpp

Fix for multibyte chars in filenames


Diff:
Index: Trunk/XaraLX/filters/SVGFilter/svgfilter.cpp
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/svgfilter.cpp	(revision 1706)
+++ Trunk/XaraLX/filters/SVGFilter/svgfilter.cpp	(revision 1707)
@@ -387,6 +387,9 @@
 int main(int argc, char* argv[])
 {
 #if wxUSE_UNICODE
+	// Set to the user's default locale for these conversions
+	char* pOldLoc = setlocale(LC_CTYPE, "");
+
 	wxChar **wxArgv = new wxChar *[argc + 1];
 
 	{
@@ -400,6 +403,9 @@
 
 		wxArgv[n] = NULL;
 	}
+
+	// Set back to the old locale (should we be doing this?)
+	setlocale(LC_CTYPE, pOldLoc);
 #else // !wxUSE_UNICODE
 	#define wxArgv argv
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE


Xara