Merge pull request enthought#96 from enthought/fix-examples

Fix traitsui examples.

examples/demo/Advanced/Apply_Revert_handler_demo.py

@@ -69,7 +69,6 @@ class ApplyRevertDemo(HasTraits):
         height = 300,
         title   = 'Apply/Revert example',
         buttons = [ 'Apply', 'Revert' ],
-        kind    = 'modal',
         handler = ApplyRevert_Handler
     )
 

examples/tutorials/doc_examples/examples/enum_editor.py

@@ -24,3 +24,5 @@ class EnumExample(HasTraits):
                           'Low'     : '4:Low',
                           'Lowest'  : '5:Lowest', })))
 
+
+EnumExample().configure_traits()

examples/tutorials/doc_examples/examples/include_extra.py

@@ -3,18 +3,14 @@
 
 # include_extra.py --- Example of Include object
 #                      provided for subclasses
-from traits.api import HasTraits, Int, Str, Trait
+from traits.api import HasTraits, Int, Str
 from traitsui.api import Group, Include, View
-import traitsui
 
 class Person(HasTraits):
     name = Str
     age = Int
 
-    person_view = View('name', Include('extra'), 'age',
-                       kind='livemodal')
-
-Person().configure_traits()
+    person_view = View('name', Include('extra'), 'age')
 
 class LocatedPerson(Person):
     street = Str
@@ -24,5 +20,6 @@ class LocatedPerson(Person):
 
     extra = Group('street', 'city', 'state', 'zip')
 
-LocatedPerson().configure_traits()
 
+Person().configure_traits()
+LocatedPerson().configure_traits()

examples/tutorials/doc_examples/examples/override_editor.py

@@ -3,11 +3,11 @@
 
 # override_editor.py --- Example of overriding a trait
 #                        editor
-from traits.api import HasTraits, Trait
-import traitsui
+from traits.api import HasTraits, Trait, Color
 from traitsui.api import ColorEditor
-from wxPython import wx
 
 class Polygon(HasTraits):
-    line_color = Trait(wx.wxColour(0, 0, 0),
+    line_color = Trait(Color((0, 0, 0)),
                        editor=ColorEditor())
+
+Polygon().configure_traits()

examples/tutorials/doc_examples/examples/tree_editor.py

@@ -11,10 +11,14 @@
            HGroup, Handler, Group
 from traitsui.menu \
     import Menu, Action, Separator
-from traitsui.wx.tree_editor \
-    import NewAction, CopyAction, CutAction, \
-           PasteAction, DeleteAction, RenameAction
-
+try:
+    from traitsui.wx.tree_editor \
+        import NewAction, CopyAction, CutAction, \
+            PasteAction, DeleteAction, RenameAction
+except RuntimeError:
+    from traitsui.qt4.tree_editor \
+        import NewAction, CopyAction, CutAction, \
+            PasteAction, DeleteAction, RenameAction
 #--[Code]-----------------------------------------------------------------------
 
 # DATA CLASSES

examples/tutorials/doc_examples/examples/view_attributes.py

@@ -5,7 +5,6 @@
 #                        attribute of a class
 from traits.api import HasTraits, Int, Str, Trait
 from traitsui.api import View
-import traitsui
 
 class Person(HasTraits):
     first_name = Str

examples/tutorials/doc_examples/examples/view_standalone.py

@@ -6,7 +6,6 @@
 import wx
 from traits.api import HasTraits, Int, Str, Trait
 from traitsui.api import View
-import traitsui
 
 class Person(HasTraits):
     first_name = Str
@@ -38,4 +37,3 @@ def OnInit ( self ):
 
 #  Main program:
 TraitApp( bill, person_view )
-

examples/tutorials/doc_examples/examples/wizard.py

@@ -2,8 +2,7 @@
 #  License: BSD Style.
 
 # wizard.py ---Example of a traits-based wizard UI
-from traits.api import HasTraits, Int, Str, Trait
-import traitsui
+from traits.api import HasTraits, Int, Str
 
 class Person(HasTraits):
     name = Str
@@ -14,4 +13,4 @@ class Person(HasTraits):
     pcode = Str
 
 bill = Person()
-bill.configure_traits(kind='modal')
+bill.configure_traits()

examples/tutorials/traitsui_4.0/buttons.py

@@ -76,3 +76,6 @@ def _get_sum ( self ):
 
 popup = Adder()
 
+
+if __name__ == '__main__':
+    popup.configure_traits()

examples/tutorials/traitsui_4.0/deferred.py

@@ -63,3 +63,6 @@ def _go_changed ( self ):
 
 demo = Count()
 
+
+if __name__ == '__main__':
+    demo.configure_traits()

examples/tutorials/traitsui_4.0/items.py

@@ -261,3 +261,6 @@ def _team_changed ( self, team ):
             teams = [ blue_birds, chicken_hawks, eagles ] )
 )
 
+
+if __name__ == '__main__':
+    demo.configure_traits()

examples/tutorials/traitsui_4.0/model_view.py

@@ -150,3 +150,6 @@ def _get_family ( self ):
 # Create the controller for the model:
 demo = ChildModelView( model = son )
 
+
+if __name__ == '__main__':
+    demo.configure_traits()

examples/tutorials/tutor.py

@@ -57,8 +57,11 @@
 
     from traitsui.wx.extra.windows.flash_editor \
         import FlashEditor
+    wx_available = True
 except:
-    IEHTMLEditor = FlashEditor = None
+    IEHTMLEditor = HTMLEditor
+    FlashEditor = ValueEditor # Set this to a random editor to prevent error.
+    wx_available = False
 
 #-------------------------------------------------------------------------------
 #  Constants:
@@ -1312,7 +1315,7 @@ def _add_rst_item ( self, path ):
     def _add_swf_item ( self, path ):
         """ Creates a description item for a Flash file.
         """
-        if is_windows:
+        if is_windows and wx_available:
             self.descriptions.append( FlashItem( path = path ) )
 
     def _add_mov_item ( self, path ):
@@ -1473,7 +1476,7 @@ def _add_description ( self, lines, title ):
                                         settings_overrides = settings )
 
         # Choose the right HTML renderer:
-        if is_windows:
+        if is_windows and wx_available:
             item = IEHTMLStrItem( content = html, title = title )
         else:
             item = HTMLStrItem( content = html, title = title )
@@ -1485,7 +1488,7 @@ def _create_html_item ( self, **traits ):
         """ Creates a platform specific html item and adds it to the list of
             descriptions.
         """
-        if is_windows:
+        if is_windows and wx_available:
             item = IEHTMLItem( **traits )
         else:
             item = HTMLItem( **traits )