Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2025-12-11 13:53:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove platform specific code from test apps

Browse Source 
Test programs that open files don't use platform specific code.
They don't open files from macOS bundles.
Support files must either be in the current working directory or
given on the command line.
On macOS this requires a full path when using bundles.
This commit is contained in:
Albrecht Schlosser
2020-08-21 18:54:40 +02:00
parent f3005a44f8
commit d91160a9e0
4 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/browser.cxx
View File

@@ -160,42 +160,15 @@ void wtype_cb(Fl_Widget *, void *) {
int main(int argc, char **argv) {
int i;
if (!Fl::args(argc,argv,i)) Fl::fatal(Fl::help);
const char* fname = (i < argc) ? argv[i] : "browser.cxx";
Fl_Double_Window window(720,520,fname);
browser = new Fl_Select_Browser(0,0,window.w(),350,0);
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
const char *fname = (i < argc) ? argv[i] : "browser.cxx";
Fl_Double_Window window(720, 520, fname);
browser = new Fl_Select_Browser(0, 0, window.w(), 350, 0);
browser->type(FL_MULTI_BROWSER);
//browser->type(FL_HOLD_BROWSER);
//browser->color(42);
browser->callback(b_cb);
// browser->scrollbar_right();
//browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS);
//browser->format_char('#');
if (!browser->load(fname)) {
int done = 0;
#ifdef _MSC_VER
// if 'browser' was started from the VisualC environment in Win32,
// the current directory is set to the environment itself,
// so we need to correct the browser file path
if ( i == argc )
{
fname = "../test/browser.cxx";
done = browser->load(fname);
}
#elif defined(__APPLE__)
char buf[2048];
strcpy(buf, argv[0]);
char *slash = strrchr(buf, '/');
if (slash) {
strcpy(slash, "/../../../browser.cxx");
}
done = browser->load(buf);
#endif
if ( !done )
{
fl_message("Can't load %s, %s\n", fname, strerror(errno));
exit(1);
}
fl_message("Can't load '%s'\n%s\n", fname, strerror(errno));
exit(1);
}
browser->position(0);