summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/color_chooser.cxx12
-rw-r--r--test/image.cxx8
-rw-r--r--test/list_visuals.cxx8
-rw-r--r--test/tiled_image.cxx8
4 files changed, 18 insertions, 18 deletions
diff --git a/test/color_chooser.cxx b/test/color_chooser.cxx
index 6178ec745..4e87a68c8 100644
--- a/test/color_chooser.cxx
+++ b/test/color_chooser.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: color_chooser.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $"
+// "$Id: color_chooser.cxx,v 1.6.2.3.2.2 2001/11/27 17:44:08 easysw Exp $"
//
// Color chooser test program for the Fast Light Tool Kit (FLTK).
//
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <stdio.h>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
#include "list_visuals.cxx"
#endif
@@ -115,7 +115,7 @@ int main(int argc, char ** argv) {
" - : default visual\n"
" r : call Fl::visual(FL_RGB)\n"
" c : call Fl::own_colormap()\n",argv[0]);
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
printf(" # : use this visual with an empty colormap:\n");
list_visuals();
#endif
@@ -127,7 +127,7 @@ int main(int argc, char ** argv) {
} else if (argv[i][0] == 'c') {
Fl::own_colormap();
} else if (argv[i][0] != '-') {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
int visid = atoi(argv[i]);
fl_open_display();
XVisualInfo templt; int num;
@@ -138,7 +138,7 @@ int main(int argc, char ** argv) {
fl_visual->visual, AllocNone);
fl_xpixel(FL_BLACK); // make sure black is allocated
#else
- Fl::fatal("Visual id's not supported on MSWindows");
+ Fl::fatal("Visual id's not supported on MSWindows or MacOS.");
#endif
}
window.show(argc,argv);
@@ -146,5 +146,5 @@ int main(int argc, char ** argv) {
}
//
-// End of "$Id: color_chooser.cxx,v 1.6.2.3.2.1 2001/08/05 23:58:54 easysw Exp $".
+// End of "$Id: color_chooser.cxx,v 1.6.2.3.2.2 2001/11/27 17:44:08 easysw Exp $".
//
diff --git a/test/image.cxx b/test/image.cxx
index 3a7baebbe..1d49c584b 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: image.cxx,v 1.6.2.3.2.5 2001/11/24 18:07:57 easysw Exp $"
+// "$Id: image.cxx,v 1.6.2.3.2.6 2001/11/27 17:44:08 easysw Exp $"
//
// Fl_Image test program for the Fast Light Tool Kit (FLTK).
//
@@ -80,7 +80,7 @@ void button_cb(Fl_Widget *,void *) {
}
#include <FL/x.H>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
#include "list_visuals.cxx"
#endif
@@ -96,7 +96,7 @@ int arg(int argc, char **argv, int &i) {
}
int main(int argc, char **argv) {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
int i = 1;
Fl::args(argc,argv,i,arg);
@@ -155,5 +155,5 @@ int main(int argc, char **argv) {
}
//
-// End of "$Id: image.cxx,v 1.6.2.3.2.5 2001/11/24 18:07:57 easysw Exp $".
+// End of "$Id: image.cxx,v 1.6.2.3.2.6 2001/11/27 17:44:08 easysw Exp $".
//
diff --git a/test/list_visuals.cxx b/test/list_visuals.cxx
index a45bc3bcf..d00ee050a 100644
--- a/test/list_visuals.cxx
+++ b/test/list_visuals.cxx
@@ -1,12 +1,12 @@
//
-// "$Id: list_visuals.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: list_visuals.cxx,v 1.5.2.3.2.1 2001/11/27 17:44:08 easysw Exp $"
//
// Visual list utility for the Fast Light Tool Kit (FLTK).
//
// List all the visuals on the screen, and dumps anything interesting
// about them to stdout.
//
-// Does not use fltk.
+// Does not use FLTK.
//
// This file may be #included in another program to make a function to
// call to list the visuals. Fl.H must be included first to indicate this.
@@ -31,7 +31,7 @@
// Please report all bugs and problems to "fltk-bugs@fltk.org".
//
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__)
#include <FL/Fl.H>
#include <FL/fl_message.H>
@@ -235,5 +235,5 @@ int main(int argc, char **argv) {
#endif
//
-// End of "$Id: list_visuals.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: list_visuals.cxx,v 1.5.2.3.2.1 2001/11/27 17:44:08 easysw Exp $".
//
diff --git a/test/tiled_image.cxx b/test/tiled_image.cxx
index cb132edef..a888fc99f 100644
--- a/test/tiled_image.cxx
+++ b/test/tiled_image.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: tiled_image.cxx,v 1.1.2.1 2001/11/24 18:07:58 easysw Exp $"
+// "$Id: tiled_image.cxx,v 1.1.2.2 2001/11/27 17:44:08 easysw Exp $"
//
// Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK).
//
@@ -42,7 +42,7 @@ void button_cb(Fl_Widget *,void *) {
}
#include <FL/x.H>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
#include "list_visuals.cxx"
#endif
@@ -58,7 +58,7 @@ int arg(int argc, char **argv, int &i) {
}
int main(int argc, char **argv) {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
int i = 1;
Fl::args(argc,argv,i,arg);
@@ -99,5 +99,5 @@ int main(int argc, char **argv) {
}
//
-// End of "$Id: tiled_image.cxx,v 1.1.2.1 2001/11/24 18:07:58 easysw Exp $".
+// End of "$Id: tiled_image.cxx,v 1.1.2.2 2001/11/27 17:44:08 easysw Exp $".
//