mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use explicit keyword for pixmap constructors... 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1464 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2001-06-06 19:42:56 +00:00
parent eb734da4ac
commit 2321fdd181
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CHANGES
View File

@ -1,3 +1,27 @@
CHANGES SINCE FLTK 1.0.11
- Made the Forms pixmap parameter const to match the
Fl_Pixmap.H definitions.
- Changed the Fl_Pixmap constructor to use the explicit
keyword which should work for all C++ compilers.
- 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.
CHANGES SINCE FLTK 1.0.10
- CHANGED THE DEFAULT RUN-TIME LINKING TO "MULTITHREADED

14
FL/Fl_Pixmap.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Pixmap.H,v 1.6.2.6 2001/04/24 19:35:38 easysw Exp $"
// "$Id: Fl_Pixmap.H,v 1.6.2.7 2001/06/06 19:42:56 easysw Exp $"
//
// Pixmap header file for the Fast Light Tool Kit (FLTK).
//
@ -34,12 +34,10 @@ struct Fl_Pixmap {
int w, h; // set by first draw...
ulong id; // for internal use (the pixmap)
ulong mask; // for internal use (mask bitmap)
#if defined(__sgi) || (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
Fl_Pixmap(char * const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
Fl_Pixmap(uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
#endif /* __sgi || GCC 2.8.x */
Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {}
Fl_Pixmap(const uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
explicit Fl_Pixmap(char * const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
explicit Fl_Pixmap(uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
explicit Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {}
explicit Fl_Pixmap(const uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
FL_EXPORT ~Fl_Pixmap();
FL_EXPORT void label(Fl_Widget*);
FL_EXPORT void label(Fl_Menu_Item*);
@ -50,5 +48,5 @@ struct Fl_Pixmap {
#endif
//
// End of "$Id: Fl_Pixmap.H,v 1.6.2.6 2001/04/24 19:35:38 easysw Exp $".
// End of "$Id: Fl_Pixmap.H,v 1.6.2.7 2001/06/06 19:42:56 easysw Exp $".
//