diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-06-06 19:42:56 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-06-06 19:42:56 +0000 |
| commit | 2321fdd18145115c614349856e263d2e178c4232 (patch) | |
| tree | be3531d9116b7c4a3892550b4e7d4c05ba21f79c /FL | |
| parent | eb734da4acdadc3ecddd769f97360405c731ce24 (diff) | |
Use explicit keyword for pixmap constructors...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1464 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Pixmap.H | 14 |
1 files changed, 6 insertions, 8 deletions
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 $". // |