From 1d1b4a3e8d293a440eab38436f343d9830346942 Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Mon, 20 Jun 2005 19:46:50 +0000 Subject: [PATCH] Fixing windows-specific code --- direct/src/tkwidgets/Floater.py | 4 +--- direct/src/tkwidgets/Slider.py | 4 +--- doc/SceneEditor/seParticlePanel.py | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py index 41c671973b..1679656898 100644 --- a/direct/src/tkwidgets/Floater.py +++ b/direct/src/tkwidgets/Floater.py @@ -45,15 +45,13 @@ class FloaterWidget(Pmw.MegaWidget): def __init__(self, parent = None, **kw): #define the megawidget options INITOPT = Pmw.INITOPT - SystemButtonFace = 'Grey' - if (sys.platform == "win32"): SystemButtonFace='SystemButtonFace' optiondefs = ( # Appearance ('width', FLOATER_WIDTH, INITOPT), ('height', FLOATER_HEIGHT, INITOPT), ('relief', RAISED, self.setRelief), ('borderwidth', 2, self.setBorderwidth), - ('background', SystemButtonFace, self.setBackground), + ('background', 'grey75', self.setBackground), # Behavior # Initial value of floater, use self.set to change value ('value', 0.0, INITOPT), diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py index 7cf0c20353..f19c8f502b 100644 --- a/direct/src/tkwidgets/Slider.py +++ b/direct/src/tkwidgets/Slider.py @@ -83,14 +83,12 @@ class SliderWidget(Pmw.MegaWidget): # Define the megawidget options. INITOPT = Pmw.INITOPT - SystemButtonFace = 'Grey' - if (sys.platform == "win32"): SystemButtonFace='SystemButtonFace' optiondefs = ( # Appearance ('style', VALUATOR_MINI, INITOPT), ('relief', RAISED, self.setRelief), ('borderwidth', 2, self.setBorderwidth), - ('background', SystemButtonFace, self.setBackground), + ('background', 'grey75', self.setBackground), ('fliparrow', 0, INITOPT), # Behavior # Bounds diff --git a/doc/SceneEditor/seParticlePanel.py b/doc/SceneEditor/seParticlePanel.py index b381893aae..911db053da 100644 --- a/doc/SceneEditor/seParticlePanel.py +++ b/doc/SceneEditor/seParticlePanel.py @@ -1613,7 +1613,7 @@ class ParticlePanel(AppShell): self.rendererSpriteTextureEntry['state'] = 'normal' self.rendererSpriteFileEntry['state'] = 'disabled' self.rendererSpriteNodeEntry['state'] = 'disabled' - self.rendererSpriteTextureEntry['background'] = 'SystemWindow' + self.rendererSpriteTextureEntry['background'] = '#FFFFFF' self.rendererSpriteFileEntry['background'] = '#C0C0C0' self.rendererSpriteNodeEntry['background'] = '#C0C0C0' else: @@ -1621,8 +1621,8 @@ class ParticlePanel(AppShell): self.rendererSpriteFileEntry['state'] = 'normal' self.rendererSpriteNodeEntry['state'] = 'normal' self.rendererSpriteTextureEntry['background'] = '#C0C0C0' - self.rendererSpriteFileEntry['background'] = 'SystemWindow' - self.rendererSpriteNodeEntry['background'] = 'SystemWindow' + self.rendererSpriteFileEntry['background'] = '#FFFFFF' + self.rendererSpriteNodeEntry['background'] = '#FFFFFF' def setRendererSpriteTexture(self): if self.rendererSpriteSourceType.get() == SpriteParticleRenderer.STTexture: self.particles.renderer.setTextureFromFile(self.rendererSpriteTexture.get())