summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-01-04 18:22:27 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-01-04 18:22:27 +0000
commitde9f6763537e7152279a4f5a19a70437e7a70940 (patch)
treecaa5cc10dde3d96c5c419fe13c1d6cad26492b95
parent8fe611b5cdc715900255ec328fb86264f64279f5 (diff)
Fix OpenGL and button problems in shiny demo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1909 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES3
-rw-r--r--test/shiny.cxx12
2 files changed, 9 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 9016a1905..098c6eaea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
CHANGES IN FLTK 1.1.0b9
+ - The shiny demo didn't work on some systems (no
+ single-buffered OpenGL visual), and the new box types
+ were reset when show(argc, argv) was called.
- Fl::scheme() didn't update windows that were not
shown.
- The fractals demo would get far ahead of the UI with
diff --git a/test/shiny.cxx b/test/shiny.cxx
index a6442096b..31994c3dc 100644
--- a/test/shiny.cxx
+++ b/test/shiny.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: shiny.cxx,v 1.5.2.3.2.2 2002/01/01 15:11:33 easysw Exp $"
+// "$Id: shiny.cxx,v 1.5.2.3.2.3 2002/01/04 18:22:27 easysw Exp $"
//
// OpenGL "shiny buttons" test program for the Fast Light Tool Kit (FLTK).
//
@@ -264,8 +264,8 @@ void invisible_box(int x, int y, int w, int h, Fl_Color c) {
fl_pop_clip();
}
-#define SHINY_BOX (Fl_Boxtype)30
-#define INVISIBLE_BOX (Fl_Boxtype)31
+#define SHINY_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE + 0)
+#define INVISIBLE_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE + 1)
int main(int argc, char **argv) {
window = make_panels();
@@ -294,14 +294,14 @@ int main(int argc, char **argv) {
int i = 0;
if (Fl::args(argc,argv,i) < argc) Fl::fatal(Fl::help);
#if HAVE_GL
- if (!Fl::gl_visual(FL_RGB)) Fl::fatal("Display does not do OpenGL");
+ if (!Fl::gl_visual(FL_RGB | FL_DOUBLE)) Fl::fatal("Display does not do OpenGL");
#else
fl_message("This demo does not work without OpenGL");
#endif
- window->show(argc,argv);
+ window->show();
return Fl::run();
}
//
-// End of "$Id: shiny.cxx,v 1.5.2.3.2.2 2002/01/01 15:11:33 easysw Exp $".
+// End of "$Id: shiny.cxx,v 1.5.2.3.2.3 2002/01/04 18:22:27 easysw Exp $".
//