gnue/forms/src/uidrivers win32/widgets/form/wid...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/03/10 10:58:09

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

Log message:
        * removed unneeded scrollwindow (wrappers itself are scrollable)
        * fix for toolbars on win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/ToolBar.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/widget.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.7 
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.8
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.7   Sun Mar  9 
18:08:46 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py       Mon Mar 10 
10:58:09 2003
***************
*** 81,91 ****
        0)
  
  
-     # A window that provides the scrollbars 
- #    self._scrollWindow = self.mainWindow.panel = 
wxScrolledWindow(self.mainWindow,-1, wxDefaultPosition)
-     
- #    self._scrollWindow.Show()
- 
      # The window in which pages will be rendered 
      if object._layout.tabbed:
        self._wrapper = wrappers.TabbedWrapper(self)
--- 81,86 ----
Index: gnue/forms/src/uidrivers/wx/ToolBar.py
diff -c gnue/forms/src/uidrivers/wx/ToolBar.py:1.4 
gnue/forms/src/uidrivers/wx/ToolBar.py:1.5
*** gnue/forms/src/uidrivers/wx/ToolBar.py:1.4  Sun Mar  9 17:47:23 2003
--- gnue/forms/src/uidrivers/wx/ToolBar.py      Mon Mar 10 10:58:09 2003
***************
*** 37,42 ****
--- 37,43 ----
    def init(self): 
      if sys.platform == 'win32':
        toolbar = wxToolBar(self.container, -1)
+       toolbar.SetToolBitmapSize(wxSize(24,24))
      else:
        toolbar = wxToolBar(self.container,-1, 
style=wxTB_HORIZONTAL|wxTB_DOCKABLE)
      self.toolbar = toolbar
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.11 
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.12
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.11     Sat Mar  8 
23:08:51 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py  Mon Mar 10 10:58:09 2003
***************
*** 88,97 ****
        self.statusBar.SetStatusWidths([-1,50,50,75,75])
        initFont(self.statusBar,0)
  
-     # A window that provides the scrollbars 
-     self._scrollWindow = self.containerFrame.panel = 
wxScrolledWindow(self.containerFrame,-1, wxDefaultPosition)
-     
-     self._scrollWindow.Show(1)
  
      # The window in which pages will be rendered 
      if object._layout.tabbed:
--- 88,93 ----
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.9 
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.10
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.9    Thu Mar  6 
22:25:42 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py        Mon Mar 10 
10:58:09 2003
***************
*** 26,32 ****
  #
  # NOTES:
  #
! import string
  from gnue.common import events
  from gnue.common.apps import GDebug
  
--- 26,32 ----
  #
  # NOTES:
  #
! import string, sys
  from gnue.common import events
  from gnue.common.apps import GDebug
  
***************
*** 48,54 ****
      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)
--- 48,58 ----
      self.frame = frame = uiform.containerFrame
      self.form = form = uiform._form
      self.margin = 6
!     if sys.platform == 'win32':
!       pos = wxPoint(0,35)
!     else:
!       pos = wxDefaultPosition
!     wxScrolledWindow.__init__(self, frame, -1, pos)
      self.spacerpane = wxPanel(self, -1)
  
      EVT_SIZE(self.frame, self.OnFrameSize)