From d289a9f9ae6c0bf873f5c400194ee4c9ef4839f4 Mon Sep 17 00:00:00 2001
From: gregw <>
Date: Tue, 13 Mar 2001 01:38:00 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/gui/Button.py         | 1 +
 direct/src/gui/ScrollingLabel.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/direct/src/gui/Button.py b/direct/src/gui/Button.py
index 0c5edcec5d..7ab61d6f09 100644
--- a/direct/src/gui/Button.py
+++ b/direct/src/gui/Button.py
@@ -130,3 +130,4 @@ class Button(DirectObject):
             v3 = Vec3(mat.xformPoint(Point3(x, 0., y)))
             
         self.button.setPos(v3)
+
diff --git a/direct/src/gui/ScrollingLabel.py b/direct/src/gui/ScrollingLabel.py
index b2c144112a..ac36ec4062 100644
--- a/direct/src/gui/ScrollingLabel.py
+++ b/direct/src/gui/ScrollingLabel.py
@@ -137,12 +137,16 @@ class ScrollingLabel(PandaObject.PandaObject):
         return self.frame.getPos()
     
     def setPos(self, x, y):
+        self.frame.freeze()
         self.frame.setPos(x, y)
         self.frame.recompute()
-
+        self.frame.thaw()
+        
     def setScale(self, scale):
+        self.frame.freeze()
         self.frame.setScale(scale)
         self.frame.recompute()
+        self.frame.thaw()
 
     def getKeyFocus(self):
         return self.keyFocus