diff --git a/direct/src/gui/OnscreenPanel.py b/direct/src/gui/OnscreenPanel.py index b05c5fe110..00d35f8deb 100644 --- a/direct/src/gui/OnscreenPanel.py +++ b/direct/src/gui/OnscreenPanel.py @@ -1,5 +1,5 @@ from ShowBaseGlobal import * -from GuiGlobals import * +import GuiGlobals import PandaObject import Button import Label @@ -58,10 +58,10 @@ class OnscreenPanel(PandaObject.PandaObject, NodePath): def makePanel(self, rect = (-0.5, 0.5, -0.5, 0.5), bg = (1, 1, 1, 1), - geom = getDefaultPanel(), + geom = GuiGlobals.getDefaultPanel(), geomRect = (-0.5, 0.5, -0.5, 0.5), drawOrder = 0, - font = getDefaultFont(), + font = GuiGlobals.getDefaultFont(), support3d = 0): """makePanel() diff --git a/direct/src/gui/OnscreenText.py b/direct/src/gui/OnscreenText.py index 53098b860c..1503afdfca 100644 --- a/direct/src/gui/OnscreenText.py +++ b/direct/src/gui/OnscreenText.py @@ -1,7 +1,7 @@ """OnscreenText module: contains the OnscreenText class""" from PandaObject import * -from GuiGlobals import * +import GuiGlobals import types ## These are the styles of text we might commonly see. They set the @@ -26,8 +26,8 @@ class OnscreenText(PandaObject, NodePath): frame = None, align = None, wordwrap = None, - drawOrder = getDefaultDrawOrder(), - font = getDefaultFont(), + drawOrder = GuiGlobals.getDefaultDrawOrder(), + font = GuiGlobals.getDefaultFont(), parent = aspect2d): """__init__(self, ...)