r6755 - in trunk/gnue-forms/src/uidrivers/wx/widgets: . form

[johannes]

Author: johannes
Date: 2004-11-29 14:25:11 -0600 (Mon, 29 Nov 2004)
New Revision: 6755

Modified:
   trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
Log:
Don't try to create MenuBar and ToolBar for wx.Dialogs - they can't. Buttons 
have a default-height of 1


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-11-29 19:59:24 UTC 
(rev 6754)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-11-29 20:25:11 UTC 
(rev 6755)
@@ -52,6 +52,9 @@
     itemX =      self.itemX
     itemY =      (object.Char__y + spacer) * event.widgetHeight
     itemWidth =  object.Char__width * event.widgetWidth
+    if not hasattr (object, 'Char__height'):
+      object.Char__height = 1
+
     itemHeight = object.Char__height * event.widgetHeight
 
     newWidget = wxButton(event.container, -1, wxEncode(object.label),

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-11-29 
19:59:24 UTC (rev 6754)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-11-29 
20:25:11 UTC (rev 6755)
@@ -107,13 +107,14 @@
     newWidget = self._wrapper.pane
     self._containerToolkitWidget = newWidget
 
-    # Add the menu
-    if not self._form._features['GUI:MENUBAR:SUPPRESS']:
-      MenuBar(self._uiDriver, self.containerFrame, self._form)
+    if self._form.style != 'dialog':
+      # Add the menu
+      if not self._form._features['GUI:MENUBAR:SUPPRESS']:
+        MenuBar(self._uiDriver, self.containerFrame, self._form)
 
-    # and the Toolbar
-    if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
-      ToolBar(self._uiDriver, self.containerFrame, self._form)
+      # and the Toolbar
+      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
+        ToolBar(self._uiDriver, self.containerFrame, self._form)
 
     self._eventHandler = event.eventHandler
     self._wrapper.finalize()