diff options
| -rw-r--r-- | CHANGES | 24 | ||||
| -rw-r--r-- | FL/Fl_Pixmap.H | 14 |
2 files changed, 30 insertions, 8 deletions
@@ -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 diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H index b4f4468b2..fc8cc3b66 100644 --- a/FL/Fl_Pixmap.H +++ b/FL/Fl_Pixmap.H @@ -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 $". // |