[gnue] r7589 - trunk/gnue-forms/src/uidrivers/wx/widgets/form

[btami]

Author: btami
Date: 2005-06-10 13:09:10 -0500 (Fri, 10 Jun 2005)
New Revision: 7589

Modified:
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
Log:
little tabbed form cleanup for wx on win32 and wxpython 2.6.x too

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2005-06-09 
16:36:08 UTC (rev 7588)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2005-06-10 
18:09:10 UTC (rev 7589)
@@ -66,7 +66,7 @@
     formWidth = int(form._layout.Char__width)
     formHeight = int(form._layout.Char__height)
     self.layoutSize = wxSize(formWidth * uiform._uiDriver.widgetWidth,
-                      formHeight * uiform._uiDriver.widgetHeight)
+                      formHeight * uiform._uiDriver.widgetHeight+45)
     self._fitted = 0
     self._pageList = []
 
@@ -130,12 +130,11 @@
   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),
+    self.pane = notebook = wxNotebook(self.spacerpane, -1, pos=wxPoint(0,0),
                                       style=tabstyle)
-    self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
+    self.notebooksizer = wxNotebookSizer(notebook)
 
     sizer2 = wxBoxSizer(wxVERTICAL)
-    sizer2.Add(self.notebooksizer)
     self.frame.SetAutoLayout(1)
     self.spacerpane.SetSizer(sizer2)
 
@@ -153,7 +152,6 @@
     """
     sizer = wxBoxSizer(wxVERTICAL)
     newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
-    sizer.Add(newWidget, 0, wxCENTER)
     newWidget.SetAutoLayout(1)
     newWidget.SetSizer(sizer)
 
@@ -174,8 +172,6 @@
     """
     if self._fitted: return
 
-    self.notebooksizer.Layout()
-    self.notebooksizer.SetSizeHints(self.pane)
     self.SetClientSize(self.layoutSize)
 
     if not USING_WX_22: