summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-05-13 14:48:28 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-05-13 14:48:28 +0000
commit466ba461f1672ec58333324d90f19cecb8c60a3c (patch)
treeb5cb32cb753fae58b78e0b795266e9b33f107425 /test
parentc04f2f8bff6ca31d8d4858584b6dbf585c66164f (diff)
Added first half of XCode 3.0 IDE support for FLTK 1.3. FLTK is built as a set of frameworks. Fluid will be used to compile .fl files just in time.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6124 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test')
-rw-r--r--test/browser.cxx13
-rw-r--r--test/checkers.cxx2
-rw-r--r--test/colbrowser.cxx6
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);