[gnue] r8538 - in trunk/gnue-forms/src/uidrivers:

commit-gnue
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8538 - in trunk/gnue-forms/src/uidrivers: _base/widgets gtk2/wid

From:	johannes
Subject:	[gnue] r8538 - in trunk/gnue-forms/src/uidrivers: _base/widgets gtk2/widgets gtk2/widgets/form html/widgets html/widgets/form qt/widgets qt/widgets/form win32/widgets win32/widgets/form wx/widgets wx/widgets/form wx26/widgets
Date:	Fri, 21 Jul 2006 02:46:11 -0500 (CDT)
Author: johannes
Date: 2006-07-21 02:46:09 -0500 (Fri, 21 Jul 2006)
New Revision: 8538

Modified:
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
   trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/html/widgets/page.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/page.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/page.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
Log:
Changed _containerToolkitWidget to _container


Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-07-21 
07:46:09 UTC (rev 8538)
@@ -43,9 +43,8 @@
     @ivar _gfObject: The GFObject for this UIWidget
     @ivar widgets: Sequence of ui driver specific widgets created for this
         UIWidget.
-    @ivar _containerToolkitWidget: If this widget can contain other widgets
-        then _containerToolkitWidget is the specific container children should
-        use (as parent)
+    @ivar _container: If this widget can contain other widgets then _container
+        is the specific container children should use (as parent)
     @ivar managed: This boolean flag determines wether a widget is used in a
         managed layout or in a positioned one
     @ivar _uiDriver: the GFUserInterface instance of the current ui driver used
@@ -66,7 +65,7 @@
 
         self._creationEvent = event
         self._gfObject = event.object
-        self._containerToolkitWidget = None 
+        self._container = None 
         self._uiForm = None
         self._uiDriver = None
         self._form = None
@@ -113,7 +112,7 @@
 
         try:
             owner = self.getParent()
-            self._creationEvent.container = owner._containerToolkitWidget
+            self._creationEvent.container = owner._container
 
         except AttributeError:
             if not hasattr(self._creationEvent, 'container'):

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-07-21 
07:46:09 UTC (rev 8538)
@@ -120,7 +120,7 @@
       self._wrapper = wrappers.PlainWrapper (self)
 
     newWidget = self._wrapper.pane
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     
     # Add the menu
     if not self._form._features ['GUI:MENUBAR:SUPPRESS']:

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -39,7 +39,7 @@
   def _create_widget (self, event, spacer):
     gfObject  = event.object
     newWidget = self._uiForm._wrapper.createPage (gfObject)
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
     
 

Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py  2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py  2006-07-21 
07:46:09 UTC (rev 8538)
@@ -73,7 +73,7 @@
     dhtml = "<hr/>"
     HtmlWidget(self.mainWindow, self._uiDriver, 'LINE', dhtml, getNextId())
 
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
 
   def _ui_goto_page_(self,event):

Modified: trunk/gnue-forms/src/uidrivers/html/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/page.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -36,7 +36,7 @@
 
     dhtml = '<page>'
     newWidget = HtmlWidget(event.container, self._uiDriver, 'PAGE', dhtml, 
getNextId())
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
 
 

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2006-07-21 
07:46:09 UTC (rev 8538)
@@ -93,7 +93,7 @@
 
     newWidget = self._wrapper.pane
 ##    self._uiDriver._disabledColour = newWidget.paletteBackgroundColor()
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
 
 
     # Add the menu

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/page.py   2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/page.py   2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -54,7 +54,7 @@
 
     newWidget = self._uiForm._wrapper.createPage(object)  
     _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize, 
self._uiDriver)
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
 
 configuration = {

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-07-21 
07:46:09 UTC (rev 8538)
@@ -105,7 +105,7 @@
       self._wrapper = wrappers.PlainWrapper(self)
 
     newWidget = self._wrapper.pane
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
 
     # Add the menu
     if not self._form._features['GUI:MENUBAR:SUPPRESS']:

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/page.py        2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/page.py        2006-07-21 
07:46:09 UTC (rev 8538)
@@ -40,7 +40,7 @@
     object = event.object
 
     newWidget = self._uiForm._wrapper.createPage(object)  
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
 
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-07-21 
07:46:09 UTC (rev 8538)
@@ -105,7 +105,7 @@
       self._wrapper = wrappers.PlainWrapper(self)
 
     newWidget = self._wrapper.pane
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
 
     if self._form.style != 'dialog':
       # Add the menu

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/page.py   2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/page.py   2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -50,7 +50,7 @@
 
     newWidget = self._uiForm._wrapper.createPage(object)
     _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize, 
self._uiDriver)
-    self._containerToolkitWidget = newWidget
+    self._container = newWidget
     return newWidget
 
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/box.py  2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -106,7 +106,7 @@
         self.widget.Add(stb_sizer, 1, wx.EXPAND | wx.ALL, 3)
 
         owner.add_widgets(self, 0)
-        self._containerToolkitWidget = parent
+        self._container = parent
 
         return self.container_sizer
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -142,7 +142,7 @@
 
         # and add it to the base sizer
         base_sizer.Add(container, 1, wx.EXPAND | wx.ALL, 6)
-        self._containerToolkitWidget = container
+        self._container = container
 
         return self.main_window
 
@@ -176,9 +176,9 @@
 
     def __update_sizer (self):
 
-        if isinstance(self._containerToolkitWidget, wx.Notebook):
-            self._containerToolkitWidget.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
-                    self.__on_page_changed, self._containerToolkitWidget)
+        if isinstance(self._container, wx.Notebook):
+            self._container.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
+                    self.__on_page_changed, self._container)
 
         self.show_page(0, True)
         self.main_window.SetSizerAndFit(self.__master_sizer)
@@ -238,7 +238,7 @@
         @param page_index: the zero-based index of the page to show
         """
 
-        container = self._containerToolkitWidget
+        container = self._container
         if isinstance (container, wx.Notebook):
             container.SetSelection(page_index)
         else:

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -52,7 +52,7 @@
         self.container_sizer = wx.GridBagSizer()
         outer.Add(self.container_sizer, 1, wx.EXPAND | wx.ALL, 2)
 
-        self._containerToolkitWidget = self.widget
+        self._container = self.widget
 
         self._max = self._gfObject.rows
         self._visible = self._max

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py     2006-07-19 
12:37:01 UTC (rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/gridline.py     2006-07-21 
07:46:09 UTC (rev 8538)
@@ -51,7 +51,7 @@
         self.__prepare_columns(parent, spacer)
 
         self.container_sizer = sizer
-        self._containerToolkitWidget = parent
+        self._container = parent
 
         owner.add_widgets(self, spacer)
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/hbox.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -88,7 +88,7 @@
 
         next.Add(self.container_sizer, 1, wx.EXPAND | wx.ALL, border)
 
-        self._containerToolkitWidget = event.container
+        self._container = event.container
         self.__current_col = 0
 
         self.widget = outer

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -57,7 +57,7 @@
             elif isinstance(event.container, wx.MenuBar):
                 event.container.Append(widget, self._gfObject.label)
 
-        self._containerToolkitWidget = widget
+        self._container = widget
 
         return widget
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/page.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -44,7 +44,7 @@
         wx.Sizer.  For a positioned layout this is a wx.GridBagSizer and for
         managed layouts it is a vertical wx.BoxSizer.  This sizer is embedded
         within the page panel using a border of 4 pixels.
-    @ivar _containerToolkitWidget: the page panel which gets the parent window
+    @ivar _container: the page panel which gets the parent window
         for all child widgets
     """
 
@@ -98,7 +98,7 @@
 
         page_sizer.Add(self.container_sizer, 1, wx.EXPAND | wx.ALL, 4)
 
-        self._containerToolkitWidget = page_panel
+        self._container = page_panel
         return page_panel
 
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-07-19 12:37:01 UTC 
(rev 8537)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/vbox.py 2006-07-21 07:46:09 UTC 
(rev 8538)
@@ -87,7 +87,7 @@
 
         next.Add(self.container_sizer, 1, wx.EXPAND | wx.ALL, border)
 
-        self._containerToolkitWidget = event.container
+        self._container = event.container
         self.__current_row = 0
 
         self.widget = outer
[Prev in Thread]
Current Thread
[Next in Thread]
[gnue] r8538 - in trunk/gnue-forms/src/uidrivers: _base/widgets gtk2/widgets gtk2/widgets/form html/widgets html/widgets/form qt/widgets qt/widgets/form win32/widgets win32/widgets/form wx/widgets wx/widgets/form wx26/widgets, johannes <=
Prev by Date: [gnue] r8537 - trunk/gnue-forms/src/uidrivers/_base/widgets
Next by Date: [gnue] r8539 - in trunk: gnue-appserver/packaging/fink gnue-common/packaging/fink gnue-designer/packaging/fink gnue-forms/packaging/fink gnue-navigator/packaging/fink gnue-reports/packaging/fink
Previous by thread: [gnue] r8537 - trunk/gnue-forms/src/uidrivers/_base/widgets
Next by thread: [gnue] r8539 - in trunk: gnue-appserver/packaging/fink gnue-common/packaging/fink gnue-designer/packaging/fink gnue-forms/packaging/fink gnue-navigator/packaging/fink gnue-reports/packaging/fink
Index(es):
- Date
- Thread