[gnue] r9260 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/curses uidrivers/gtk2 uidrivers/qt3 uidrivers/win32 uidrivers/wx uidrivers/wx26

[reinhard]

Author: reinhard
Date: 2007-01-11 14:06:46 -0600 (Thu, 11 Jan 2007)
New Revision: 9260

Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/qt3/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:
Merged GFUserInterface._initialize into __init__.


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2007-01-11 19:56:13 UTC (rev 9259)
+++ trunk/gnue-forms/src/GFInstance.py  2007-01-11 20:06:46 UTC (rev 9260)
@@ -253,9 +253,6 @@
 
         assert gEnter(4)
 
-        assert gDebug(4, "Initializing user interface driver object")
-        self._uiinstance.initialize()
-
         main_form = self._formsDictionary['__main__']
 
         # Load standard menu and merge it into main form

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -160,35 +160,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Initialize
-  # ---------------------------------------------------------------------------
-
-  def initialize (self):
-    """
-    This function gets called on activation of a GFInstance. It performs the
-    last steps needed for handling forms. Descendants of this class must put
-    their special init stuff into _initialize (), which gets called
-    automatically from this function.
-    """
-
-    # now call the implementation specific initialization
-    self._initialize ()
-
-
-  # ---------------------------------------------------------------------------
-  # Driver-specific initializations
-  # ---------------------------------------------------------------------------
-
-  def _initialize (self):
-    """
-    Descendants of this class will override this function to do all
-    initializations.
-    """
-    pass
-
-
-
-  # ---------------------------------------------------------------------------
   # Build the user interface
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -91,16 +91,6 @@
         # ...) Meanwhile we're using Ctrl-W (hardcoded)
         self.lookupKey = 23
 
-
-    # -------------------------------------------------------------------------
-    # Initialize user interface
-    # -------------------------------------------------------------------------
-
-    def _initialize(self):
-        """
-        Initialize the interface
-        """
-
         self.widgetWidth = 1
         self.widgetHeight = 1
         self.textWidth = 1

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -84,13 +84,6 @@
     self.name = "GTK2"
     self._display = gtk.gdk.display_manager_get ().get_default_display ()
 
-
-  # ---------------------------------------------------------------------------
-  # Initialize user interface
-  # ---------------------------------------------------------------------------
-
-  def _initialize (self):
-
     self.app = getApp ()
 
     if not self._disableSplash:

Modified: trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/qt3/UIdriver.py      2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -96,13 +96,6 @@
         self.textWidth = self.widgetWidth = -1
         self.textHeight = self.widgetHeight = -1
 
-
-    # -------------------------------------------------------------------------
-    # Initialize user interface
-    # -------------------------------------------------------------------------
-
-    def _initialize(self):
-
         self.name = "QT3"
 
         if not self._disableSplash:

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -101,23 +101,6 @@
                 disableSplash, parentContainer, moduleName)
         self.__splash = None
   
-
-    def _wndproc(self, hwnd, msg, wparam, lparam):
-        try:
-            widget = self._win32app._HwndToTkObj[hwnd]
-        except:
-            return win32gui.DefWindowProc(hwnd, msg, wparam, lparam)
-      
-        OnWM = self._message_map.get(msg, OnWMDefault)
-        return OnWM(hwnd, msg, wparam, lparam, widget)
-
-
-    # 
---------------------------------------------------------------------------
-    # Initialize the user interface
-    # 
---------------------------------------------------------------------------
-  
-    def _initialize(self):
-
         self._disabledColour = afxres.AFX_IDC_COLOR_LIGHTGRAY
         self._win32app = get_win32_app()
         win32gui.InitCommonControls()
@@ -183,6 +166,17 @@
         dummyWindow.ReleaseDC(dc)
 
 
+    def _wndproc(self, hwnd, msg, wparam, lparam):
+        try:
+            widget = self._win32app._HwndToTkObj[hwnd]
+        except:
+            return win32gui.DefWindowProc(hwnd, msg, wparam, lparam)
+      
+        OnWM = self._message_map.get(msg, OnWMDefault)
+        return OnWM(hwnd, msg, wparam, lparam, widget)
+
+
+
     # mainLoop
     #
     # The primary loop of the user interface.  Called once the UI is

Modified: trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -57,14 +57,12 @@
   All UI drivers must provide this class
   """
 
-  def _initialize(self):
+  def __init__(self, eventHandler, name="Undefined", disableSplash=None,
+          parentContainer=None, moduleName=None):
 
-    ################################################################
-    # WX Specifics
-    ################################################################
+    commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+              disableSplash, parentContainer, moduleName)
 
-##    self._disabledColour = wxLIGHT_GREY
-
     self._wxapp = getWxApp()
 
     #

Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2007-01-11 19:56:13 UTC 
(rev 9259)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2007-01-11 20:06:46 UTC 
(rev 9260)
@@ -68,35 +68,23 @@
 
       commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
               disableSplash, parentContainer, moduleName)
-      self.__splash = None
 
+      self.name = "wx 2.6"
+      self.app  = wx.GetApp () or wx.App ()
+      wx.lib.colourdb.updateColourDB()
 
-  # ---------------------------------------------------------------------------
-  # Initialize the user interface
-  # ---------------------------------------------------------------------------
+      (self.controlHeight, self.cellWidth, self.cellHeight) = self.__getSizes 
()
 
-  def _initialize (self):
-    """
-    Initialize the interface and determine the dimensions of a form-cell.
-    """
+      self.textWidth  = self.widgetWidth  = self.cellWidth
+      self.textHeight = self.widgetHeight = self.cellHeight
 
-    self.name = "wx 2.6"
-    self.app  = wx.GetApp () or wx.App ()
-    wx.lib.colourdb.updateColourDB()
+      if not self._disableSplash:
+          self.__splash = UISplashScreen.SplashScreen ()
+          self.__splash.Show ()
+      else:
+          self.__splash = None
 
-    (self.controlHeight, self.cellWidth, self.cellHeight) = self.__getSizes ()
 
-    self.textWidth  = self.widgetWidth  = self.cellWidth
-    self.textHeight = self.widgetHeight = self.cellHeight
-
-    if not self._disableSplash:
-      self.__splash = UISplashScreen.SplashScreen ()
-      self.__splash.Show ()
-    else:
-      self.__splash = None
-
-
-
   # ---------------------------------------------------------------------------
   # Get the widget sizes and the dimension of a form cell
   # ---------------------------------------------------------------------------