[gnue] r8946 - in trunk/gnue-forms/src/uidrivers: gtk2/widgets/form win32/widgets/form

[jan]

Author: jan
Date: 2006-10-27 17:42:34 -0500 (Fri, 27 Oct 2006)
New Revision: 8946

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
Log:
Disable statusbar, menubar and toolbar for dialogs
in win32 and gtk2 uidrivers (now same as wx,qt etc.)


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-27 
21:40:30 UTC (rev 8945)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-27 
22:42:34 UTC (rev 8946)
@@ -140,18 +140,17 @@
 
     newWidget = self._wrapper.pane
     self._container = newWidget
-    
-    # Add the menu
-    if not self._form._features ['GUI:MENUBAR:SUPPRESS']:
-      MenuBar (self._uiDriver, self, self._form)
-    
-    # and the Toolbar
-    if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
-      ToolBar (self._uiDriver, self, self._form)
+     
+    # Add Statusbar, Toolbar and Menubar as requested and/or allowed
+    if self._form.style != 'dialog':
+      if not self._form._features ['GUI:MENUBAR:SUPPRESS']:
+        MenuBar (self._uiDriver, self, self._form)
+      
+      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
+        ToolBar (self._uiDriver, self, self._form)
 
-    # and the Statusbar
-    if not self._form._features ['GUI:STATUSBAR:SUPPRESS']:
-      self.createStatusBar ()
+      if not self._form._features ['GUI:STATUSBAR:SUPPRESS']:
+        self.createStatusBar ()
           
 
     self._eventHandler = event.eventHandler

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-10-27 
21:40:30 UTC (rev 8945)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-10-27 
22:42:34 UTC (rev 8946)
@@ -94,7 +94,8 @@
 
 
     # Create the main window.
-    if self._form._features['GUI:TOOLBAR:SUPPRESS']:
+    if self._form._features['GUI:TOOLBAR:SUPPRESS'] or \
+       self._form.style == 'dialog':
       self.buttonbarWidth = 0
       self.buttonbarHeight = 0
     else:
@@ -132,28 +133,27 @@
     newWidget = self._wrapper.pane
     self._container = newWidget
 
-    # Add the menu
-    if not self._form._features['GUI:MENUBAR:SUPPRESS']:
-      MenuBar(self._uiDriver, self.mainWindow, self._form)
+    # Add Statusbar, Toolbar and Menubar as requested and/or allowed
+    if self._form.style != 'dialog':
+      if not self._form._features['GUI:MENUBAR:SUPPRESS']:
+        MenuBar(self._uiDriver, self.mainWindow, self._form)
 
-    # and the Toolbar
-    if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
-      ToolBar(self._uiDriver, self.mainWindow, self._form)
+      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
+        ToolBar(self._uiDriver, self.mainWindow, self._form)
 
-
-    # and the Statusbar
-    if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
-      hinst = win32api.GetModuleHandle(None)
-      style = win32con.WS_CHILD | win32con.WS_VISIBLE | commctrl.SBARS_SIZEGRIP
-      styleEx = 0
-      self.statusBar = Win32Window(self._uiDriver, styleEx, 
commctrl.STATUSCLASSNAME, "",
-        style, 0, 0, 0, 0,
-        self.mainWindow, getNextId(), hinst)
-      x=formWidth*self._uiDriver.widgetWidth
-      statwidths = struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETPARTS, 5, 
statwidths)
-      win32gui.SendMessage(self.statusBar.GetHwnd(), win32con.WM_SIZE, 0, 0)
-      self.mainWindow._statusBar = self.statusBar
+      if not self._form._features['GUI:STATUSBAR:SUPPRESS']:
+        hinst = win32api.GetModuleHandle(None)
+        style = win32con.WS_CHILD | win32con.WS_VISIBLE | 
commctrl.SBARS_SIZEGRIP
+        styleEx = 0
+        self.statusBar = Win32Window(self._uiDriver, styleEx, 
commctrl.STATUSCLASSNAME, "",
+          style, 0, 0, 0, 0,
+          self.mainWindow, getNextId(), hinst)
+        x=formWidth*self._uiDriver.widgetWidth
+        statwidths = 
struct.pack("iiiii",x-75-75-50-50,x-75-75-50,x-75-75,x-75,x)
+        win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETPARTS, 
5, statwidths)
+        win32gui.SendMessage(self.statusBar.GetHwnd(), win32con.WM_SIZE, 0, 0)
+        self.mainWindow._statusBar = self.statusBar
+        
     self._eventHandler = event.eventHandler
 
     self._wrapper.finalize()