[gnue] r9512 - in trunk/gnue-forms/src/uidrivers: . _base gtk2 html qt3 qt4 win32 wx wx26

[reinhard]

Author: reinhard
Date: 2007-04-24 14:15:08 -0500 (Tue, 24 Apr 2007)
New Revision: 9512

Removed:
   trunk/gnue-forms/src/uidrivers/_commonGuiToolkit/
Modified:
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/html/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt4/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
   trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
Log:
Removed _commonGuiToolkit as it is not necesary any more.


Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -183,7 +183,8 @@
           uiParent = self._gfObjToUIWidget.get(parent, self)
       
           # Build widget
-          event = self._updateCreateEvent (events.Event ('CreateUIWidget', 
None,
+          event = events.Event ('CreateUIWidget', None,
+                        eventHandler = self.dispatchEvent,
                         object       = object,
                         parent       = uiParent,
                         #container   = self.currentWidget[0],
@@ -192,7 +193,7 @@
                         widgetWidth  = self.widgetWidth,
                         widgetHeight = self.widgetHeight,
                         interface    = self,
-                        initialize   = 1))      
+                        initialize   = 1)
           uiWidget  = supported.configuration ['baseClass'] (event)
           
           # Store parent GFForm reference in widget
@@ -244,18 +245,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Update the widget creation event
-  # ---------------------------------------------------------------------------
-
-  def _updateCreateEvent(self, event):
-    """
-    Can be used by UI drivers to add more attributes to the event that creates
-    a widget. Called by the _stdConstructor during the building of the UI
-    """
-    return event
-
-
-  # ---------------------------------------------------------------------------
   # Get an input dialog for a given set of fields
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -28,6 +28,7 @@
 
 from gnue.common.apps import i18n
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
   import pygtk
@@ -57,9 +58,6 @@
 
 from gnue.forms.GFForm import *
 
-from gnue.forms.uidrivers._base import UIdriver as BaseDriver
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
-
 from gnue.forms.uidrivers.gtk2.GFApp import *
 from gnue.forms.uidrivers.gtk2.SplashScreen import *
 from gnue.forms.uidrivers.gtk2.widgets._base  import *
@@ -69,7 +67,7 @@
 # This class implements a User Interface for GTK2
 # =============================================================================
 
-class GFUserInterface (commonToolkit.GFUserInterface):
+class GFUserInterface (GFUserInterfaceBase):
 
   _WidgetToGFObj = {}
   _WidgetToUIObj = {}
@@ -80,7 +78,7 @@
   
   def __init__ (self, *args, **params):
 
-    commonToolkit.GFUserInterface.__init__ (self, *args, **params)
+    GFUserInterfaceBase.__init__ (self, *args, **params)
     self.name = "GTK2"
     self._display = gtk.gdk.display_manager_get ().get_default_display ()
 

Modified: trunk/gnue-forms/src/uidrivers/html/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/UIdriver.py     2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/html/UIdriver.py     2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -30,18 +30,18 @@
 import string
 
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 from gnue.common import events
 from gnue.common.apps import GConfig
 
 from gnue.forms import VERSION
 from gnue.forms.GFForm import *
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 
 from gnue.forms.uidrivers.html.GFhtmlApp import *
 
 
-class GFUserInterface(commonToolkit.GFUserInterface):
+class GFUserInterface(GFUserInterfaceBase):
     _WidgetToGFObj = {}
     _WidgetToUIObj = {}
     _IdToWidget = {}
@@ -53,7 +53,7 @@
   
     def __init__ (self, *args, **params):
 
-        commonToolkit.GFUserInterface.__init__ (self, *args, **params)
+        GFUserInterfaceBase.__init__ (self, *args, **params)
         self.name = "HTML"
         # self._display = ...
 

Modified: trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -27,6 +27,7 @@
 import os.path
 
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
     import qt
@@ -36,7 +37,6 @@
             u_("The GNUe-Forms QT3 driver requires PyQT.")
 
 from gnue.common.apps import GConfig
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 from gnue.forms.uidrivers.qt3.QTApp import *
 from gnue.forms.uidrivers.qt3 import dialogs
 
@@ -77,7 +77,7 @@
 # This class implements the User Interface for QT3
 # =============================================================================
 
-class GFUserInterface(commonToolkit.GFUserInterface):
+class GFUserInterface(GFUserInterfaceBase):
 
     __rearrange_boxes__ = True
 
@@ -88,7 +88,7 @@
     def __init__(self, eventHandler, name="Undefined", disableSplash=None,
             parentContainer=None, moduleName=None):
 
-        commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+        GFUserInterfaceBase.__init__(self, eventHandler, name,
                               disableSplash, parentContainer, moduleName)
         self.__splash = None
 

Modified: trunk/gnue-forms/src/uidrivers/qt4/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/UIdriver.py      2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/qt4/UIdriver.py      2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -27,6 +27,7 @@
 import os.path
 
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
     from PyQt4 import Qt
@@ -36,7 +37,6 @@
             u_("The GNUe-Forms qt4 driver requires PyQT 4.1+")
 
 from gnue.common.apps import GConfig
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 from gnue.forms.uidrivers.qt4.QTApp import *
 from gnue.forms.uidrivers.qt4 import dialogs
 
@@ -71,7 +71,7 @@
 # This class implements the User Interface for qt4
 # =============================================================================
 
-class GFUserInterface(commonToolkit.GFUserInterface):
+class GFUserInterface(GFUserInterfaceBase):
 
     __rearrange_boxes__ = True
 
@@ -82,7 +82,7 @@
     def __init__(self, eventHandler, name="Undefined", disableSplash=None,
             parentContainer=None, moduleName=None):
 
-        commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+        GFUserInterfaceBase.__init__(self, eventHandler, name,
                               disableSplash, parentContainer, moduleName)
         self.__splash = None
 

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -24,6 +24,7 @@
 
 from gnue.common.apps import i18n
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
     import win32gui, win32con, afxres, win32ui
@@ -39,7 +40,6 @@
 
 from gnue.forms import VERSION
 from gnue.forms.GFForm import *
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 
 from gnue.forms.uidrivers.win32.GFwin32App import *
 #from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
@@ -78,7 +78,7 @@
 # The public interface to the User Interface
 # All UIs must provide this class
 #
-class GFUserInterface(commonToolkit.GFUserInterface):
+class GFUserInterface(GFUserInterfaceBase):
 
     _message_map = { win32con.WM_VSCROLL    : OnWMVScroll,
                      win32con.WM_MENUSELECT : OnWMMenuselect,
@@ -97,7 +97,7 @@
     def __init__(self, eventHandler, name="Undefined", disableSplash=None,
             parentContainer=None, moduleName=None):
   
-        commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+        GFUserInterfaceBase.__init__(self, eventHandler, name,
                 disableSplash, parentContainer, moduleName)
         self.__splash = None
   

Modified: trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -26,6 +26,7 @@
 import string
 
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
   from wxPython import __version__ as WXVERSION
@@ -41,8 +42,6 @@
 
 from gnue.forms.GFForm import *
 
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
-
 from gnue.forms.uidrivers.wx.GFwxApp import *
 from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
 from gnue.forms.uidrivers.wx.widgets._base  import *
@@ -51,7 +50,7 @@
 
 from common import wxEncode
 
-class GFUserInterface(commonToolkit.GFUserInterface):
+class GFUserInterface(GFUserInterfaceBase):
   """
   The public interface to a GNUe Forms user interface
   All UI drivers must provide this class
@@ -60,7 +59,7 @@
   def __init__(self, eventHandler, name="Undefined", disableSplash=None,
           parentContainer=None, moduleName=None):
 
-    commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+    GFUserInterfaceBase.__init__(self, eventHandler, name,
               disableSplash, parentContainer, moduleName)
 
     self._IdToTkObj = {}

Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2007-04-24 18:48:14 UTC 
(rev 9511)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2007-04-24 19:15:08 UTC 
(rev 9512)
@@ -24,6 +24,7 @@
 import sys
 import os.path
 from gnue.forms.uidrivers._base import Exceptions
+from gnue.forms.uidrivers._base.UIdriver import GFUserInterfaceBase
 
 try:
   if not hasattr(sys, 'frozen'):
@@ -39,7 +40,6 @@
 
 import wx.lib.colourdb
 
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 from gnue.forms.uidrivers.wx26 import dialogs, UISplashScreen
 from gnue.common.apps import GConfig
 
@@ -48,7 +48,7 @@
 # This class implements a User Interface for wx 2.6
 # =============================================================================
 
-class GFUserInterface (commonToolkit.GFUserInterface):
+class GFUserInterface (GFUserInterfaceBase):
   """
   An implementation of the common GUI toolkit interface using wx 2.6+.
 
@@ -66,7 +66,7 @@
   def __init__(self, eventHandler, name="Undefined", disableSplash=None,
           parentContainer=None, moduleName=None):
 
-      commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+      GFUserInterfaceBase.__init__(self, eventHandler, name,
               disableSplash, parentContainer, moduleName)
 
       self.name = "wx 2.6"