gnue/designer/src/forms/LayoutEditor LayoutEdit...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/02/13 21:42:26

Modified files:
        designer/src/forms/LayoutEditor: LayoutEditor.py 

Log message:
        Merging test branch back into head... follows the new UIdriver format.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.58 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.59
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.58   Wed Jan  1 
19:45:46 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Thu Feb 13 
21:42:26 2003
***************
*** 60,67 ****
      self.frame = self.instance
  
      self._app = self.instance._app
      self.widgets = {}
!     self.widgets.update(UIwxpython.WIDGETS)
      del self.widgets['GFPage']
  
  
--- 60,70 ----
      self.frame = self.instance
  
      self._app = self.instance._app
+     
+     self.uidriver = uidriver = UIwxpython.GFUserInterface(self.instance, 0)
+ 
      self.widgets = {}
!     self.widgets.update(uidriver._supportedWidgets)
      del self.widgets['GFPage']
  
  
***************
*** 434,439 ****
--- 437,443 ----
        object._widgetHandler = WidgetHandler(self, object)
  
        cevent = Event('CreateWidget',None,
+                    parent=None,
                     object=object,
                     container=self.panel,
                     textWidth=self.textWidth,
***************
*** 444,450 ****
                     eventHandler=None,
                     initialize=0)
  
!       object._widget = self.widgets[object._type](cevent)
        object._widget._object = object
        object._widgetHandler.initialize(object._widget)
        if not len(self._currentSelection.keys()):
--- 448,458 ----
                     eventHandler=None,
                     initialize=0)
  
!       object._widget = widget = 
self.widgets[object._type].configuration['baseClass'](cevent)
!       
!       # TODO: This segfaults us... yay!!!
!       widget.phaseInit(widget._buildObject())
!       
        object._widget._object = object
        object._widgetHandler.initialize(object._widget)
        if not len(self._currentSelection.keys()):