commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r6297 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets widgets/form


From: reinhard
Subject: r6297 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets widgets/form
Date: Thu, 16 Sep 2004 07:23:38 -0500 (CDT)

Author: reinhard
Date: 2004-09-16 07:23:37 -0500 (Thu, 16 Sep 2004)
New Revision: 6297

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/common.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
Log:
Don't enclose everything in a try...except block, but let gtk2 call the
standard exception hook.


Modified: trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2004-09-16 12:08:05 UTC 
(rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2004-09-16 12:23:37 UTC 
(rev 6297)
@@ -117,13 +117,9 @@
 
   def _menuHandler (self, menuItem, userAction):
 
-    try:
-      event = "request%s" % userAction.event
-      self.driver.dispatchEvent (event, _form = self.form)
+    event = "request%s" % userAction.event
+    self.driver.dispatchEvent (event, _form = self.form)
 
-    except:
-      self.driver.showException ()
-    
 
   # ---------------------------------------------------------------------------
   # Display the tooltip in the statusbar if a menu item get's selected
@@ -131,11 +127,8 @@
 
   def _selectHandler (self, menuItem, userAction):
 
-    try:
-      self.container._setStatusBar (userAction.description, None, None, None,
-                                    None, None, None)
-    except:
-      self.driver.showException ()
+    self.container._setStatusBar (userAction.description, None, None, None,
+                                  None, None, None)
 
 
   # ---------------------------------------------------------------------------
@@ -144,13 +137,9 @@
 
   def _deselectHandler (self, menuItem, userAction):
 
-    try:
-      self.container._setStatusBar ('', None, None, None, None, None, None)
+    self.container._setStatusBar ('', None, None, None, None, None, None)
 
-    except:
-      self.driver.showException ()
 
-
   # ---------------------------------------------------------------------------
   # Add a separator
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py      2004-09-16 12:08:05 UTC 
(rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py      2004-09-16 12:23:37 UTC 
(rev 6297)
@@ -92,32 +92,24 @@
 
   def _toggleEvent (self, button, userAction):
 
-    try:
-      if button.get_active ():
-        event = 'request%s' % userAction.event
-      else:
-        event = 'request%s' % userAction.canToggle
+    if button.get_active ():
+      event = 'request%s' % userAction.event
+    else:
+      event = 'request%s' % userAction.canToggle
 
-      self.driver.dispatchEvent (event, _form = self.form)
+    self.driver.dispatchEvent (event, _form = self.form)
 
-    except:
-      self.driver.showException ()
 
-
   # ---------------------------------------------------------------------------
   # Event handler for toolbar buttons
   # ---------------------------------------------------------------------------
 
   def _buttonPress (self, button, userAction):
 
-    try:
-      event = 'request%s' % userAction.event
-      self.driver.dispatchEvent (event, _form = self.form)
+    event = 'request%s' % userAction.event
+    self.driver.dispatchEvent (event, _form = self.form)
 
-    except:
-      self.driver.showException ()
 
-        
   # ---------------------------------------------------------------------------
   # Add a separator
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-09-16 12:08:05 UTC 
(rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-09-16 12:23:37 UTC 
(rev 6297)
@@ -211,51 +211,42 @@
   # ---------------------------------------------------------------------------
 
   def getClipboardContents (self, event):
-    try:
-      gDebug (1, "Retrieving clipboard contents")
 
-      widget = self._UIform.mainWindow.get_focus ()
-      if isinstance (widget, gtk.TextView):
-        gDebug (1, "Clipboard is %s" % self._clipboard)
+    gDebug (1, "Retrieving clipboard contents")
 
-        tBuffer = widget.get_buffer ()
-        pos = tBuffer.get_iter_at_mark (tBuffer.get_insert ())
-        tBuffer.paste_clipboard (self._clipboard, pos, widget.get_editable())
+    widget = self._UIform.mainWindow.get_focus ()
+    if isinstance (widget, gtk.TextView):
+      gDebug (1, "Clipboard is %s" % self._clipboard)
 
+      tBuffer = widget.get_buffer ()
+      pos = tBuffer.get_iter_at_mark (tBuffer.get_insert ())
+      tBuffer.paste_clipboard (self._clipboard, pos, widget.get_editable())
 
-      elif hasattr (widget, 'paste_clipboard'):
-        gDebug (3, "calling %s.paste_clipboard" % widget)
-        widget.paste_clipboard ()
+    elif hasattr (widget, 'paste_clipboard'):
+      gDebug (3, "calling %s.paste_clipboard" % widget)
+      widget.paste_clipboard ()
 
-      event.__result__ = None
+    event.__result__ = None
 
-    except:
-      self.showException ()
 
-
   # ---------------------------------------------------------------------------
   # Set some text into the clipboard
   # ---------------------------------------------------------------------------
 
   def setClipboardContents (self, event):
-    try:
-      gDebug (1, "Setting clipboard contents")
 
-      widget = self._UIform.mainWindow.get_focus ()
-      if isinstance (widget, gtk.TextView):
-        tBuffer = widget.get_buffer ()
-        tBuffer.copy_clipboard (self._clipboard)
+    gDebug (1, "Setting clipboard contents")
 
-      if hasattr (widget, 'copy_clipboard'):
-        gDebug (3, "calling %s.copy_clipboard ()" % widget)
-        widget.copy_clipboard ()
+    widget = self._UIform.mainWindow.get_focus ()
+    if isinstance (widget, gtk.TextView):
+      tBuffer = widget.get_buffer ()
+      tBuffer.copy_clipboard (self._clipboard)
 
-    except:
-      self.showException ()
+    if hasattr (widget, 'copy_clipboard'):
+      gDebug (3, "calling %s.copy_clipboard ()" % widget)
+      widget.copy_clipboard ()
 
 
-
-
   # ---------------------------------------------------------------------------
   # Set the forms title
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/common.py       2004-09-16 12:08:05 UTC 
(rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/common.py       2004-09-16 12:23:37 UTC 
(rev 6297)
@@ -45,51 +45,46 @@
 # -----------------------------------------------------------------------------
 
 def _keyPressHandler (widget, event, uiDriver, eventHandler, lookup):
-  try:
-    gDebug (2, "Common-keypress: %s %s" % (event.type, event.keyval))
 
-    if event.type != gtk.gdk.KEY_PRESS:
-      return False
+  gDebug (2, "Common-keypress: %s %s" % (event.type, event.keyval))
 
-    action  = None
-    keycode = event.keyval
+  if event.type != gtk.gdk.KEY_PRESS:
+    return False
 
-    isShift = event.state & gtk.gdk.SHIFT_MASK   > 0
-    isLock  = event.state & gtk.gdk.LOCK_MASK    > 0
-    isCtrl  = event.state & gtk.gdk.CONTROL_MASK > 0
-    isMod1  = event.state & gtk.gdk.MOD1_MASK    > 0
+  action  = None
+  keycode = event.keyval
 
-    if keycode == gtk.keysyms.ISO_Left_Tab:
-      gDebug (3, "Mapping Shit-Tab to Tab")
-      keycode = gtk.keysyms.Tab
+  isShift = event.state & gtk.gdk.SHIFT_MASK   > 0
+  isLock  = event.state & gtk.gdk.LOCK_MASK    > 0
+  isCtrl  = event.state & gtk.gdk.CONTROL_MASK > 0
+  isMod1  = event.state & gtk.gdk.MOD1_MASK    > 0
 
-    if not uiDriver._WidgetToGFObj.has_key (lookup):
-      gDebug (2, "can't find widget %s" % lookup)
-      return False
+  if keycode == gtk.keysyms.ISO_Left_Tab:
+    gDebug (3, "Mapping Shit-Tab to Tab")
+    keycode = gtk.keysyms.Tab
 
-    gfObject = uiDriver._WidgetToGFObj [lookup]
-  
-    # Get the event to process from the KeyMapper
-    command = GFKeyMapper.KeyMapper.getEvent (keycode, isShift, isCtrl, isMod1)
+  if not uiDriver._WidgetToGFObj.has_key (lookup):
+    gDebug (2, "can't find widget %s" % lookup)
+    return False
 
-    if command:
-      action = events.Event ('request%s' % command)
+  gfObject = uiDriver._WidgetToGFObj [lookup]
 
-      # Add the gfObject's _form to the outgoing event
-      # rather than every event in the function
-      gDebug (3, "Calling %s" % action.__event__)
-      action.__dict__.update ({'_form': gfObject._form})
-      eventHandler (action)
-      return True
-    else:
-      gDebug (3, "Key dropped!")
+  # Get the event to process from the KeyMapper
+  command = GFKeyMapper.KeyMapper.getEvent (keycode, isShift, isCtrl, isMod1)
 
-  except:
-    uiDriver.showException ()
+  if command:
+    action = events.Event ('request%s' % command)
 
+    # Add the gfObject's _form to the outgoing event
+    # rather than every event in the function
+    gDebug (3, "Calling %s" % action.__event__)
+    action.__dict__.update ({'_form': gfObject._form})
+    eventHandler (action)
+    return True
+  else:
+    gDebug (3, "Key dropped!")
 
 
-
 #####################################################################
 ##
 ## Keymapper Support

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-09-16 
12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-09-16 
12:23:37 UTC (rev 6297)
@@ -126,30 +126,26 @@
     call to 'requestFOCUS'. If the focused widget needs a jump to another
     record an additional 'requestJUMPRECORD' event will be fired.
     """
-    try:
-      gDebug (2, "FOCUS-IN-EVENT: %s for %s" % (widget, lookupWidget))
-    
-      gfObject = self._uiDriver._WidgetToGFObj [lookupWidget]
-      _formRef = gfObject._form
+    gDebug (2, "FOCUS-IN-EVENT: %s for %s" % (widget, lookupWidget))
+  
+    gfObject = self._uiDriver._WidgetToGFObj [lookupWidget]
+    _formRef = gfObject._form
 
-      if _formRef._currentEntry == gfObject and \
-         self.widgets.index (lookupWidget) == gfObject._visibleIndex:
-        gDebug (1, "SKIPPING since we already have the focus!")
-        return gtk.FALSE
+    if _formRef._currentEntry == gfObject and \
+       self.widgets.index (lookupWidget) == gfObject._visibleIndex:
+      gDebug (1, "SKIPPING since we already have the focus!")
+      return gtk.FALSE
 
-      if _formRef._currentEntry != gfObject:
-        action = events.Event ('requestFOCUS', gfObject, _form = _formRef)
-        self._eventHandler (action)
+    if _formRef._currentEntry != gfObject:
+      action = events.Event ('requestFOCUS', gfObject, _form = _formRef)
+      self._eventHandler (action)
 
-      adjust = self.widgets.index (lookupWidget) - gfObject._visibleIndex
-      if adjust:
-        gDebug (1, "Adjusting record to %s" % adjust)
-        action = events.Event ('requestJUMPRECORD', adjust, _form = _formRef)
-        self._eventHandler (action)
+    adjust = self.widgets.index (lookupWidget) - gfObject._visibleIndex
+    if adjust:
+      gDebug (1, "Adjusting record to %s" % adjust)
+      action = events.Event ('requestJUMPRECORD', adjust, _form = _formRef)
+      self._eventHandler (action)
 
-    except:
-      self._uiDriver.showException ()
-
     return gtk.FALSE
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-09-16 
12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-09-16 
12:23:37 UTC (rev 6297)
@@ -60,15 +60,12 @@
   # ---------------------------------------------------------------------------
 
   def buttonHandler (self, widget):
-    try:
-      gfObject = self._uiDriver._WidgetToGFObj [widget]
 
-      GDebug.printMesg (1, "buttonActivated on %s" % gfObject)
-      action = events.Event ('buttonActivated', gfObject)
-      self._eventHandler (action)
+    gfObject = self._uiDriver._WidgetToGFObj [widget]
 
-    except:
-      self._uiDriver.showException ()
+    GDebug.printMesg (1, "buttonActivated on %s" % gfObject)
+    action = events.Event ('buttonActivated', gfObject)
+    self._eventHandler (action)
 
 
 # -----------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-09-16 
12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-09-16 
12:23:37 UTC (rev 6297)
@@ -259,40 +259,33 @@
 
   def insertTextHandler (self, widget, newtext, length, pos, gfObject):
 
-    try:
-      gDebug (1, "insert gtk.Entry () '%s' at %d (%s) into %s" % \
-          (newtext, widget.get_position (), pos, widget))
+    gDebug (1, "insert gtk.Entry () '%s' at %d (%s) into %s" % \
+               (newtext, widget.get_position (), pos, widget))
 
-      text   = unicode (newtext, 'utf-8')
-      action = events.Event ('requestKEYPRESS', text = text,
-                             _form = gfObject._form)
+    text   = unicode (newtext, 'utf-8')
+    action = events.Event ('requestKEYPRESS', text = text,
+                           _form = gfObject._form)
 
-      widget.stop_emission ('insert-text')
-      gtk.idle_add (self._eventHandler, action)
+    widget.stop_emission ('insert-text')
+    gtk.idle_add (self._eventHandler, action)
 
-    except:
-      self._uiDriver.showException ()
 
-
   # ---------------------------------------------------------------------------
   # delete a portion of text from a gtk.Entry () widget
   # ---------------------------------------------------------------------------
 
   def deleteTextHandler (self, widget, start_pos, end_pos, gfObject):
-    try:
-      gDebug (1, "Delete %s to %s in %s" % (start_pos, end_pos, widget))
 
-      action = events.Event ('requestDELETERANGE',
-                              start_pos = start_pos,
-                              end_pos   = end_pos,
-                              position  = widget.get_position (),
-                              _form     = gfObject._form)
+    gDebug (1, "Delete %s to %s in %s" % (start_pos, end_pos, widget))
 
-      widget.stop_emission ('delete-text')
-      self._eventHandler (action)
+    action = events.Event ('requestDELETERANGE',
+                            start_pos = start_pos,
+                            end_pos   = end_pos,
+                            position  = widget.get_position (),
+                            _form     = gfObject._form)
 
-    except:
-      self._uiDriver.showException ()
+    widget.stop_emission ('delete-text')
+    self._eventHandler (action)
 
 
   # ---------------------------------------------------------------------------
@@ -301,51 +294,42 @@
 
   def insertBufferHandler (self, tBuffer, iterator, newtext, length, widget):
 
-    try:
-      gDebug (1, "gtk.TextBuffer insert '%s' at %s" % \
-          (newtext, iterator.get_offset ()))
+    gDebug (1, "gtk.TextBuffer insert '%s' at %s" % \
+               (newtext, iterator.get_offset ()))
 
-      gfObject = self._uiDriver._WidgetToGFObj [widget]
-      text = unicode (newtext, 'utf-8')
+    gfObject = self._uiDriver._WidgetToGFObj [widget]
+    text = unicode (newtext, 'utf-8')
 
-      action = events.Event ('requestINSERTAT', text, text = text,
-                             position = iterator.get_offset (),
-                             _form = gfObject._form)
+    action = events.Event ('requestINSERTAT', text, text = text,
+                           position = iterator.get_offset (),
+                           _form = gfObject._form)
 
-      tBuffer.stop_emission ('insert-text')
-      self._eventHandler (action)
+    tBuffer.stop_emission ('insert-text')
+    self._eventHandler (action)
 
-    except:
-      self._uiDriver.showException ()
 
-
-
   # ---------------------------------------------------------------------------
   # Handle deletes in a textView widget
   # ---------------------------------------------------------------------------
 
   def deleteBufferHandler (self, tBuffer, start, end, widget):
 
-    try:
-      gDebug (1, "gtk.TextBuffer delete %s to %s in %s" \
-          % (start.get_offset (), end.get_offset (), widget))
+    gDebug (1, "gtk.TextBuffer delete %s to %s in %s" \
+                % (start.get_offset (), end.get_offset (), widget))
 
-      gfObject = self._uiDriver._WidgetToGFObj [widget]
+    gfObject = self._uiDriver._WidgetToGFObj [widget]
 
-      action = events.Event ('requestDELETERANGE',
-                              start_pos = start.get_offset (),
-                              end_pos   = end.get_offset (),
-                              position  = tBuffer.get_iter_at_mark ( \
-                                          tBuffer.get_insert ()).get_offset (),
-                              _form     = gfObject._form)
+    action = events.Event ('requestDELETERANGE',
+                            start_pos = start.get_offset (),
+                            end_pos   = end.get_offset (),
+                            position  = tBuffer.get_iter_at_mark ( \
+                                        tBuffer.get_insert ()).get_offset (),
+                            _form     = gfObject._form)
 
-      tBuffer.stop_emission ('delete-range')
-      self._eventHandler (action)
+    tBuffer.stop_emission ('delete-range')
+    self._eventHandler (action)
 
-    except:
-      self._uiDriver.showException ()
 
-
   # ---------------------------------------------------------------------------
   # Handle the tab-key in a textView widget to move the focus
   # ---------------------------------------------------------------------------
@@ -356,36 +340,31 @@
     both keys move the cursor in the text view widget. Up- and down-keys in the
     first or last row moves the focus out of the widget.
     """
+    if event.keyval == gtk.keysyms.Down:
+      tBuffer = widget.get_buffer ()
 
-    try:
-      if event.keyval == gtk.keysyms.Down:
-        tBuffer = widget.get_buffer ()
+      currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
+      lastLine = tBuffer.get_end_iter ().get_line ()
 
-        currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
-        lastLine = tBuffer.get_end_iter ().get_line ()
+      if currLine != lastLine:
+        tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine + 1))
+      else:
+        widget.get_toplevel ().child_focus (gtk.DIR_TAB_FORWARD)
 
-        if currLine != lastLine:
-          tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine + 1))
-        else:
-          widget.get_toplevel ().child_focus (gtk.DIR_TAB_FORWARD)
+      return gtk.TRUE
 
-        return gtk.TRUE
+    elif event.keyval == gtk.keysyms.Up:
+      tBuffer = widget.get_buffer ()
+      currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
 
-      elif event.keyval == gtk.keysyms.Up:
-        tBuffer = widget.get_buffer ()
-        currLine = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_line ()
+      if currLine > 0:
+        tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine - 1))
 
-        if currLine > 0:
-          tBuffer.place_cursor (tBuffer.get_iter_at_line (currLine - 1))
+      else:
+        widget.get_toplevel ().child_focus (gtk.DIR_TAB_BACKWARD)
 
-        else:
-          widget.get_toplevel ().child_focus (gtk.DIR_TAB_BACKWARD)
+      return gtk.TRUE
 
-        return gtk.TRUE
-
-    except:
-      self._uiDriver.showException ()
-
     # Key not handled, leave it up to the common handler
     return gtk.FALSE
 
@@ -399,28 +378,20 @@
     This function fires a 'requestTOGGLECHECKBOX' event if the state of a
     checkbutton widget changes.
     """
+    buttonStatus = widget.get_active ()
 
-    try:
-      buttonStatus = widget.get_active ()
+    gfObject  = self._uiDriver._WidgetToGFObj [widget]
+    eventdata = [gfObject, buttonStatus]
+    action = events.Event ('requestTOGGLECHKBOX', data = eventdata,
+                           _form = gfObject._form)
 
-      gfObject  = self._uiDriver._WidgetToGFObj [widget]
-      eventdata = [gfObject, buttonStatus]
-      action = events.Event ('requestTOGGLECHKBOX', data = eventdata,
-                             _form = gfObject._form)
+    widget.stop_emission ('toggled')
 
-      widget.stop_emission ('toggled')
+    self._eventHandler (action)
 
-      self._eventHandler (action)
+    return gtk.TRUE
 
-      return gtk.TRUE
 
-    except:
-      self._uiDriver.showException ()
-
-    return False
-
-
-
   # ---------------------------------------------------------------------------
   # Update the list of allowed values on a Combo widget if neccessary
   # ---------------------------------------------------------------------------
@@ -513,19 +484,16 @@
 
   def _selectionChanged (self, treeSelection, gfObject):
 
-    try:
-      (model, tIter) = treeSelection.get_selected ()
-      desc = model.get_value (tIter, 1)
-      fRef = gfObject._form
+    (model, tIter) = treeSelection.get_selected ()
+    desc = model.get_value (tIter, 1)
+    fRef = gfObject._form
 
-      action = events.Event ('requestFOCUS', gfObject, _form = fRef)
-      self._eventHandler (action)
+    action = events.Event ('requestFOCUS', gfObject, _form = fRef)
+    self._eventHandler (action)
 
-      action = events.Event ('requestREPLACEVALUE', text = desc, _form = fRef)
-      self._eventHandler (action)
+    action = events.Event ('requestREPLACEVALUE', text = desc, _form = fRef)
+    self._eventHandler (action)
 
-    except:
-      self._uiDriver.showException ()
 
   # ---------------------------------------------------------------------------
   # Move ui-focus to the corresponding tree view if a slider gets changed
@@ -533,17 +501,13 @@
 
   def _focusOnScroll (self, adjustment, treeView):
 
-    try:
-      gDebug (3, "grabing focus to %s on adjustment-change %s" % (treeView,
-        adjustment))
-      self._blockHandler (treeView, '_focusHandler')
-      treeView.grab_focus ()
-      self._blockHandler (treeView, '_focusHandler', True)
+    gDebug (3, "grabing focus to %s on adjustment-change %s" % (treeView,
+                                                                adjustment))
+    self._blockHandler (treeView, '_focusHandler')
+    treeView.grab_focus ()
+    self._blockHandler (treeView, '_focusHandler', True)
 
-    except:
-      self._uiDriver.showException ()
 
-
   # ---------------------------------------------------------------------------
   # Handle the release of a mouse button
   # ---------------------------------------------------------------------------
@@ -554,33 +518,28 @@
     widget has a selection requestSELECTWITHMOUSE otherwise requestCURSORMOVE
     will be fired.
     """
+    if isinstance (widget, gtk.TextView):
+      tBuffer = widget.get_buffer ()
+      cPos = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_offset ()
+      bMarks = tBuffer.get_selection_bounds ()
+      if len (bMarks):
+        bounds = [it.get_offset () for it in bMarks]
+      else:
+        bounds = []
 
-    try:
-      if isinstance (widget, gtk.TextView):
-        tBuffer = widget.get_buffer ()
-        cPos = tBuffer.get_iter_at_mark (tBuffer.get_insert ()).get_offset ()
-        bMarks = tBuffer.get_selection_bounds ()
-        if len (bMarks):
-          bounds = [it.get_offset () for it in bMarks]
-        else:
-          bounds = []
+    elif isinstance (widget, gtk.Entry):
+      cPos   = widget.get_position ()
+      bounds = widget.get_selection_bounds ()
 
-      elif isinstance (widget, gtk.Entry):
-        cPos   = widget.get_position ()
-        bounds = widget.get_selection_bounds ()
-
-      gDebug (1, "Button-Release: %s (%s) %s %s" % (widget, 
self._gfObject.name,
+    gDebug (1, "Button-Release: %s (%s) %s %s" % (widget, self._gfObject.name,
                                                   cPos, bounds))
-      if len (bounds):
-        self._request ('SELECTWITHMOUSE', position1 = bounds [0],
-                       position2 = bounds [1], cursor = cPos)
-      else:
-        self._request ('CURSORMOVE', position = cPos)
+    if len (bounds):
+      self._request ('SELECTWITHMOUSE', position1 = bounds [0],
+                     position2 = bounds [1], cursor = cPos)
+    else:
+      self._request ('CURSORMOVE', position = cPos)
 
-    except:
-      self._uiDriver.showException ()
 
-
 # -----------------------------------------------------------------------------
 # Base configuration data
 # -----------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-09-16 
12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-09-16 
12:23:37 UTC (rev 6297)
@@ -248,10 +248,6 @@
 
   def windowExitEvent (self, widget, event):
 
-    try:
-      self._uiDriver.dispatchEvent ('requestEXIT', _form = self._form)
+    self._uiDriver.dispatchEvent ('requestEXIT', _form = self._form)
 
-    except:
-      self._uiDriver.showException ()
-
     return True

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py        
2004-09-16 12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py        
2004-09-16 12:23:37 UTC (rev 6297)
@@ -208,17 +208,14 @@
   # ---------------------------------------------------------------------------
 
   def notebookTabHandler (self, notebook, notebookpage, pageNr):
-    try:
-      gDebug (3, "switch-page %s %s %s" % (pageNr, self._oldpage, notebook))
 
-      if self._oldpage != pageNr:
-        action = events.Event ('requestPAGE', pageNr, _form = self.form)
-        self.uiform._eventHandler (action)
+    gDebug (3, "switch-page %s %s %s" % (pageNr, self._oldpage, notebook))
 
-        notebook.stop_emission ('switch-page')
+    if self._oldpage != pageNr:
+      action = events.Event ('requestPAGE', pageNr, _form = self.form)
+      self.uiform._eventHandler (action)
 
-    except:
-      self.uiform._uiDriver.showException ()
+      notebook.stop_emission ('switch-page')
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py    2004-09-16 
12:08:05 UTC (rev 6296)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py    2004-09-16 
12:23:37 UTC (rev 6297)
@@ -62,16 +62,12 @@
 
   def _scrollHandler (self, adjustment, gfObject):
 
-    try:
-      gDebug (1, "Adjust to %s" % (int (adjustment.value)))
-      action = events.Event ('requestRECORDNUMBER', int (adjustment.value),
-                             _form = gfObject._form)
-      adjustment.stop_emission ('value-changed')
-      gtk.idle_add (self._eventHandler, action)
+    gDebug (1, "Adjust to %s" % (int (adjustment.value)))
+    action = events.Event ('requestRECORDNUMBER', int (adjustment.value),
+                           _form = gfObject._form)
+    adjustment.stop_emission ('value-changed')
+    gtk.idle_add (self._eventHandler, action)
 
-    except:
-      self._uiDriver.showException ()
-
     return True
 
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]