'[1219035] cleanup: miscellaneous' and minor source cleaning.

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

diff --git a/wxPython/demo/EventManager.py b/wxPython/demo/EventManager.py
index 0e99c94b47c93534cdbe8a97717db2aede17ebcc..861fb471a15089d551bb47a47bc06ccc60141ddd 100644 (file)
--- a/wxPython/demo/EventManager.py
+++ b/wxPython/demo/EventManager.py
@@ -9,108 +9,110 @@
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------
 
 # Licence:     wxWindows license
 #---------------------------------------------------------------------------
 

-from wxPython.wx import *
-from wxPython.lib.evtmgr import eventManager
+import  wx
+import  wx.lib.evtmgr   as  em

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

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

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

         self.log = log
 
         fsize    = self.GetFont().GetPointSize()
         self.log = log
 
         fsize    = self.GetFont().GetPointSize()

-        f1 = wxFont(fsize+0, wxSWISS, wxNORMAL, wxNORMAL)
-        f2 = wxFont(fsize+2, wxSWISS, wxNORMAL, wxBOLD)
-        f3 = wxFont(fsize+6, wxSWISS, wxNORMAL, wxBOLD)
+        f1 = wx.Font(fsize+0, wx.SWISS, wx.NORMAL, wx.NORMAL)
+        f2 = wx.Font(fsize+2, wx.SWISS, wx.NORMAL, wx.BOLD)
+        f3 = wx.Font(fsize+6, wx.SWISS, wx.NORMAL, wx.BOLD)

 
 

-        title1 = wxStaticText(self, -1, 'EventManager')
+        title1 = wx.StaticText(self, -1, 'EventManager')

         title1.SetFont(f3)
         txt = """\
         This demo shows  (1) basic uses and features of the EventManager, as well
         as  (2) how it helps with a real-world task: creating independent, object-
         oriented components."""
         title1.SetFont(f3)
         txt = """\
         This demo shows  (1) basic uses and features of the EventManager, as well
         as  (2) how it helps with a real-world task: creating independent, object-
         oriented components."""

-        message0 = wxStaticText(self, -1, txt)
+        message0 = wx.StaticText(self, -1, txt)

         message0.SetFont(f1)
 
         message0.SetFont(f1)
 

-        title2 = wxStaticText(self, -1, 'Event Listeners')
+        title2 = wx.StaticText(self, -1, 'Event Listeners')

         title2.SetFont(f2)
 
         txt = """\
         These objects listen to motion events from the target window, using the ability
         to register one event with multiple listeners.  They also register for mouse events
         on themselves to implement toggle-button functionality."""
         title2.SetFont(f2)
 
         txt = """\
         These objects listen to motion events from the target window, using the ability
         to register one event with multiple listeners.  They also register for mouse events
         on themselves to implement toggle-button functionality."""

-        message1 = wxStaticText(self, -1, txt)
+        message1 = wx.StaticText(self, -1, txt)

         message1.SetFont(f1)
 
         message1.SetFont(f1)
 

-        title3 = wxStaticText(self, -1, 'Target Window')
+        title3 = wx.StaticText(self, -1, 'Target Window')

         title3.SetFont(f2)
 
         txt = """\
         A passive window that's used as an event generator.  Move the mouse over it to
         send events to the listeners above."""
         title3.SetFont(f2)
 
         txt = """\
         A passive window that's used as an event generator.  Move the mouse over it to
         send events to the listeners above."""

-        message2 = wxStaticText(self, -1, txt)
+        message2 = wx.StaticText(self, -1, txt)

         message2.SetFont(f1)
 
         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)
 
             sizer.Add((0,0),1)
 

-        buttonPanel.SetAutoLayout(1)

         buttonPanel.SetSizer(sizer)
         sizer.Fit(buttonPanel)
 
         buttonPanel.SetSizer(sizer)
         sizer.Fit(buttonPanel)
 

-        sizer = wxBoxSizer(wxVERTICAL)
-        sizer.Add(title1,      0, wxALIGN_CENTER | wxTOP | wxBOTTOM, 6)
-        sizer.Add(message0,    0, wxALIGN_CENTER | wxALL, 6)
-        sizer.Add(title2,      0, wxALIGN_CENTER | wxLEFT | wxTOP    | wxRIGHT, 16)
-        sizer.Add(message1,    0, wxALIGN_CENTER | wxALL, 6)
-        sizer.Add(buttonPanel, 0, wxEXPAND       | wxLEFT | wxBOTTOM | wxRIGHT, 16)
-        sizer.Add(title3,      0, wxALIGN_CENTER | wxLEFT | wxRIGHT, 16)
-        sizer.Add(message2,    0, wxALIGN_CENTER | wxALL, 6)
-        sizer.Add(targetPanel, 2, wxEXPAND       | wxLEFT | wxBOTTOM | wxRIGHT, 16)
-        self.SetAutoLayout(1)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(title1,      0, wx.ALIGN_CENTER | wx.TOP | wx.BOTTOM, 6)
+        sizer.Add(message0,    0, wx.ALIGN_CENTER | wx.ALL, 6)
+        sizer.Add(title2,      0, wx.ALIGN_CENTER | wx.LEFT | wx.TOP    | wx.RIGHT, 16)
+        sizer.Add(message1,    0, wx.ALIGN_CENTER | wx.ALL, 6)
+        sizer.Add(buttonPanel, 0, wx.EXPAND       | wx.LEFT | wx.BOTTOM | wx.RIGHT, 16)
+        sizer.Add(title3,      0, wx.ALIGN_CENTER | wx.LEFT | wx.RIGHT, 16)
+        sizer.Add(message2,    0, wx.ALIGN_CENTER | wx.ALL, 6)
+        sizer.Add(targetPanel, 2, wx.EXPAND       | wx.LEFT | wx.BOTTOM | wx.RIGHT, 16)

         self.SetSizer(sizer)
 
 
 
         self.SetSizer(sizer)
 
 
 

-class Tile(wxPanel):
+class Tile(wx.Window):

     """
     This outer class is responsible for changing
     its border color in response to certain mouse
     events over its contained 'InnerTile'.
     """
     """
     This outer class is responsible for changing
     its border color in response to certain mouse
     events over its contained 'InnerTile'.
     """

-    normal = wxColour(150,150,150)
-    active = wxColour(250,245,245)
-    hover  = wxColour(210,220,210)
+    normal = wx.Colour(150,150,150)
+    active = wx.Colour(250,245,245)
+    hover  = wx.Colour(210,220,210)

 
     def __init__(self, parent, log, factor=1, thingToWatch=None, bgColor=None, active=1, size=(38,38), borderWidth=3):
 
     def __init__(self, parent, log, factor=1, thingToWatch=None, bgColor=None, active=1, size=(38,38), borderWidth=3):

-        wxPanel.__init__(self, parent, -1, size=size, style=wxCLIP_CHILDREN)
+        wx.Window.__init__(self, parent, -1, size=size, style=wx.CLIP_CHILDREN)

         self.tile = InnerTile(self, log, factor, thingToWatch, bgColor)
         self.log  = log
         self.tile = InnerTile(self, log, factor, thingToWatch, bgColor)
         self.log  = log

-        sizer = wxBoxSizer(wxHORIZONTAL)
-        sizer.Add(self.tile, 1, wxEXPAND | wxALL, borderWidth)
-        self.SetAutoLayout(1)
+        sizer = wx.BoxSizer(wx.HORIZONTAL)
+        sizer.Add(self.tile, 1, wx.EXPAND | wx.ALL, borderWidth)

         self.SetSizer(sizer)
         self.Layout()
         self.SetSizer(sizer)
         self.Layout()

+        em.eventManager.Register(self.doLayout, wx.EVT_SIZE, self)

         self.SetBackgroundColour(Tile.normal)
         if active:
             # Register myself for mouse events over self.tile in order to
             # create typical button/hyperlink visual effects.
         self.SetBackgroundColour(Tile.normal)
         if active:
             # Register myself for mouse events over self.tile in order to
             # create typical button/hyperlink visual effects.

-            eventManager.Register(self.setHover,  EVT_ENTER_WINDOW, self.tile)
-            eventManager.Register(self.setNormal, EVT_LEAVE_WINDOW, self.tile)
-            eventManager.Register(self.setActive, EVT_LEFT_DOWN,    self.tile)
-            eventManager.Register(self.setHover,  EVT_LEFT_UP,      self.tile)
+            em.eventManager.Register(self.setHover,  wx.EVT_ENTER_WINDOW, self.tile)
+            em.eventManager.Register(self.setNormal, wx.EVT_LEAVE_WINDOW, self.tile)
+            em.eventManager.Register(self.setActive, wx.EVT_LEFT_DOWN,    self.tile)
+            em.eventManager.Register(self.setHover,  wx.EVT_LEFT_UP,      self.tile)

 
 
 
 

+    def doLayout(self, event):
+        self.Layout()
+        
+

     def setHover(self, event):
         self.SetBackgroundColour(Tile.hover)
         self.Refresh()
     def setHover(self, event):
         self.SetBackgroundColour(Tile.hover)
         self.Refresh()


@@ -127,11 +129,11 @@ class Tile(wxPanel):
 
 
 
 
 
 

-class InnerTile(wxPanel):
-    IDLE_COLOR  = wxColour( 80, 10, 10)
-    START_COLOR = wxColour(200, 70, 50)
-    FINAL_COLOR = wxColour( 20, 80,240)
-    OFF_COLOR   = wxColour(185,190,185)
+class InnerTile(wx.Window):
+    IDLE_COLOR  = wx.Colour( 80, 10, 10)
+    START_COLOR = wx.Colour(200, 70, 50)
+    FINAL_COLOR = wx.Colour( 20, 80,240)
+    OFF_COLOR   = wx.Colour(185,190,185)

     # Some pre-computation.
     DELTAS            = map(lambda a,b: b-a, START_COLOR.Get(), FINAL_COLOR.Get())
     START_COLOR_TUPLE = START_COLOR.Get()
     # Some pre-computation.
     DELTAS            = map(lambda a,b: b-a, START_COLOR.Get(), FINAL_COLOR.Get())
     START_COLOR_TUPLE = START_COLOR.Get()


@@ -141,7 +143,7 @@ class InnerTile(wxPanel):
     events over the 'thingToWatch'.
     """
     def __init__(self, parent, log, factor, thingToWatch=None, bgColor=None):
     events over the 'thingToWatch'.
     """
     def __init__(self, parent, log, factor, thingToWatch=None, bgColor=None):

-        wxPanel.__init__(self, parent, -1)
+        wx.Window.__init__(self, parent, -1)

         self.log=log
         if bgColor:
             self.SetBackgroundColour(bgColor)
         self.log=log
         if bgColor:
             self.SetBackgroundColour(bgColor)


@@ -151,16 +153,16 @@ class InnerTile(wxPanel):
             self.state        = 0
             self.toggleOnOff()
             # Watch for the mouse click to enable/disable myself.
             self.state        = 0
             self.toggleOnOff()
             # Watch for the mouse click to enable/disable myself.

-            eventManager.Register(self.toggleOnOff, EVT_LEFT_UP, self)
+            em.eventManager.Register(self.toggleOnOff, wx.EVT_LEFT_UP, self)

 
 
     def toggleOnOff(self, event=None):
         # Implement being on or off by registering and
         # de-registering self.makeColor() from the event manager.
         if self.state:
 
 
     def toggleOnOff(self, event=None):
         # Implement being on or off by registering and
         # de-registering self.makeColor() from the event manager.
         if self.state:

-            eventManager.DeregisterListener(self.makeColor)
+            em.eventManager.DeregisterListener(self.makeColor)

         else:
         else:

-            eventManager.Register(self.makeColor, EVT_MOTION, self.thingToWatch)
+            em.eventManager.Register(self.makeColor, wx.EVT_MOTION, self.thingToWatch)

         self.state = 1 - self.state
         self.resetColor()
 
         self.state = 1 - self.state
         self.resetColor()
 


@@ -188,7 +190,7 @@ class InnerTile(wxPanel):
         r = InnerTile.START_COLOR_TUPLE[0] + (InnerTile.DELTAS[0] * percent)
         g = InnerTile.START_COLOR_TUPLE[1] + (InnerTile.DELTAS[1] * percent)
         b = InnerTile.START_COLOR_TUPLE[2] + (InnerTile.DELTAS[2] * percent)
         r = InnerTile.START_COLOR_TUPLE[0] + (InnerTile.DELTAS[0] * percent)
         g = InnerTile.START_COLOR_TUPLE[1] + (InnerTile.DELTAS[1] * percent)
         b = InnerTile.START_COLOR_TUPLE[2] + (InnerTile.DELTAS[2] * percent)

-        self.setColor(wxColour(int(r), int(g), int(b)))
+        self.setColor(wx.Colour(int(r), int(g), int(b)))

 
 
 
 
 
 


@@ -283,5 +285,5 @@ by Robb Shecter (robb@acm.org)
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])