Cleanup

[wxWidgets.git] / wxPython / demo / EventManager.py

diff --git a/wxPython/demo/EventManager.py b/wxPython/demo/EventManager.py
index b492ecc59936b42f0b59b3c68c64dbf027c0228e..8d77084aa7cf25707b504ac61c64741d3a4f51f8 100644 (file)
--- a/wxPython/demo/EventManager.py
+++ b/wxPython/demo/EventManager.py
@@ -8,16 +8,6 @@
 # Copyright:   (c) 2002 by Robb Shecter (robb@acm.org)
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------
 # Copyright:   (c) 2002 by Robb Shecter (robb@acm.org)
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------

-#
-# 11/22/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 11/25/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o What happened to wx.Color()?
-# 
-

 
 import  wx
 import  wx.lib.evtmgr   as  em
 
 import  wx
 import  wx.lib.evtmgr   as  em


@@ -62,16 +52,16 @@ class TestPanel(wx.Panel):
         message2 = wx.StaticText(self, -1, txt)
         message2.SetFont(f1)
 
         message2 = wx.StaticText(self, -1, txt)
         message2.SetFont(f1)
 

-        targetPanel = Tile(self, log, bgColor=wxColour(80,10,10), active=0)
-        buttonPanel = wxPanel(self ,-1)
-        sizer       = wxBoxSizer(wxHORIZONTAL)
+        targetPanel = Tile(self, log, bgColor=wx.Colour(80,10,10), active=0)
+        buttonPanel = wx.Panel(self ,-1)
+        sizer       = wx.BoxSizer(wx.HORIZONTAL)

         target      = targetPanel.tile
 
         sizer.Add((0,0), 1)
         for factor in [0.2, 0.3, 0.4, 0.5, 0.6, 0.7]:
         target      = targetPanel.tile
 
         sizer.Add((0,0), 1)
         for factor in [0.2, 0.3, 0.4, 0.5, 0.6, 0.7]:

-            sizer.Add(Tile(buttonPanel, log, factor-0.05, target), 0, wxALIGN_CENTER)
+            sizer.Add(Tile(buttonPanel, log, factor-0.05, target), 0, wx.ALIGN_CENTER)

             sizer.Add((0,0),1)
             sizer.Add((0,0),1)

-            sizer.Add(Tile(buttonPanel, log, factor,      target), 0, wxALIGN_CENTER)
+            sizer.Add(Tile(buttonPanel, log, factor,      target), 0, wx.ALIGN_CENTER)

             sizer.Add((0,0),1)
 
         buttonPanel.SetAutoLayout(1)
             sizer.Add((0,0),1)
 
         buttonPanel.SetAutoLayout(1)


@@ -137,7 +127,7 @@ class Tile(wx.Panel):
 
 
 
 
 
 

-class InnerTile(wxPanel):
+class InnerTile(wx.Panel):

     IDLE_COLOR  = wx.Colour( 80, 10, 10)
     START_COLOR = wx.Colour(200, 70, 50)
     FINAL_COLOR = wx.Colour( 20, 80,240)
     IDLE_COLOR  = wx.Colour( 80, 10, 10)
     START_COLOR = wx.Colour(200, 70, 50)
     FINAL_COLOR = wx.Colour( 20, 80,240)