From a90ca2d60a0cdf699410be34fde62a03558715b4 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 8 Nov 1998 15:05:48 +0000
Subject: Patches from Bill:

  - Box type problems with 2-pixel boxes (wrong colors)
  - Fl_Pixmap fix (uchar instead of char)
  - Style demo fixes for Windows.
  - HPUX comparison function prototype wrong.
  - Spelling errors...


git-svn-id: file:///fltk/svn/fltk/trunk@70 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Pixmap.H | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index d4182c4e8..49df1a476 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Pixmap.H,v 1.3 1998/10/21 14:19:26 mike Exp $"
+// "$Id: Fl_Pixmap.H,v 1.4 1998/11/08 15:05:44 mike Exp $"
 //
 // Pixmap header file for the Fast Light Tool Kit (FLTK).
 //
@@ -35,6 +35,7 @@ struct Fl_Pixmap {
   ulong id; // for internal use (the pixmap)
   ulong mask; // for internal use (mask bitmap)
   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();
   void label(Fl_Widget*);
   void label(Fl_Menu_Item*);
@@ -45,5 +46,5 @@ struct Fl_Pixmap {
 #endif
 
 //
-// End of "$Id: Fl_Pixmap.H,v 1.3 1998/10/21 14:19:26 mike Exp $".
+// End of "$Id: Fl_Pixmap.H,v 1.4 1998/11/08 15:05:44 mike Exp $".
 //
-- 
cgit v1.2.3