diff options
| author | Jasper van de Gronde <jasper.vandegronde@gmail.com> | 2011-04-15 07:17:08 +0000 |
|---|---|---|
| committer | Jasper van de Gronde <jasper.vandegronde@gmail.com> | 2011-04-15 07:17:08 +0000 |
| commit | c260fcd615791615b33f55459dabe38e64ee3471 (patch) | |
| tree | 0eb19c8b2ccae81bad3ce9ea16df296e29fc8245 /src/io/uristream.cpp | |
| parent | Fix a rounding error that resulted in seams at some zoom levels when (diff) | |
| download | inkscape-c260fcd615791615b33f55459dabe38e64ee3471.tar.gz inkscape-c260fcd615791615b33f55459dabe38e64ee3471.zip | |
No more PrintWin32, including no special cases for non-Unicode Windows anymore.
(bzr r9508.1.82)
Diffstat (limited to 'src/io/uristream.cpp')
| -rw-r--r-- | src/io/uristream.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp index 05d7f020a..b5f884b29 100644 --- a/src/io/uristream.cpp +++ b/src/io/uristream.cpp @@ -16,12 +16,6 @@ #include <string> #include <cstring> -#ifdef WIN32 -// For now to get at is_os_wide(). -# include "extension/internal/win32.h" -using Inkscape::Extension::Internal::PrintWin32; -#endif - namespace Inkscape { @@ -65,7 +59,7 @@ static FILE *fopen_utf8name( char const *utf8name, int mode ) g_free(filename); } #else - if ( PrintWin32::is_os_wide() ) { + { gunichar2 *wideName = g_utf8_to_utf16( utf8name, -1, NULL, NULL, NULL ); if ( wideName ) { if (mode == FILE_READ) @@ -78,15 +72,6 @@ static FILE *fopen_utf8name( char const *utf8name, int mode ) g_message("Unable to convert filename from UTF-8 to UTF-16 [%s]", safe); g_free(safe); } - } else { - gchar *filename = g_filename_from_utf8( utf8name, -1, NULL, NULL, NULL ); - if ( filename ) { - if (mode == FILE_READ) - fp = std::fopen(filename, "rb"); - else - fp = std::fopen(filename, "wb"); - g_free(filename); - } } #endif |