Support 2-phase create, add unittests

unittests/test_lib_gizmos_ledctrl.py

@@ -0,0 +1,18 @@
+import unittest
+from unittests import wtc
+import wx
+import wx.lib.gizmos as gizmos
+
+
+class lib_gizmos_ledctrl_Tests(wtc.WidgetTestCase):
+
+    def test_defaultCtor(self):
+        led = gizmos.LEDNumberCtrl()
+        led.Create(self.frame, pos=(25,25), size=(280,50))
+        led.SetValue('123456')
+
+    def test_normalCtor(self):
+        led = gizmos.LEDNumberCtrl(self.frame, pos=(25,25), size=(280,50))
+        led.SetValue('123456')
+
+

wx/lib/gizmos/ledctrl.py

@@ -60,12 +60,41 @@ class LEDNumberCtrl(wx.Control):
 
 
 
-    def __init__(self, parent, id=wx.ID_ANY,
+    def __init__(self, *args, **kw):
-                 pos=wx.DefaultPosition, size=wx.DefaultSize,
+        """
-                 style=LED_ALIGN_LEFT|LED_DRAW_FADED, name='ledctrl'):
+        Create a new LEDNumberCtrl.
-        super(LEDNumberCtrl, self).__init__(parent, id, pos, size, style, name=name)
 
-        # defaults
+        Both the normal constructor style with all parameters, or wxWidgets
+        2-phase style default constructor is supported. If the default
+        constructor is used then the Create method will need to be called
+        later before the widget can actually be used.
+        """
+        if not args and not kw:
+            self._init_default()
+        else:
+            self._init_full(*args, **kw)
+
+    def _init_default(self):
+        super(LEDNumberCtrl, self).__init__()
+        self._init()
+
+    def _init_full(self, parent, id=wx.ID_ANY,
+                   pos=wx.DefaultPosition, size=wx.DefaultSize,
+                   style=LED_ALIGN_LEFT|LED_DRAW_FADED, name='ledctrl'):
+        super(LEDNumberCtrl, self).__init__(parent, id, pos, size, style, name=name)
+        self._init()
+        self._post_create()
+
+
+    def Create(self, parent, id=wx.ID_ANY,
+               pos=wx.DefaultPosition, size=wx.DefaultSize,
+               style=LED_ALIGN_LEFT|LED_DRAW_FADED, name='ledctrl'):
+        super(LEDNumberCtrl, self).Create(parent, id, pos, size, style, name=name)
+        self._post_create()
+
+
+    def _init(self):
+        # set default attributes
         self._alignment = LED_ALIGN_LEFT
         self._lineMargin = -1
         self._digitMargin = -1
@@ -75,11 +104,14 @@ class LEDNumberCtrl(wx.Control):
         self._leftStartPos = -1
         self._value = ''
 
+
+    def _post_create(self):
         self.SetBackgroundColour(wx.BLACK)
         self.SetForegroundColour(wx.GREEN)
         self.SetBackgroundStyle(wx.BG_STYLE_PAINT)
 
         # flags
+        style = self.GetWindowStyle()
         if style & LED_DRAW_FADED:
             self.SetDrawFaded(True)
         if style  & LED_ALIGN_MASK: