gnue designer/src/base/tools/DataSourceEditor.p...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/02 14:58:28

Modified files:
        designer/src/base/tools: DataSourceEditor.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
        forms/src/uidrivers/_base/widgets: _base.py 

Log message:
        Fixes to get designer working again with Forms' wx uidriver

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/DataSourceEditor.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/widgets/_base.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/tools/DataSourceEditor.py
diff -c gnue/designer/src/base/tools/DataSourceEditor.py:1.33 
gnue/designer/src/base/tools/DataSourceEditor.py:1.34
*** gnue/designer/src/base/tools/DataSourceEditor.py:1.33       Mon Feb 17 
02:32:51 2003
--- gnue/designer/src/base/tools/DataSourceEditor.py    Sun Mar  2 14:58:28 2003
***************
*** 30,36 ****
  import sys, os, cPickle, traceback, StringIO, string
  from wxPython.wx import *
  from gnue.common.apps import GDebug, GConfig, RuntimeSettings
! from gnue.common.formatting import GDataSource
  from gnue.common import events
  from gnue.designer.base.ToolPanel import ToolPanel
  
--- 30,36 ----
  import sys, os, cPickle, traceback, StringIO, string
  from wxPython.wx import *
  from gnue.common.apps import GDebug, GConfig, RuntimeSettings
! from gnue.common.datasources import GDataSource
  from gnue.common import events
  from gnue.designer.base.ToolPanel import ToolPanel
  
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.60 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.61
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.60   Mon Feb 17 
02:32:51 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Sun Mar  2 
14:58:28 2003
***************
*** 84,90 ****
      self.blockMap = {}
      self.panel = None
      self._notebookMap = {}
-     self._pageList = []  # Needed by UIwxpython
      self.positionMappings = {}
      self.widgetList = []
  
--- 84,89 ----
***************
*** 95,101 ****
      self.__ox = 0
      self.__oy = 0
  
- 
      # EventAware provided by ToolPanel
      self.registerEventListeners({
                         'ObjectSelected'      : self.onSetCurrentObject,
--- 94,99 ----
***************
*** 113,118 ****
--- 111,122 ----
  
      self._setFeedback()
  
+     
+     ## Stuff needed by UIwxpython
+     self._pageList = []  # Needed by UIwxpython
+ 
+     
+     
  ## TODO: Fix me
      self.instance.SetToolBar(self.toolbar)
  ##
***************
*** 436,451 ****
          GDebug.printMesg(7, 'Drawing item of type %s' % (object._type))
        object._widgetHandler = WidgetHandler(self, object)
  
!       cevent = Event('CreateWidget',None,
                     parent=None,
                     object=object,
!                    container=self.panel,
                     textWidth=self.textWidth,
                     textHeight=self.textHeight,
                     widgetWidth=self.widgetWidth,
                     widgetHeight=self.widgetHeight,
                     interface=self,
                     eventHandler=None,
                     initialize=0)
  
        object._widget = widget = 
self.widgets[object._type].configuration['baseClass'](cevent)
--- 440,456 ----
          GDebug.printMesg(7, 'Drawing item of type %s' % (object._type))
        object._widgetHandler = WidgetHandler(self, object)
  
!       cevent = Event('CreateUIWidget',None,
                     parent=None,
                     object=object,
!                    container=self.panel, 
                     textWidth=self.textWidth,
                     textHeight=self.textHeight,
                     widgetWidth=self.widgetWidth,
                     widgetHeight=self.widgetHeight,
                     interface=self,
                     eventHandler=None,
+                    ui=self, 
                     initialize=0)
  
        object._widget = widget = 
self.widgets[object._type].configuration['baseClass'](cevent)
Index: gnue/forms/src/uidrivers/_base/widgets/_base.py
diff -c gnue/forms/src/uidrivers/_base/widgets/_base.py:1.2 
gnue/forms/src/uidrivers/_base/widgets/_base.py:1.3
*** gnue/forms/src/uidrivers/_base/widgets/_base.py:1.2 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/uidrivers/_base/widgets/_base.py     Sun Mar  2 14:58:28 2003
***************
*** 87,93 ****
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
!       self._creationEvent.container = None    
  
      #print "The container will be ",self._creationEvent.container
      if not self._gfObject.hidden:
--- 87,94 ----
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
!       if not hasattr(self._creationEvent, 'container'): 
!         self._creationEvent.container = None
  
      #print "The container will be ",self._creationEvent.container
      if not self._gfObject.hidden: