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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/06 16:27:32

Modified files:
        forms/src/uidrivers/wx: UIdriver.py 
        forms/src/uidrivers/wx/widgets/form: wrappers.py 

Log message:
        added a margin around pages so they don't touch the frame borders

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.244&tr2=1.245&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.244 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.245
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.244       Thu Mar  6 01:09:41 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Thu Mar  6 16:27:25 2003
***************
*** 46,56 ****
  from gnue.forms.uidrivers.wx.widgets._base  import *
  from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
  
- ##from MenuBar import MyMenuBar
- 
  #from common import *
  
!     
  #
  # GFUserInterface
  #
--- 46,54 ----
  from gnue.forms.uidrivers.wx.widgets._base  import *
  from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
  
  #from common import *
  
! 
  #
  # GFUserInterface
  #
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.7 
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.8
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.7    Wed Mar  5 
16:57:04 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py        Thu Mar  6 
16:27:31 2003
***************
*** 47,54 ****
      self.uiform = uiform
      self.frame = frame = uiform.containerFrame
      self.form = form = uiform._form
!     self.margin = 0
      wxScrolledWindow.__init__(self, frame, -1)
  
      EVT_SIZE(self.frame, self.OnFrameSize)
      formWidth = int(form._layout.Char__width)
--- 47,55 ----
      self.uiform = uiform
      self.frame = frame = uiform.containerFrame
      self.form = form = uiform._form
!     self.margin = 6
      wxScrolledWindow.__init__(self, frame, -1)
+     self.spacerpane = wxPanel(self, -1)
  
      EVT_SIZE(self.frame, self.OnFrameSize)
      formWidth = int(form._layout.Char__width)
***************
*** 61,71 ****
    def finalize(self):
      # This is the initial panel window setup during init
      # not a wxPanel set per page right after this
      try:
!       self.SetVirtualSize(self.pane.GetSize())
      except AttributeError:
        pass # Yes, it is more wx2.2 goodness!!
!     tempx,tempy =  self.pane.GetSizeTuple()
      self.Show(1)
      self.fixScrollbars()
  
--- 62,75 ----
    def finalize(self):
      # This is the initial panel window setup during init
      # not a wxPanel set per page right after this
+     w,h = self.pane.GetSizeTuple()
+     self.spacerpane.SetSize(wxSize(w+self.margin*2, h+self.margin*2))
+     self.spacerpane.SetPosition(wxPoint(self.margin, self.margin))
      try:
!       self.SetVirtualSize(self.spacerpane.GetSize())
      except AttributeError:
        pass # Yes, it is more wx2.2 goodness!!
!     tempx,tempy =  self.spacerpane.GetSizeTuple()
      self.Show(1)
      self.fixScrollbars()
  
***************
*** 76,84 ****
  
    def fixScrollbars(self):
      x1, y1 = self.frame.GetClientSizeTuple()
!     x2, y2 = self.pane.GetSizeTuple()
!     x2 += self.margin
!     y2 += self.margin
      if x1 < x2 or y1 < y2:
        self.SetScrollbars(5, 5, x2, y2)
      else:
--- 80,86 ----
  
    def fixScrollbars(self):
      x1, y1 = self.frame.GetClientSizeTuple()
!     x2, y2 = self.spacerpane.GetSizeTuple()
      if x1 < x2 or y1 < y2:
        self.SetScrollbars(5, 5, x2, y2)
      else:
***************
*** 93,103 ****
    def __init__(self, *args, **parms):
      ScrollableWrapper.__init__(self, *args, **parms)
      tabstyle  = _tabStyles[self.form._layout.tabbed]
-     self.spacerpane = wxPanel(self, -1, wxPoint(6,6))
      self.pane = notebook = wxNotebook(self.spacerpane,-1, #wxPoint(6,6),
                                        style=tabstyle)
      self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
!     self.margin = 12
      sizer2 = wxBoxSizer(wxVERTICAL)
      sizer2.Add(self.notebooksizer)
      self.frame.SetAutoLayout(1)
--- 95,104 ----
    def __init__(self, *args, **parms):
      ScrollableWrapper.__init__(self, *args, **parms)
      tabstyle  = _tabStyles[self.form._layout.tabbed]
      self.pane = notebook = wxNotebook(self.spacerpane,-1, #wxPoint(6,6),
                                        style=tabstyle)
      self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
! 
      sizer2 = wxBoxSizer(wxVERTICAL)
      sizer2.Add(self.notebooksizer)
      self.frame.SetAutoLayout(1)
***************
*** 128,135 ****
      self.SetClientSize(self.layoutSize)
      if not USING_WX_22:
        w,h = self.pane.GetSizeTuple()
!       w += self.margin
!       h += self.margin
        self.spacerpane.SetSize(wxSize(w,h))
        self.SetSize(self.spacerpane.GetSize())
      else:
--- 129,136 ----
      self.SetClientSize(self.layoutSize)
      if not USING_WX_22:
        w,h = self.pane.GetSizeTuple()
!       w += self.margin*2
!       h += self.margin*2
        self.spacerpane.SetSize(wxSize(w,h))
        self.SetSize(self.spacerpane.GetSize())
      else:
***************
*** 152,186 ****
          self.__notebookLoopTrap = 0
      if action:
        self.uiform._eventHandler(action)
!   
!   def setPage(self, page): 
      pageId = self._pageList.index(page)
      self.pane.SetSelection(pageId)
!     
!                                      
  #
  # Single pages
  #
! class PlainWrapper(ScrollableWrapper): 
!   def __init__(self, *args, **parms): 
      ScrollableWrapper.__init__(self, *args, **parms)
!     self.pane = wxPanel(self, -1, size=self.layoutSize)
      self.pane.Show(1)
!           
!   def createPage(self, object): 
      newWidget = wxPanel(self.pane, -1,  size=self.layoutSize)
!     
      # Only show first page
      if not self._fitted:
        newWidget.Show(1)
      else:
        newWidget.Hide()
!       
      self._pageList.append(newWidget)
      self.fit()
      return newWidget
  
!   def fit(self): 
      if self._fitted: return
      self.pane.SetClientSize(self.layoutSize)
      self.pane.Fit()
--- 153,187 ----
          self.__notebookLoopTrap = 0
      if action:
        self.uiform._eventHandler(action)
! 
!   def setPage(self, page):
      pageId = self._pageList.index(page)
      self.pane.SetSelection(pageId)
! 
! 
  #
  # Single pages
  #
! class PlainWrapper(ScrollableWrapper):
!   def __init__(self, *args, **parms):
      ScrollableWrapper.__init__(self, *args, **parms)
!     self.pane = wxPanel(self.spacerpane, -1, size=self.layoutSize, 
pos=wxPoint(self.margin, self.margin))
      self.pane.Show(1)
! 
!   def createPage(self, object):
      newWidget = wxPanel(self.pane, -1,  size=self.layoutSize)
! 
      # Only show first page
      if not self._fitted:
        newWidget.Show(1)
      else:
        newWidget.Hide()
! 
      self._pageList.append(newWidget)
      self.fit()
      return newWidget
  
!   def fit(self):
      if self._fitted: return
      self.pane.SetClientSize(self.layoutSize)
      self.pane.Fit()
***************
*** 189,195 ****
      self.frame.Fit()
      self._fitted = 1
  
!   def setPage(self, page): 
      for p in self._pageList:
        if p != page:
          p.Show(0)
--- 190,196 ----
      self.frame.Fit()
      self._fitted = 1
  
!   def setPage(self, page):
      for p in self._pageList:
        if p != page:
          p.Show(0)