فهرست منبع

Fixing windows-specific code

Josh Yelon 20 سال پیش
والد
کامیت
1d1b4a3e8d
3فایلهای تغییر یافته به همراه5 افزوده شده و 9 حذف شده
  1. 1 3
      direct/src/tkwidgets/Floater.py
  2. 1 3
      direct/src/tkwidgets/Slider.py
  3. 3 3
      doc/SceneEditor/seParticlePanel.py

+ 1 - 3
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),

+ 1 - 3
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

+ 3 - 3
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())