diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/browser.cxx | 13 | ||||
| -rw-r--r-- | test/checkers.cxx | 2 | ||||
| -rw-r--r-- | test/colbrowser.cxx | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/test/browser.cxx b/test/browser.cxx index da6babd58..3273ba08e 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -130,25 +130,28 @@ int main(int argc, char **argv) { // browser->scrollbar_right(); //browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS); 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 - int done = 1; if ( i == argc ) { fname = "../test/browser.cxx"; done = browser->load(fname); } +#elif defined(USING_XCODE) + if ( i == argc ) + { + fname = "../../../../test/browser.cxx"; + done = browser->load(fname); + } +#endif if ( !done ) { printf("Can't load %s, %s\n", fname, strerror(errno)); exit(1); } -#else - printf("Can't load %s, %s\n", fname, strerror(errno)); - exit(1); -#endif } browser->position(0); diff --git a/test/checkers.cxx b/test/checkers.cxx index 0f99b99eb..28eb287db 100644 --- a/test/checkers.cxx +++ b/test/checkers.cxx @@ -58,6 +58,8 @@ const char* copyright = #define FLTK //#define VT100 +#undef check + #include <string.h> #include <stdlib.h> #include <stdio.h> diff --git a/test/colbrowser.cxx b/test/colbrowser.cxx index d08813ef8..0f1edbe3d 100644 --- a/test/colbrowser.cxx +++ b/test/colbrowser.cxx @@ -54,7 +54,11 @@ main(int argc, char *argv[]) fl_initialize(&argc, argv, "FormDemo", 0, 0); create_form_cl(); - strcpy(dbname, "rgb.txt"); +#ifdef USING_XCODE + strcpy(dbname, "../../../../test/rgb.txt"); +#else + strcpy(dbname, "rgb.txt"); +#endif if (load_browser(dbname)) fl_set_object_label(dbobj, dbname); |