gnue/designer/src LayoutEditor.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/18 18:05:53

Modified files:
        designer/src   : LayoutEditor.py 

Log message:
        fixed major bug w/multipage forms being handled by layouteditor

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

Patches:
Index: gnue/designer/src/LayoutEditor.py
diff -c gnue/designer/src/LayoutEditor.py:1.35 
gnue/designer/src/LayoutEditor.py:1.36
*** gnue/designer/src/LayoutEditor.py:1.35      Thu Jan 17 19:43:33 2002
--- gnue/designer/src/LayoutEditor.py   Fri Jan 18 18:05:52 2002
***************
*** 134,147 ****
  
  
    def onModifyObject (self, object, handler, modifications):
!     if object == None: 
        return
      self.propBar.onModifyObject(object, handler, modifications)
      if handler != __name__:
        if object._type == 'GFPage': 
          self.notebook.SetPageText(self._notebookMap[object],object.name)
          self.notebook.SetSelection(self.notebook.GetSelection())
!       else: 
          page = object.findParentOfType('GFPage')
          if page: 
            self._setCurrentPage(page)
--- 134,147 ----
  
  
    def onModifyObject (self, object, handler, modifications):
!     if object == None:
        return
      self.propBar.onModifyObject(object, handler, modifications)
      if handler != __name__:
        if object._type == 'GFPage': 
          self.notebook.SetPageText(self._notebookMap[object],object.name)
          self.notebook.SetSelection(self.notebook.GetSelection())
!       else:
          page = object.findParentOfType('GFPage')
          if page: 
            self._setCurrentPage(page)
***************
*** 263,270 ****
      self.propBar.SetPosition(wxPoint(0, self.GetClientSize().y - 
self.propBar.GetSize().y))
      self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8 - self.propBar.GetSize().y))
  
!   def OnPageSelected(self, event): 
!     p = self._notebookMap[self.notebook.GetSelection()]
      if p != self.page:
        self._instance.onSetCurrentObject(p, __name__)
      self._setCurrentPage(p)
--- 263,270 ----
      self.propBar.SetPosition(wxPoint(0, self.GetClientSize().y - 
self.propBar.GetSize().y))
      self.notebook.SetSize(wxSize(self.GetClientSize().x-8, 
self.GetClientSize().y - 8 - self.propBar.GetSize().y))
  
!   def OnPageSelected(self, event):
!     p = self._notebookMap[event.GetSelection()]
      if p != self.page:
        self._instance.onSetCurrentObject(p, __name__)
      self._setCurrentPage(p)
***************
*** 563,569 ****
      self.south = wxWindow(self.parent, -1) 
      self.east = wxWindow(self.parent, -1) 
      self.west = wxWindow(self.parent, -1) 
!     for object in (self.north,self.south,self.east,self.west): 
        EVT_PAINT(object, self.OnPaint)
      self.setBoundary(self.x1, self.y1, self.x2, self.y2)
  
--- 563,569 ----
      self.south = wxWindow(self.parent, -1) 
      self.east = wxWindow(self.parent, -1) 
      self.west = wxWindow(self.parent, -1) 
!     for object in (self.north,self.south,self.east,self.west):
        EVT_PAINT(object, self.OnPaint)
      self.setBoundary(self.x1, self.y1, self.x2, self.y2)
  
***************
*** 578,584 ****
         self.west.SetSize(wxSize(1,y2-y1+1)) 
       if self.east: 
         self.east.SetPosition(wxPoint(x2,y1))
!        self.east.SetSize(wxSize(1,y2-y1+1)) 
       if self.south:
         self.south.SetPosition(wxPoint(x1,y2))  
         self.south.SetSize(wxSize(x2-x1+1,1)) 
--- 578,584 ----
         self.west.SetSize(wxSize(1,y2-y1+1)) 
       if self.east: 
         self.east.SetPosition(wxPoint(x2,y1))
!        self.east.SetSize(wxSize(1,y2-y1+1))
       if self.south:
         self.south.SetPosition(wxPoint(x1,y2))  
         self.south.SetSize(wxSize(x2-x1+1,1)) 
***************
*** 621,627 ****
    def reconfigure(self, event):
      self.Refresh()
  
!   def OnPaint(self, event): 
      object = wxPyTypeCast(event.GetEventObject(),'wxWindow') 
      dc = wxPaintDC(object)
      dc.BeginDrawing()
--- 621,627 ----
    def reconfigure(self, event):
      self.Refresh()
  
!   def OnPaint(self, event):
      object = wxPyTypeCast(event.GetEventObject(),'wxWindow') 
      dc = wxPaintDC(object)
      dc.BeginDrawing()