OpenGL patches from Bill.

git-svn-id: file:///fltk/svn/fltk/trunk@152 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 22 insertions, 19 deletions

diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index 8e37b8171..11afac67e 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu.cxx,v 1.7 1998/12/02 15:39:32 mike Exp $"
+// "$Id: Fl_Menu.cxx,v 1.8 1998/12/08 21:04:35 mike Exp $"
 //
 // Menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -266,7 +266,7 @@ menuwindow::~menuwindow() {
 void menuwindow::position(int X, int Y) {
   if (title) {title->position(X, title->y()+Y-y());}
   Fl_Menu_Window::position(X, Y);
-  x(X); y(Y); // don't wait for response from X
+  // x(X); y(Y); // don't wait for response from X
 }
 
 // scroll so item i is visible on screen
@@ -279,7 +279,7 @@ void menuwindow::autoscroll(int i) {
     Y = -Y-10;
   }
   Fl_Menu_Window::position(x(), y()+Y);
-  y(y()+Y); // don't wait for response from X
+  // y(y()+Y); // don't wait for response from X
 }
 
 ////////////////////////////////////////////////////////////////
@@ -703,5 +703,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
 }
 
 //
-// End of "$Id: Fl_Menu.cxx,v 1.7 1998/12/02 15:39:32 mike Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.8 1998/12/08 21:04:35 mike Exp $".
 //
diff --git a/src/Fl_Tile.cxx b/src/Fl_Tile.cxx
index c50ace608..749a28f19 100644
--- a/src/Fl_Tile.cxx
+++ b/src/Fl_Tile.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Tile.cxx,v 1.3 1998/10/21 14:20:23 mike Exp $"
+// "$Id: Fl_Tile.cxx,v 1.4 1998/12/08 21:04:36 mike Exp $"
 //
 // Tile widget for the Fast Light Tool Kit (FLTK).
 //
@@ -168,7 +168,8 @@ int Fl_Tile::handle(int event) {
     break;
 
   case FL_DRAG:
-    if (damage()) return 1; // don't fall behind
+    // This is necessary if CONSOLIDATE_MOTION in Fl_x.C is turned off:
+    // if (damage()) return 1; // don't fall behind
   case FL_RELEASE: {
     if (!sdrag) return 0; // should not happen
     Fl_Widget* r = resizable(); if (!r) r = this;
@@ -195,5 +196,5 @@ int Fl_Tile::handle(int event) {
 }
 
 //
-// End of "$Id: Fl_Tile.cxx,v 1.3 1998/10/21 14:20:23 mike Exp $".
+// End of "$Id: Fl_Tile.cxx,v 1.4 1998/12/08 21:04:36 mike Exp $".
 //
diff --git a/src/fl_boxtype.cxx b/src/fl_boxtype.cxx
index f483b2d8e..fe093f6cc 100644
--- a/src/fl_boxtype.cxx
+++ b/src/fl_boxtype.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_boxtype.cxx,v 1.6 1998/12/02 15:47:30 mike Exp $"
+// "$Id: fl_boxtype.cxx,v 1.7 1998/12/08 21:04:37 mike Exp $"
 //
 // Box drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -48,7 +48,7 @@ static uchar inactive_ramp[24] = {
   48, 48, 48, 49,
   49, 49, 50, 50,
   51, 51, 52, 52};
-static int draw_it_active;
+static int draw_it_active = 1;
 uchar *fl_gray_ramp() {return (draw_it_active?active_ramp:inactive_ramp)-'A';}
 
 void fl_frame(const char* s, int x, int y, int w, int h) {
@@ -282,5 +282,5 @@ const {
 }
 
 //
-// End of "$Id: fl_boxtype.cxx,v 1.6 1998/12/02 15:47:30 mike Exp $".
+// End of "$Id: fl_boxtype.cxx,v 1.7 1998/12/08 21:04:37 mike Exp $".
 //
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index dfa8878b6..0a14f5fba 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.cxx,v 1.4 1998/10/21 14:20:48 mike Exp $"
+// "$Id: fl_draw.cxx,v 1.5 1998/12/08 21:04:37 mike Exp $"
 //
 // Label drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -158,7 +158,6 @@ void fl_draw(
     p = e;
   }
 
-  if (align & FL_ALIGN_CLIP) fl_pop_clip();
 }
 
 void fl_draw(
@@ -169,6 +168,7 @@ void fl_draw(
   if (w && h && !fl_not_clipped(x, y, w, h)) return;
   if (align & FL_ALIGN_CLIP) fl_clip(x, y, w, h);
   fl_draw(str, x, y, w, h, align, fl_draw);
+  if (align & FL_ALIGN_CLIP) fl_pop_clip();
 }
 
 void fl_measure(const char* str, int& w, int& h) {
@@ -193,5 +193,5 @@ void fl_measure(const char* str, int& w, int& h) {
 }
 
 //
-// End of "$Id: fl_draw.cxx,v 1.4 1998/10/21 14:20:48 mike Exp $".
+// End of "$Id: fl_draw.cxx,v 1.5 1998/12/08 21:04:37 mike Exp $".
 //
diff --git a/src/fl_symbols.cxx b/src/fl_symbols.cxx
index 00ad19f53..a435423a6 100644
--- a/src/fl_symbols.cxx
+++ b/src/fl_symbols.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_symbols.cxx,v 1.4 1998/12/02 18:55:58 mike Exp $"
+// "$Id: fl_symbols.cxx,v 1.5 1998/12/08 21:04:38 mike Exp $"
 //
 // Symbol drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -158,10 +158,10 @@ int fl_draw_symbol(const char *label,int x,int y,int w,int h,Fl_Color col) {
 #define vv(x,y) fl_vertex(x,y)
 
 static void rectangle(double x,double y,double x2,double y2,Fl_Color c) {
-    fl_color(c);
-    BP; vv(x,y); vv(x2,y); vv(x2,y2); vv(x,y2); EP;
-    fl_color(FL_BLACK);
-    BC; vv(x,y); vv(x2,y); vv(x2,y2); vv(x,y2); EC;
+  fl_color(c);
+  BP; vv(x,y); vv(x2,y); vv(x2,y2); vv(x,y2); EP;
+  //fl_color(FL_BLACK);
+  //BC; vv(x,y); vv(x2,y); vv(x2,y2); vv(x,y2); EC;
 }
 
 /* The drawing routines */
@@ -203,6 +203,7 @@ static void draw_arrowbox(Fl_Color col)
 {
   fl_color(col);
   BP; vv(-0.6,0.8); vv(0.2,0.0); vv(-0.6,-0.8); EP;
+  BC; vv(0.2,0.8); vv(0.6,0.8); vv(0.6,-0.8); vv(0.2,-0.8); EC;
 }
 
 static void draw_bararrow(Fl_Color col)
@@ -247,6 +248,7 @@ static void draw_arrow(Fl_Color col)
 {
   fl_color(col);
   BP; vv(0.65,0.1); vv(1.0,0.0); vv(0.65,-0.1); EP;
+  BL; vv(-1.0,0.0); vv(0.65,0.0); EL;
 }
 
 #if 0
@@ -353,5 +355,5 @@ void Fl::enable_symbols() {
 }
 
 //
-// End of "$Id: fl_symbols.cxx,v 1.4 1998/12/02 18:55:58 mike Exp $".
+// End of "$Id: fl_symbols.cxx,v 1.5 1998/12/08 21:04:38 mike Exp $".
 //