From 2bbd8ee2ccf61e136dcdc6d51557566f8fa7f909 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 9 Mar 2001 02:47:09 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/gui/Button.py        | 10 ++++++++--
 direct/src/gui/Chooser.py       |  2 +-
 direct/src/gui/GuiGlobals.py    |  2 +-
 direct/src/showbase/ShowBase.py |  3 ---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/direct/src/gui/Button.py b/direct/src/gui/Button.py
index 2709161be1..23cafb78c9 100644
--- a/direct/src/gui/Button.py
+++ b/direct/src/gui/Button.py
@@ -88,8 +88,12 @@ class Button(DirectObject):
         self.l3.thaw()
         self.button.thaw()
         
-    def manage(self):
-        self.button.manage(guiMgr, base.eventMgr.eventHandler)
+    def manage(self, nodepath = None):
+        if nodepath:
+            self.button.manage(guiMgr, base.eventMgr.eventHandler,
+                               nodepath.node())
+        else:
+            self.button.manage(guiMgr, base.eventMgr.eventHandler)
         self.managed = 1
 
     def unmanage(self):
@@ -108,3 +112,5 @@ class Button(DirectObject):
     def setScale(self, scale):
         self.button.setScale(scale)
 
+    def setDrawOrder(self, drawOrder):
+        self.button.setDrawOrder(drawOrder)
diff --git a/direct/src/gui/Chooser.py b/direct/src/gui/Chooser.py
index a262668678..4fba1b9146 100644
--- a/direct/src/gui/Chooser.py
+++ b/direct/src/gui/Chooser.py
@@ -4,7 +4,7 @@ import GuiChooser
 import GuiManager
 import GuiButton
 
-guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node(), base.renderGui.node())
+guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node(), base.render2d.node())
 
 class Chooser(DirectObject):
 
diff --git a/direct/src/gui/GuiGlobals.py b/direct/src/gui/GuiGlobals.py
index da3379cf35..0b60ab73ac 100644
--- a/direct/src/gui/GuiGlobals.py
+++ b/direct/src/gui/GuiGlobals.py
@@ -4,7 +4,7 @@ from ShowBaseGlobal import *
 import GuiManager
 
 guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node(),
-                                      base.renderGui.node())
+                                      base.render2d.node())
 
 font = loader.loadModelNode("models/fonts/ttf-comic")
 
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 7e86e946de..77307f52e3 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -92,9 +92,6 @@ class ShowBase:
         self.a2dLeft = -self.aspectRatio
         self.a2dRight = self.aspectRatio
 
-        # Set up another 2-d layer for drawing the Gui labels themselves.
-        self.renderGui = NodePath(setupPanda2d(self.win, "renderGui"))
-
         # Set up an auxiliary 3-d layer for rendering floating heads
         # or other 3-d objects on top of text or widgets in the 2-d
         # layer.  We set it up with a camera that specifically shares