wxUniversal fixes:

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

diff --git a/wxPython/demo/viewer_basics.py b/wxPython/demo/viewer_basics.py
index fe71140ec35e46652a6ac16ee3c0068b61af7385..1dca97130dd2f77d67cfe2dc165a42cd1d49251c 100644 (file)
--- a/wxPython/demo/viewer_basics.py
+++ b/wxPython/demo/viewer_basics.py
@@ -20,42 +20,50 @@ class VtkFrame(wxFrame):
         coneActor = vtk.vtkActor()
         coneActor.SetMapper(coneMapper)
         ren.AddActor(coneActor)
         coneActor = vtk.vtkActor()
         coneActor.SetMapper(coneMapper)
         ren.AddActor(coneActor)

+

 #---------------------------------------------------------------------------
 wxEVT_ADD_CONE = 25015
 
 def EVT_ADD_CONE(win, func):
     win.Connect(-1, -1, wxEVT_ADD_CONE, func)
 
 #---------------------------------------------------------------------------
 wxEVT_ADD_CONE = 25015
 
 def EVT_ADD_CONE(win, func):
     win.Connect(-1, -1, wxEVT_ADD_CONE, func)
 

+

 class AddCone(wxPyEvent):
     def __init__(self):
         wxPyEvent.__init__(self)
         self.SetEventType(wxEVT_ADD_CONE)
 
 class AddCone(wxPyEvent):
     def __init__(self):
         wxPyEvent.__init__(self)
         self.SetEventType(wxEVT_ADD_CONE)
 

+

 class HiddenCatcher(wxFrame):
     """
         The "catcher" frame in the second thread.
         It is invisible.  It's only job is to receive
 class HiddenCatcher(wxFrame):
     """
         The "catcher" frame in the second thread.
         It is invisible.  It's only job is to receive

-        Events from the main thread, and create 
+        Events from the main thread, and create

         the appropriate windows.
         the appropriate windows.

-    """ 
+    """

     def __init__(self):
     def __init__(self):

-        wxFrame.__init__(self, NULL,-1,'')        
+        wxFrame.__init__(self, None, -1, '')

         EVT_ADD_CONE(self, self.AddCone)
 
         EVT_ADD_CONE(self, self.AddCone)
 

-    def AddCone(self,evt): 
+    def AddCone(self,evt):

         add_cone()
         add_cone()

+
+

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

+

 class SecondThreadApp(wxApp):
     """
         wxApp that lives in the second thread.
 class SecondThreadApp(wxApp):
     """
         wxApp that lives in the second thread.

-    """    
+    """

     def OnInit(self):
         catcher = HiddenCatcher()
         #self.SetTopWindow(catcher)
         self.catcher =catcher
         return true
     def OnInit(self):
         catcher = HiddenCatcher()
         #self.SetTopWindow(catcher)
         self.catcher =catcher
         return true

+

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

-def add_cone(): 
-   frame = VtkFrame(NULL, -1, "Cone")
+def add_cone():
+   frame = VtkFrame(None, -1, "Cone")

    frame.Show(true)
    frame.Show(true)

+