From e40edefbbc62d773ad188a71272c3de01a9d9d5e Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 23 Apr 2001 20:52:52 +0000
Subject: [PATCH] Add additional constructors for old IRIX compiler; might be
needed for old GCC, too...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1438 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
FL/Fl_Pixmap.H | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index 2c838e09c..6996cf4d7 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.H,v 1.6.2.4 2001/04/13 19:07:39 easysw Exp $"
+// "$Id: Fl_Pixmap.H,v 1.6.2.5 2001/04/23 20:52:52 easysw Exp $"
//
// Pixmap header file for the Fast Light Tool Kit (FLTK).
//
@@ -34,8 +34,12 @@ struct Fl_Pixmap {
int w, h; // set by first draw...
ulong id; // for internal use (the pixmap)
ulong mask; // for internal use (mask bitmap)
+#ifdef __sgi
+ 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 */
Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {}
- Fl_Pixmap(const uchar* const * d) : data((char**)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) {}
FL_EXPORT ~Fl_Pixmap();
FL_EXPORT void label(Fl_Widget*);
FL_EXPORT void label(Fl_Menu_Item*);
@@ -46,5 +50,5 @@ struct Fl_Pixmap {
#endif
//
-// End of "$Id: Fl_Pixmap.H,v 1.6.2.4 2001/04/13 19:07:39 easysw Exp $".
+// End of "$Id: Fl_Pixmap.H,v 1.6.2.5 2001/04/23 20:52:52 easysw Exp $".
//
--
GitLab