diff --git a/ChangeLog b/ChangeLog
index 157031a..cb0f702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
   * Bug #221 Patch for building with C++11 (Roger Leigh)
   + Added Mac port
   * Update the iconized frame window when opening files from the command line
+  * Fix supporting for filenames with non-ASCII characters
 
 1.2.1.4
   + Feature #171 Fold element does not fold following whitespace
diff --git a/src/wraplibxml.cpp b/src/wraplibxml.cpp
index 61b7f34..af68679 100644
--- a/src/wraplibxml.cpp
+++ b/src/wraplibxml.cpp
@@ -796,7 +796,7 @@ xmlChar *WrapLibxml::xmlFileNameToURL ( const wxString &fileName )
 
 wxFileName WrapLibxml::URLToFileName ( const wxString &url )
 {
-#if wxCHECK_VERSION(2,9,0)
+#if wxCHECK_VERSION(2,9,0) && !wxCHECK_VERSION(3,0,0)
 	return wxFileSystem::URLToFileName ( url );
 #else
 	xmlURIPtr uri = xmlParseURI ( url.utf8_str() );