gnue/forms/src/uidrivers/wx/widgets/form wrappe...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/05 16:57:04

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

Log message:
        added 6pt margin around tabbed forms

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

Patches:
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.6 
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.7
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.6    Tue Mar  4 
19:21:34 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py        Wed Mar  5 
16:57:04 2003
***************
*** 36,54 ****
  from wxPython.wx import __version__ as wxversion
  
  # How sad...
! if wxversion[:3] == '2.2': 
    USING_WX_22 = 1
! else: 
    USING_WX_22 = 0
  
  
! class ScrollableWrapper(wxScrolledWindow): 
!   def __init__(self, uiform): 
      self.uiform = uiform
      self.frame = frame = uiform.containerFrame
      self.form = form = uiform._form
      wxScrolledWindow.__init__(self, frame, -1)
!     
      EVT_SIZE(self.frame, self.OnFrameSize)
      formWidth = int(form._layout.Char__width)
      formHeight = int(form._layout.Char__height)
--- 36,55 ----
  from wxPython.wx import __version__ as wxversion
  
  # How sad...
! if wxversion[:3] == '2.2':
    USING_WX_22 = 1
! else:
    USING_WX_22 = 0
  
  
! class ScrollableWrapper(wxScrolledWindow):
!   def __init__(self, uiform):
      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)
      formHeight = int(form._layout.Char__height)
***************
*** 57,129 ****
      self._fitted = 0
      self._pageList = []
  
!   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()
!     
!           
!   def OnFrameSize(self, event): 
      self.SetSize(self.frame.GetClientSize())
      self.fixScrollbars()
!     
!   def fixScrollbars(self): 
      x1, y1 = self.frame.GetClientSizeTuple()
      x2, y2 = self.pane.GetSizeTuple()
!     if x1 < x2 or y1 < y2: 
        self.SetScrollbars(5, 5, x2, y2)
!     else: 
        self.SetScrollbars(0, 0, 0, 0)
!     
!     
!      
  #
  # Notebook pages
  #
! class TabbedWrapper(ScrollableWrapper): 
!   def __init__(self, *args, **parms): 
      ScrollableWrapper.__init__(self, *args, **parms)
      tabstyle  = _tabStyles[self.form._layout.tabbed]
!     self.pane = notebook = wxNotebook(self,-1, #wxPoint(6,6),
                                        style=tabstyle)
      self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
      sizer2 = wxBoxSizer(wxVERTICAL)
      sizer2.Add(self.notebooksizer)
      self.frame.SetAutoLayout(1)
!     self.SetSizer(sizer2)
!                              
      notebook.Show(1)
      self.__notebookLoopTrap = 0
      EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(), 
self.notebookTabHandler)
-                              
-   def createPage(self, object): 
  
!     sizer = wxBoxSizer(wxVERTICAL)  
      newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
      sizer.Add(newWidget, 0, wxCENTER)
      newWidget.SetAutoLayout(1)
      newWidget.SetSizer(sizer)
!     
      self._pageList.append(newWidget)
      self.pane.AddPage(newWidget,hasattr(object,'caption') and object.caption 
or object.name)
      self.pane.SetClientSize(self.layoutSize)
      self.fit()
      return newWidget
  
!   def fit(self): 
      if self._fitted: return
      self.notebooksizer.Layout()
      self.notebooksizer.SetSizeHints(self.pane)
!     self.SetClientSize(self.layoutSize)    
!     if not USING_WX_22: 
!       self.SetSize(self.pane.GetSize())
!     else: 
        # TODO: How fscking sad to have to do this.
        # TODO: but, I can't get wx 2.2 to cooperate
        w,h = self.GetClientSizeTuple()
--- 58,138 ----
      self._fitted = 0
      self._pageList = []
  
!   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()
! 
! 
!   def OnFrameSize(self, event):
      self.SetSize(self.frame.GetClientSize())
      self.fixScrollbars()
! 
!   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:
        self.SetScrollbars(0, 0, 0, 0)
! 
! 
! 
  #
  # Notebook pages
  #
! class TabbedWrapper(ScrollableWrapper):
!   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)
!     self.spacerpane.SetSizer(sizer2)
! 
      notebook.Show(1)
      self.__notebookLoopTrap = 0
      EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(), 
self.notebookTabHandler)
  
!   def createPage(self, object):
! 
!     sizer = wxBoxSizer(wxVERTICAL)
      newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
      sizer.Add(newWidget, 0, wxCENTER)
      newWidget.SetAutoLayout(1)
      newWidget.SetSizer(sizer)
! 
      self._pageList.append(newWidget)
      self.pane.AddPage(newWidget,hasattr(object,'caption') and object.caption 
or object.name)
      self.pane.SetClientSize(self.layoutSize)
      self.fit()
      return newWidget
  
!   def fit(self):
      if self._fitted: return
      self.notebooksizer.Layout()
      self.notebooksizer.SetSizeHints(self.pane)
!     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:
        # TODO: How fscking sad to have to do this.
        # TODO: but, I can't get wx 2.2 to cooperate
        w,h = self.GetClientSizeTuple()
***************
*** 131,137 ****
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
  
!   
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
        #object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]
--- 140,146 ----
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
  
! 
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
        #object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]