From 6e07be71ed238c9919a024266a1b7c9dbcaf3570 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Thu, 13 Oct 2005 05:48:16 +0000
Subject: [PATCH] fix bootstrap problems

---
 library/inference/split-nodes.factor | 4 ++--
 library/opengl/load.factor           | 2 +-
 library/ui/labels.factor             | 2 +-
 library/ui/load.factor               | 1 -
 library/ui/paint.factor              | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/library/inference/split-nodes.factor b/library/inference/split-nodes.factor
index 3c792b74b8..01e7f30a2e 100644
--- a/library/inference/split-nodes.factor
+++ b/library/inference/split-nodes.factor
@@ -1,5 +1,5 @@
 IN: optimizer
-USING: inference kernel sequences words ;
+USING: inference kernel lists sequences words ;
 
 ! #if --> X
 !   |
@@ -40,7 +40,7 @@ M: node split-node* ( node -- ) drop ;
 : inline-literals ( node literals -- node )
     #! Make #push -> #return -> successor
     over drop-inputs [
-        >r [ literalize ] map dataflow [ subst-node ] keep
+        >r >list [ literalize ] map dataflow [ subst-node ] keep
         r> set-node-successor
     ] keep ;
 
diff --git a/library/opengl/load.factor b/library/opengl/load.factor
index fd5bd2e489..6a39f41aed 100644
--- a/library/opengl/load.factor
+++ b/library/opengl/load.factor
@@ -1,9 +1,9 @@
 USING: io kernel parser sequences ;
 
 [
-    "/library/opengl/sdl-gl.factor"
     "/library/opengl/gl.factor"
     "/library/opengl/glu.factor"
+    "/library/opengl/opengl-utils.factor"
 ] [
     dup print run-resource
 ] each
diff --git a/library/ui/labels.factor b/library/ui/labels.factor
index d01c8f4b70..c202e2184e 100644
--- a/library/ui/labels.factor
+++ b/library/ui/labels.factor
@@ -21,7 +21,7 @@ M: label pref-dim ( label -- dim )
     dup label-text label-size ;
 
 M: label draw-gadget* ( label -- )
-    drop ; ! dup delegate draw-gadget* dup label-text draw-string ;
+    dup delegate draw-gadget* drop ; ! label-text draw-string ;
 
 M: label set-message ( string/f label -- )
     >r [ "" ] unless* r> set-label-text* ;
diff --git a/library/ui/load.factor b/library/ui/load.factor
index e46eedb8e9..f80e914419 100644
--- a/library/ui/load.factor
+++ b/library/ui/load.factor
@@ -1,6 +1,5 @@
 USING: kernel parser sequences io ;
 [
-    "/library/ui/opengl.factor"
     "/library/ui/freetype.factor"
     "/library/ui/gadgets.factor"
     "/library/ui/layouts.factor"
diff --git a/library/ui/paint.factor b/library/ui/paint.factor
index df39318719..db0425e39a 100644
--- a/library/ui/paint.factor
+++ b/library/ui/paint.factor
@@ -80,10 +80,10 @@ TUPLE: solid ;
 
 ! Solid pen
 M: solid draw-interior
-    drop dup rect-dim swap bg gl-box ;
+    drop dup rect-dim swap bg gl-fill-rect ;
 
 M: solid draw-boundary
-    drop dup rect-dim @{ 1 1 0 }@ v- swap fg gl-rectangle ;
+    drop dup rect-dim @{ 1 1 0 }@ v- swap fg gl-rect ;
 
 ! Rollover only
 TUPLE: rollover-only ;