diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2001-05-19 21:30:23 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2001-05-19 21:30:23 +0000 |
| commit | 07656afb7d81867ce91ac1c83645e28d276e1302 (patch) | |
| tree | e76590453296b7a9854595b23ac2d869f88ca88e /src/Fl_Gl_Choice.cxx | |
| parent | 9c19542bd28b586657a017363c37a630aac93342 (diff) | |
Fl_Menu_add of a menu item with the same name as an existing submenu
title would mess up by replacing that menu title, it now adds a new
item.
Fl_Menu::add() of text starting with '/' to a menu is assummed to be a
filename. So "/foo/bar" creates a single menu item. You can also put
filenames into submenus by doing "submenu//foo/bar", this will create
a submenu called "submenu" with an item "/foo/bar". Menu items
starting with "\_" will insert an item starting with '_' rather than a
divider line. These changes make the menus compatable with fltk 2.0.
Another little fix for the BoXX OpenGL overlays.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1460 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Gl_Choice.cxx')
| -rw-r--r-- | src/Fl_Gl_Choice.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx index 420367348..5c163712f 100644 --- a/src/Fl_Gl_Choice.cxx +++ b/src/Fl_Gl_Choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.6 2001/03/14 17:20:01 spitzak Exp $" +// "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7 2001/05/19 21:30:23 spitzak Exp $" // // OpenGL visual selection code for the Fast Light Tool Kit (FLTK). // @@ -166,7 +166,11 @@ GLContext fl_create_gl_context(Fl_Window* window, const Fl_Gl_Choice* g, int lay HDC hdc = i->private_dc; if (!hdc) { hdc = i->private_dc = GetDCEx(i->xid, 0, DCX_CACHE); +#if 0 // this cast to PIXELFORMATDESCRIPTOR* is needed for cygwin? + SetPixelFormat(i->private_dc, g->pixelformat, (PIXELFORMATDESCRIPTOR*)(&g->pfd)); +#else SetPixelFormat(i->private_dc, g->pixelformat, &g->pfd); +#endif #if USE_COLORMAP if (fl_palette) SelectPalette(i->private_dc, fl_palette, FALSE); #endif @@ -229,5 +233,5 @@ void fl_delete_gl_context(GLContext context) { #endif // -// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.6 2001/03/14 17:20:01 spitzak Exp $". +// End of "$Id: Fl_Gl_Choice.cxx,v 1.5.2.7 2001/05/19 21:30:23 spitzak Exp $". // |