Skip to content

Commit

Permalink
Fix OpenGL and button problems in shiny demo.
Browse files Browse the repository at this point in the history
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1909 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
michaelrsweet committed Jan 4, 2002
1 parent 8fe611b commit de9f676
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions 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
Expand Down
12 changes: 6 additions & 6 deletions 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).
//
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 $".
//

0 comments on commit de9f676

Please sign in to comment.