Deprecate __init__ methods which create the widget

pyface/ui/wx/grid/grid.py

@@ -10,8 +10,9 @@
 
 """ A grid control with a model/ui architecture. """
 
-
 import sys
+import warnings
+
 import wx
 import wx.lib.gridmovers as grid_movers
 from os.path import abspath, exists
@@ -165,15 +166,26 @@ def __init__(self, parent, **traits):
         'parent' is the toolkit-specific control that is the grid's parent.
 
         """
+        create = traits.pop('create', True)
 
         # Base class constructors.
-        super().__init__(**traits)
+        super().__init__(parent=parent, **traits)
+        if create:
+            self.create()
+            warnings.warn(
+                "automatic widget creation is deprecated and will be removed "
+                "in a future Pyface version, use create=False and explicitly "
+                "call create() for future behaviour",
+                PendingDeprecationWarning,
+            )
+
+    def _create_control(self, parent):
 
         # Flag set when columns are resizing:
         self._user_col_size = False
 
         # Create the toolkit-specific control.
-        self.control = self._grid = grid = wxGrid(parent, -1)
+        self._grid = grid = wxGrid(parent, -1)
         grid.grid = self
 
         self._moveTo = None
@@ -328,6 +340,7 @@ def __init__(self, parent, **traits):
 
         self._edit = False
         grid.Bind(wx.EVT_IDLE, self._on_idle)
+        return grid
 
     def dispose(self):
         # Remove all wx handlers:

pyface/ui/wx/image_button.py

@@ -14,11 +14,12 @@
     toolbar button.
 """
 
-
+import warnings
 import wx
+
 from numpy import array, frombuffer, reshape, ravel, dtype
 
-from traits.api import Bool, Str, Range, Enum, Instance, Event
+from traits.api import Any, Bool, Str, Range, Enum, Instance, Event
 
 from pyface.ui_traits import Orientation
 from .widget import Widget
@@ -78,29 +79,43 @@ class ImageButton(Widget):
     # Fired when a 'button' or 'toolbar' style control is clicked:
     clicked = Event()
 
+    _image = Any()
+
     # ---------------------------------------------------------------------------
     #  Initializes the object:
     # ---------------------------------------------------------------------------
 
     def __init__(self, parent, **traits):
         """ Creates a new image control.
         """
-        self._image = None
+        create = traits.pop("create", True)
 
-        super().__init__(**traits)
+        super().__init__(parent=parent, **traits)
 
+        if create:
+            self.create()
+            warnings.warn(
+                "automatic widget creation is deprecated and will be removed "
+                "in a future Pyface version, use create=False and explicitly "
+                "call create() for future behaviour",
+                PendingDeprecationWarning,
+            )
+
+    def _create_control(self, parent):
         self._recalc_size()
 
-        self.control = wx.Window(parent, -1, size=wx.Size(self._dx, self._dy))
-        self.control._owner = self
+        control = wx.Window(parent, -1, size=wx.Size(self._dx, self._dy))
+        control._owner = self
         self._mouse_over = self._button_down = False
 
         # Set up mouse event handlers:
-        self.control.Bind(wx.EVT_ENTER_WINDOW, self._on_enter_window)
-        self.control.Bind(wx.EVT_LEAVE_WINDOW, self._on_leave_window)
-        self.control.Bind(wx.EVT_LEFT_DOWN, self._on_left_down)
-        self.control.Bind(wx.EVT_LEFT_UP, self._on_left_up)
-        self.control.Bind(wx.EVT_PAINT, self._on_paint)
+        control.Bind(wx.EVT_ENTER_WINDOW, self._on_enter_window)
+        control.Bind(wx.EVT_LEAVE_WINDOW, self._on_leave_window)
+        control.Bind(wx.EVT_LEFT_DOWN, self._on_left_down)
+        control.Bind(wx.EVT_LEFT_UP, self._on_left_up)
+        control.Bind(wx.EVT_PAINT, self._on_paint)
+
+        return control
 
     def _recalc_size(self):
         # Calculate the size of the button:

pyface/ui/wx/image_widget.py

@@ -10,13 +10,12 @@
 
 """ A clickable/draggable widget containing an image. """
 
+import warnings
 
 import wx
 
-
 from traits.api import Any, Bool, Event
 
-
 from .widget import Widget
 
 
@@ -64,10 +63,24 @@ class ImageWidget(Widget):
 
     def __init__(self, parent, **traits):
         """ Creates a new widget. """
-
         # Base class constructors.
-        super().__init__(**traits)
 
+        create = traits.pop('create', True)
+
+        # Base-class constructors.
+        super().__init__(parent=parent, **traits)
+
+        # Create the widget!
+        if create:
+            self.create()
+            warnings.warn(
+                "automatic widget creation is deprecated and will be removed "
+                "in a future Pyface version, use create=False and explicitly "
+                "call create() for future behaviour",
+                PendingDeprecationWarning,
+            )
+
+    def _create_control(self, parent):
         # Add some padding around the image.
         size = (self.bitmap.GetWidth() + 10, self.bitmap.GetHeight() + 10)
 
@@ -96,7 +109,7 @@ def __init__(self, parent, **traits):
             wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DHIGHLIGHT), 1, wx.SOLID
         )
 
-        return
+        return self.control
 
     # ------------------------------------------------------------------------
     # Private interface.

pyface/ui/wx/list_box.py

@@ -9,13 +9,12 @@
 # Thanks for using Enthought open source!
 """ A simple list box widget with a model-view architecture. """
 
+import warnings
 
 import wx
 
-
 from traits.api import Event, Instance, Int
 
-
 from pyface.list_box_model import ListBoxModel
 from .widget import Widget
 
@@ -37,14 +36,28 @@ class ListBox(Widget):
     # Default style.
     STYLE = wx.LB_SINGLE | wx.LB_HSCROLL | wx.LB_NEEDED_SB
 
-    def __init__(self, parent, **traits):
+    def __init__(self, parent=None, **traits):
         """ Creates a new list box. """
 
+        create = traits.pop('create', True)
+
         # Base-class constructors.
-        super().__init__(**traits)
+        super().__init__(parent=parent, **traits)
 
         # Create the widget!
-        self._create_control(parent)
+        if create:
+            self.create()
+            warnings.warn(
+                "automatic widget creation is deprecated and will be removed "
+                "in a future Pyface version, use create=False and explicitly "
+                "call create() for future behaviour",
+                PendingDeprecationWarning,
+            )
+
+    def _create(self):
+        super()._create()
+
+        self._populate()
 
         # Listen for changes to the model.
         self.model.observe(self._on_model_changed, "list_changed")
@@ -54,7 +67,6 @@ def dispose(self):
             self._on_model_changed, "list_changed", remove=True
         )
         self.model.dispose()
-        return
 
     # ------------------------------------------------------------------------
     # 'ListBox' interface.
@@ -69,8 +81,6 @@ def refresh(self):
         # Populate the list.
         self._populate()
 
-        return
-
     # ------------------------------------------------------------------------
     # wx event handlers.
     # ------------------------------------------------------------------------
@@ -91,8 +101,6 @@ def _on_item_activated(self, event):
         # Trait event notification.
         self.item_activated = index
 
-        return
-
     # ------------------------------------------------------------------------
     # Trait handlers.
     # ------------------------------------------------------------------------
@@ -105,8 +113,6 @@ def _selection_changed(self, index):
         if index != -1:
             self.control.SetSelection(index)
 
-        return
-
     # Dynamic -------------------------------------------------------------#
 
     def _on_model_changed(self, event):
@@ -115,35 +121,31 @@ def _on_model_changed(self, event):
         # For now we just clear out the entire list.
         self.refresh()
 
-        return
-
     # ------------------------------------------------------------------------
     # Private interface.
     # ------------------------------------------------------------------------
 
     def _create_control(self, parent):
         """ Creates the widget. """
 
-        self.control = wx.ListBox(parent, -1, style=self.STYLE)
+        control = wx.ListBox(parent, -1, style=self.STYLE)
 
         # Wire it up!
-        self.control.Bind(
+        control.Bind(
             wx.EVT_LISTBOX, self._on_item_selected, id=self.control.GetId()
         )
-        self.control.Bind(
+        control.Bind(
             wx.EVT_LISTBOX_DCLICK,
             self._on_item_activated,
             id=self.control.GetId(),
         )
 
         # Populate the list.
-        self._populate()
+        return control
 
     def _populate(self):
         """ Populates the list box. """
 
         for index in range(self.model.get_item_count()):
             label, item = self.model.get_item_at(index)
             self.control.Append(label, item)
-
-        return

pyface/ui/wx/progress_dialog.py

@@ -12,14 +12,15 @@
 """ A simple progress bar intended to run in the UI thread
 """
 
+import warnings
+
 import wx
 import time
 
-
-from traits.api import Bool, Enum, Instance, Int, Property, Str
-
+from traits.api import Bool, Instance, Int, Property, Str
 
 from pyface.i_progress_dialog import MProgressDialog
+from pyface.ui_traits import Orientation
 from .widget import Widget
 from .window import Window
 
@@ -34,7 +35,7 @@ class ProgressBar(Widget):
     control = Instance(wx.Gauge)
 
     #: The orientation of the progress bar.
-    direction = Enum("horizontal", "horizontal", "vertical")
+    direction = Orientation("horizontal")
 
     #: The maximum value for the progress bar.
     _max = Int()
@@ -46,20 +47,39 @@ def __init__(
         maximum=100,
         direction="horizontal",
         size=(200, -1),
+        **traits,
     ):
         """
         Constructs a progress bar which can be put into a panel, or optionaly,
         its own window
 
         """
-        self._max = maximum
-        self.parent = parent
+        create = traits.pop("create", True)
+
+        # XXX minimum is ignored - it either should be deprecated or supported
+        super().__init__(
+            parent=parent,
+            _max=maximum,
+            direction=direction,
+            size=size,
+            **traits,
+        )
 
+        if create:
+            self.create()
+            warnings.warn(
+                "automatic widget creation is deprecated and will be removed "
+                "in a future Pyface version, use create=False and explicitly "
+                "call create() for future behaviour",
+                PendingDeprecationWarning,
+            )
+
+    def _create_control(self, parent):
         style = wx.GA_HORIZONTAL
-        if direction == "vertical":
+        if self.direction == "vertical":
             style = wx.GA_VERTICAL
 
-        self.control = wx.Gauge(parent, -1, maximum, style=style, size=size)
+        return wx.Gauge(parent, -1, self._max, style=style, size=self.size)
 
     def update(self, value):
         """ Update the progress bar to the desired value. """
@@ -306,7 +326,8 @@ def _create_label(self, dialog, parent_sizer, text):
         return label
 
     def _create_gauge(self, dialog, parent_sizer):
-        self.progress_bar = ProgressBar(dialog, self.min, self.max)
+        self.progress_bar = ProgressBar(dialog, self.min, self.max, create=False)
+        self.progress_bar.create()
         parent_sizer.Add(
             self.progress_bar.control, 0, wx.CENTER | wx.ALL, self.margin
         )
@@ -388,7 +409,6 @@ def _create_control(self, parent):
         sizer = wx.BoxSizer(wx.VERTICAL)
         dialog.SetSizer(sizer)
         dialog.SetAutoLayout(True)
-        dialog.SetBackgroundColour(wx.NullColour)
 
         self.dialog_size = wx.Size()