From 574abe45794f7abcb5ad1972cb043a158ebecde0 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sun, 13 Sep 2009 12:10:56 +0000
Subject: [PATCH] reverted Fl_Pack changes (STR #2130), because they were
 wrong. The current implementation of Fl_Pack doesn't know the bounding box of
 the children in advance and thus can't clip its children.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6868 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES         | 1 -
 src/Fl_Pack.cxx | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6f47e4ea7..362ec759e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
 CHANGES IN FLTK 1.1.10
 
-	- Fl_Pack didn't obey clip_children() (STR #2130)
 	- Updated mirror sites in documentation (STR #2220)
 	- Setting a default font for Xft (STR #2216)
 	- Temporarily limited builds to 32-bit on OX S to stay
diff --git a/src/Fl_Pack.cxx b/src/Fl_Pack.cxx
index 4cf778417..957f28544 100644
--- a/src/Fl_Pack.cxx
+++ b/src/Fl_Pack.cxx
@@ -70,9 +70,6 @@ void Fl_Pack::draw() {
         rh += spacing_;
       }
   }
-
-  if (clip_children()) fl_push_clip(tx,ty,tw,th);
-
   for (int i = children(); i--;) {
     Fl_Widget* o = *a++;
     if (o->visible()) {
@@ -118,9 +115,7 @@ void Fl_Pack::draw() {
       current_position += spacing_;
     }
   }
-
-  if (clip_children()) fl_pop_clip();
-
+  
   if (horizontal()) {
     if (maximum_position < tx+tw && box()) {
       fl_color(color());