From 1e77c19688a76f96813d76b68323a6030aed8230 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Thu, 18 Nov 2010 20:00:01 +0000 Subject: Fixed file access code to use UTF-8 strings (STR #2440) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7874 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- test/colbrowser.cxx | 4 ++-- test/demo.cxx | 4 ++-- test/file_chooser.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/colbrowser.cxx b/test/colbrowser.cxx index 53018eb2e..a1ecd373c 100644 --- a/test/colbrowser.cxx +++ b/test/colbrowser.cxx @@ -149,9 +149,9 @@ load_browser(char *fname) int r, g, b, lr = -1 , lg = -1, lb = -1; char name[256], buf[256]; #ifdef __EMX__ - if (!(fp = fopen(__XOS2RedirRoot(fname), "r"))) + if (!(fp = fl_fopen(__XOS2RedirRoot(fname), "r"))) #else - if (!(fp = fopen(fname, "r"))) + if (!(fp = fl_fopen(fname, "r"))) #endif { fl_alert("%s\n%s\n%s","Load", fname, "Can't open"); diff --git a/test/demo.cxx b/test/demo.cxx index e4e2383a6..a71bb7a94 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -434,7 +434,7 @@ int load_the_menu(const char* fname) FILE *fin = 0; char line[256], mname[64],iname[64],cname[64]; int i,j, mi = 0; - fin = fopen(fname,"r"); + fin = fl_fopen(fname,"r"); if (fin == NULL) { #if defined ( __APPLE__ ) @@ -445,7 +445,7 @@ int load_the_menu(const char* fname) pos = strrchr(fname,'/'); if (!pos) return 0; strcpy(pos,"/Resources/demo.menu"); - fin = fopen(fname,"r"); + fin = fl_fopen(fname,"r"); #endif } // if "fin" is still NULL, we will read the menu from the string array in the diff --git a/test/file_chooser.cxx b/test/file_chooser.cxx index 872994e2c..0677d0d30 100644 --- a/test/file_chooser.cxx +++ b/test/file_chooser.cxx @@ -304,8 +304,8 @@ ps_check(const char *name, // I - Name of file sprintf(outname, "%s/.preview.ps", home ? home : ""); if (strcmp(name, outname) != 0) { - in = fopen(name, "rb"); - out = fopen(outname, "wb"); + in = fl_fopen(name, "rb"); + out = fl_fopen(outname, "wb"); page = 0; while (fgets(line, sizeof(line), in) != NULL) { -- cgit v1.2.3