diff options
| -rw-r--r-- | test/browser.cxx | 39 | ||||
| -rw-r--r-- | test/colbrowser.cxx | 23 | ||||
| -rw-r--r-- | test/demo.menu | 2 | ||||
| -rw-r--r-- | test/help_dialog.cxx | 24 |
4 files changed, 18 insertions, 70 deletions
diff --git a/test/browser.cxx b/test/browser.cxx index 23d84e7d8..05c83acb2 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -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); diff --git a/test/colbrowser.cxx b/test/colbrowser.cxx index bcd1506d7..eedb5499f 100644 --- a/test/colbrowser.cxx +++ b/test/colbrowser.cxx @@ -47,29 +47,20 @@ static Fl_Value_Slider *rs, *gs, *bs; static char dbname[FL_PATH_MAX]; static void create_form_cl(void); -static int load_browser(char *); +static int load_browser(const char *); typedef struct { int r, g, b; } RGBdb; static RGBdb rgbdb[MAX_RGB]; -int main(int argc, char *argv[]) -{ - Fl::args(argc, argv); +int main(int argc, char *argv[]) { + int i; + if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help); + const char *dbname = (i < argc) ? argv[i] : "rgb.txt"; create_form_cl(); -#ifdef __APPLE__ - // Bundled apps do not set the current directory - strcpy(dbname, argv[0]); - char *slash = strrchr(dbname, '/'); - if (slash) - strcpy(slash, "/../Resources/rgb.txt"); -#else - strcpy(dbname, "rgb.txt"); -#endif - if (load_browser(dbname)) dbobj->label(dbname); else @@ -139,7 +130,7 @@ static int read_entry(FILE * fp, int *r, int *g, int *b, char *name) } -static int load_browser(char *fname) +static int load_browser(const char *fname) { FILE *fp; RGBdb *db = rgbdb, *dbs = db + MAX_RGB; @@ -147,7 +138,7 @@ static int load_browser(char *fname) char name[256], buf[300]; if (!(fp = fl_fopen(fname, "r"))) { - fl_alert("%s\n%s\n%s","Load", fname, "Can't open"); + fl_alert("Load:\nCan't open '%s'", fname); return 0; } diff --git a/test/demo.menu b/test/demo.menu index 8b325cca6..f53b0ede3 100644 --- a/test/demo.menu +++ b/test/demo.menu @@ -61,7 +61,7 @@ @main:Fluid\n(UI design tool):fluid valuators.fl @main:Cool\nDemos...:@e - @e:X Color\nBrowser:colbrowser + @e:X Color\nBrowser:colbrowser rgb.txt @e:Mandelbrot:mandelbrot @e:Fractals:fractals @e:Puzzle:glpuzzle diff --git a/test/help_dialog.cxx b/test/help_dialog.cxx index 2ee19c41a..5970792bb 100644 --- a/test/help_dialog.cxx +++ b/test/help_dialog.cxx @@ -36,27 +36,11 @@ main(int argc, // I - Number of command-line arguments char *argv[]) // I - Command-line arguments { Fl_Help_Dialog *help = new Fl_Help_Dialog; - char htmlname[FL_PATH_MAX]; -#ifdef __APPLE__ - int i = 1; - while (i < argc && Fl::arg(argc, argv, i)) i++; - if (i < argc) { - strcpy(htmlname, argv[i]); - } else { - // bundled apps do not set the current directory - strcpy(htmlname, argv[0]); - char *slash = strrchr(htmlname, '/'); - if (slash) strcpy(slash, "/../Resources/help_dialog.html"); - } -#else - if (argc > 1) { - strcpy(htmlname, argv[1]); - } else { - strcpy(htmlname, "help_dialog.html"); - } -#endif + int i; + if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help); + const char *fname = (i < argc) ? argv[i] : "help_dialog.html"; - help->load(htmlname); // TODO: add error check (when load() returns int instead of void) + help->load(fname); // TODO: add error check (when load() returns int instead of void) help->show(1, argv); |