From a0157c5ba1ba8938f597f77c41d00ab51a81323e Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 18 Feb 1999 13:12:50 +0000
Subject: [PATCH] Fl_Window::icon() used a parameter named "i", which
 conflicted with the "i" member.

fl_draw.H had line style definitions in it, but FLTK 1.0 doesn't have
line style support (that's for 1.1).


git-svn-id: file:///fltk/svn/fltk/trunk@288 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Window.H |  6 +++---
 FL/fl_draw.H   | 22 ++--------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index 0b6ff2c7a..0513a85bb 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Window.H,v 1.11 1999/02/16 21:59:47 mike Exp $"
+// "$Id: Fl_Window.H,v 1.12 1999/02/18 13:12:50 mike Exp $"
 //
 // Window header file for the Fast Light Tool Kit (FLTK).
 //
@@ -88,7 +88,7 @@ public:
   const char* xclass() const	{return xclass_;}
   void xclass(const char* c)	{xclass_ = c;}
   const void* icon() const	{return icon_;}
-  void icon(const void * i)	{icon_ = i;}
+  void icon(const void * ic)	{icon_ = ic;}
 
   int shown() {return i != 0;}
   virtual FL_EXPORT void show();
@@ -113,5 +113,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Window.H,v 1.11 1999/02/16 21:59:47 mike Exp $".
+// End of "$Id: Fl_Window.H,v 1.12 1999/02/18 13:12:50 mike Exp $".
 //
diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index efe0e34c5..73c2edfb1 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.H,v 1.8 1999/02/16 21:59:47 mike Exp $"
+// "$Id: fl_draw.H,v 1.9 1999/02/18 13:12:50 mike Exp $"
 //
 // Portable drawing function header file for the Fast Light Tool Kit (FLTK).
 //
@@ -43,24 +43,6 @@ FL_EXPORT void fl_pop_clip();
 FL_EXPORT int fl_not_clipped(int x, int y, int w, int h);
 FL_EXPORT int fl_clip_box(int, int, int, int, int& x, int& y, int& w, int& h);
 
-// line style:
-// Enumerations chosen so zero is the default, unfortunatly this does
-// not match values for either X or Windows...
-enum Fl_LineStyle {
-  FL_SOLID	=      0,
-  FL_DASH	=      1,
-  FL_DOT	=      2,
-  FL_DASHDOT	=      3,
-  FL_DASHDOTDOT	=      4,
-  FL_CAP_FLAT	= 0x0100,
-  FL_CAP_ROUND	= 0x0200,
-  FL_CAP_SQUARE	= 0x0300,
-  FL_JOIN_MITER	= 0x1000,
-  FL_JOIN_ROUND	= 0x2000,
-  FL_JOIN_BEVEL	= 0x3000,
-};
-FL_EXPORT void fl_line_style(int style, int width = 0, char* dashes = 0);
-
 // points:
 FL_EXPORT void fl_point(int x, int y);
 
@@ -179,5 +161,5 @@ FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scal
 #endif
 
 //
-// End of "$Id: fl_draw.H,v 1.8 1999/02/16 21:59:47 mike Exp $".
+// End of "$Id: fl_draw.H,v 1.9 1999/02/18 13:12:50 mike Exp $".
 //