gnue/forms/src/uidrivers/wx ToolBar.py widgets/...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/02 13:46:48

Modified files:
        forms/src/uidrivers/wx: ToolBar.py 
        forms/src/uidrivers/wx/widgets: _base.py 
        forms/src/uidrivers/wx/widgets/form: widget.py 

Log message:
        cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/ToolBar.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/_base.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/widget.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/ToolBar.py
diff -c gnue/forms/src/uidrivers/wx/ToolBar.py:1.2 
gnue/forms/src/uidrivers/wx/ToolBar.py:1.3
*** gnue/forms/src/uidrivers/wx/ToolBar.py:1.2  Sat Mar  1 15:29:33 2003
--- gnue/forms/src/uidrivers/wx/ToolBar.py      Sun Mar  2 13:46:48 2003
***************
*** 47,53 ****
    def addAction(self, name, userAction):
      label = name
      iconloc = userAction.getIconLocation(size="32x32")
-     print "*** %s" % iconloc
            
      id = wxNewId()
      
--- 47,52 ----
Index: gnue/forms/src/uidrivers/wx/widgets/_base.py
diff -c gnue/forms/src/uidrivers/wx/widgets/_base.py:1.1 
gnue/forms/src/uidrivers/wx/widgets/_base.py:1.2
*** gnue/forms/src/uidrivers/wx/widgets/_base.py:1.1    Mon Feb 10 21:08:23 2003
--- gnue/forms/src/uidrivers/wx/widgets/_base.py        Sun Mar  2 13:46:48 2003
***************
*** 148,154 ****
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
      initFont(newWidget)
!     self._addToCrossRef(newWidget,event.object,self)
      return newWidget
  
    def cleanup(self, object):
--- 148,155 ----
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
      initFont(newWidget)
!     if event.initialize: 
!       self._addToCrossRef(newWidget,event.object,self)
      return newWidget
  
    def cleanup(self, object):
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.4 
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.5
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.4      Sat Mar  1 
15:55:57 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py  Sun Mar  2 13:46:48 2003
***************
*** 59,70 ****
      #
      self.menu_sb_space = 0
  
- ## TODO: This really isn't right...    
- ##    if not self._form._features['GUI:MENUBAR:SUPPRESS']:
- ##      self.menu_sb_space += 2
- ##    if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
- ##      self.menu_sb_space += 2
-       
      formWidth = int(self._form._layout.Char__width)
      formHeight = int(self._form._layout.Char__height)
      self._visibleSize = wxSize(formWidth*self._uiDriver.widgetWidth,
--- 59,64 ----
***************
*** 76,82 ****
  
      # The main frame of this form
      self.mainWindow = wxFrame(NULL, -1, "", wxDefaultPosition)
-     ###self.mainWindow.SetSize(formSize)
      self.mainWindow.SetTitle(str(self._form.title))
      EVT_CLOSE(self.mainWindow,self.closeTrap)
      initFont(self.mainWindow,1)
--- 70,75 ----
***************
*** 102,113 ****
      self._containerToolkitWidget = newWidget
  
      
- ##    # TODO: Scrollbar width adjustment?
- ##    tempx,tempy = self.mainWindow.GetSizeTuple()
- ##    mainWindowSize = wxSize(20+tempx, 20+tempy)
- ##    self.mainWindow.SetSize(mainWindowSize)
- 
-     
      
      # Add the menu
      if not self._form._features['GUI:MENUBAR:SUPPRESS']:
--- 95,100 ----
***************
*** 150,171 ****
    #
    def gotoPage(self,event):
      
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
!     
! ##    if not self._notebook:
! ##      for page in self._uiPageList:
! ##        if page != uiPage:
! ##          page.hide()
! ##        else:
! ##          page.show()
! ##    else:
! ##      # uiPage widgets only contain 1 item
! ##      
! ##      pageId = uiPage.widgets[0].GetId()
! ##      
! ##      for count in range(self._notebook.GetPageCount()):
! ##        if pageId == self._notebook.GetPage(count).GetId():
! ##          self._notebook.SetSelection(count)
!       
                       
    #
    # _setStatusBar
--- 137,143 ----
    #
    def gotoPage(self,event):
      
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
!           
                       
    #
    # _setStatusBar