*** empty log message ***

This commit is contained in:
Mark Mine 2002-02-09 02:26:33 +00:00
parent 4ecb0b5d0b
commit 65d0c69b14
6 changed files with 14 additions and 25 deletions

View File

@ -908,9 +908,6 @@ class Actor(PandaObject, NodePath):
# actions
def animPanel(self):
base.wantDIRECT = 1
base.wantTk = 1
from ShowBaseGlobal import *
import TkGlobal
import AnimPanel
return AnimPanel.AnimPanel(self)

View File

@ -6,7 +6,7 @@ from PandaModules import *
ANALOG_MIN = -0.95
ANALOG_MAX = 0.95
ANALOG_RANGE = ANALOG_MAX - ANALOG_MIN
ANALOG_DEADBAND = 0.075
ANALOG_DEADBAND = 0.125
try:
myBase = base

View File

@ -165,7 +165,7 @@ class DirectSession(PandaObject):
'mouse3', 'mouse3-up']
if base.wantTk:
from TkGlobal import tkroot
import TkGlobal
self.panel = DirectSessionPanel(parent = tkroot)
if self.iAmAServer:

View File

@ -785,42 +785,37 @@
return self.__lerp(functorFunc, time, blendType)
def place(self):
base.wantDIRECT = 1
base.wantTk = 1
#from ShowBaseGlobal import *
#from DirectSession import *
import TkGlobal
base.wantDIRECT = 1
import DirectSession
direct.enable()
import Placer
return Placer.place(self)
def explore(self):
base.wantDIRECT = 1
base.wantTk = 1
#from ShowBaseGlobal import *
base.wantDIRECT = 1
import TkGlobal
import SceneGraphExplorer
return SceneGraphExplorer.explore(self)
def rgbPanel(self, cb = None):
base.wantDIRECT = 1
base.wantTk = 1
#from ShowBaseGlobal import *
base.wantDIRECT = 1
import TkGlobal
import EntryScale
return EntryScale.rgbPanel(self, cb)
def select(self):
base.wantDIRECT = 1
base.wantTk = 1
#from ShowBaseGlobal import *
import TkGlobal
base.wantDIRECT = 1
import DirectSession
direct.select(self)
def deselect(self):
base.wantDIRECT = 1
base.wantTk = 1
#from ShowBaseGlobal import *
import TkGlobal
base.wantDIRECT = 1
import DirectSession
direct.deselect(self)
def setAlphaScale(self, alpha):

View File

@ -169,12 +169,11 @@ class Interval(DirectObject):
""" popupControls()
Popup control panel for interval.
"""
base.wantTk = 1
import TkGlobal
import fpformat
import string
# I moved this here because Toontown does not ship Tk
from Tkinter import Toplevel, Frame, Button
from Tkinter import Toplevel, Frame, Button, LEFT, X
import Pmw
import EntryScale
if tl == None:

View File

@ -292,21 +292,19 @@ def adjust(command = None, parent = None, **kw):
10.0
"""
# Make sure we enable Tk
base.wantDIRECT = 1
base.wantTk = 1
import TkGlobal
import Tkinter
import EntryScale
import Pmw
# Create toplevel if needed
if not parent:
parent = Toplevel()
parent = Tkinter.Toplevel()
parent.title('Parameter Adjust')
# Set command if specified
if command:
kw['command'] = command
es = apply(EntryScale.EntryScale, (parent,), kw)
es.pack(expand = 1, fill = X)
es.pack(expand = 1, fill = 'x')
es.parent = parent
return es