[gnue] r8536 - trunk/gnue-forms/src/uidrivers/wx26/widgets

[johannes]

Author: johannes
Date: 2006-07-19 07:35:20 -0500 (Wed, 19 Jul 2006)
New Revision: 8536

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
Log:
Use smaller values for get_default_size().  Use Up/Down-Keys in 
MSW-Dropdowns for record-navigation and Shift-Up/Down for 
option-navigation.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-07-19 
12:05:01 UTC (rev 8535)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-07-19 
12:35:20 UTC (rev 8536)
@@ -490,7 +490,9 @@
         if self.managed:
             return (-1, -1)
         else:
-            return (self._uiDriver.cellWidth * self.chr_w, -1)
+            # We're using the size of an empty GridCell instead of the average
+            # character width.  It returns better looking forms.
+            return (5 * self.chr_w, -1)
 
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-07-19 
12:05:01 UTC (rev 8535)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-07-19 
12:35:20 UTC (rev 8536)
@@ -1,4 +1,4 @@
-#y GNU Enterprise Forms - wx 2.6 UI Driver - Entry widgets
+# GNU Enterprise Forms - wx 2.6 UI Driver - Entry widgets
 #
 # Copyright 2001-2006 Free Software Foundation
 #
@@ -20,7 +20,6 @@
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
 # $Id$
-
 """
 Implementation of the <entry> tag
 """
@@ -52,11 +51,12 @@
         method called '__build_<style>' depending on the object's style.
         """
 
-        parent = event.container
         owner = self.getParent()
 
         if self.in_grid:
             parent = owner._get_cell(self, spacer)
+        else:
+            parent = event.container
 
         style = self._gfObject.style.lower()
         func = getattr(self, "_UIEntry__build_%s" % style)
@@ -64,11 +64,11 @@
 
         owner.add_widgets(self, spacer)
 
-        # We return the entry object here, since we will bind events to it
-        # later
         if self.in_grid:
             self.widget._gnue_label_ = self.label
 
+        # We return the entry object here, since we will bind events to it
+        # later
         return self.widget
 
 
@@ -87,6 +87,8 @@
             self.growable = True
             xFlags |= wx.TE_MULTILINE
 
+        # TODO: should we use the container_sizer.GetEmptyCellSize() for
+        # setting a minimal control size
         csize = self.get_default_size()
 
         ctrl = wx.TextCtrl(parent, -1, size=csize, style=xFlags)
@@ -102,7 +104,6 @@
 
         return [self.__add_entry_label(parent), ctrl]
 
-
     # -------------------------------------------------------------------------
 
     def __build_password(self, parent):
@@ -122,7 +123,6 @@
         ctrl = wx.StaticText(parent, -1, "")
         return [self.__add_entry_label(parent), ctrl]
 
-
     # -------------------------------------------------------------------------
 
     def __build_checkbox (self, parent):
@@ -165,7 +165,7 @@
         if not 'wxMac' in wx.PlatformInfo:
             item.Bind(wx.EVT_LEFT_UP, self.__on_left_mouseup)
 
-        # On MWS a ComboBox widget does not get an EVT_CHAR event for the left-
+        # On MSW a ComboBox widget does not get an EVT_CHAR event for the left-
         # and right-keys.  That's why we need to add a EVT_KEY_DOWN-handler
         # here
         if 'wxMSW' in wx.PlatformInfo:
@@ -173,7 +173,6 @@
 
         return [self.__add_entry_label(parent), result]
 
-
     # -------------------------------------------------------------------------
 
     def __build_listbox(self, parent):
@@ -205,7 +204,10 @@
 
         return label
 
+
     # -------------------------------------------------------------------------
+    # Event handlers
+    # -------------------------------------------------------------------------
 
     def __on_label_click(self, event):
 
@@ -241,17 +243,6 @@
 
 
     # -------------------------------------------------------------------------
-
-    def __add_to_vbox(self, widget):
-
-        sizer = wx.BoxSizer(wx.VERTICAL)
-        sizer.AddSpacer((0, 0), 1)
-        sizer.Add(widget, 0, wx.EXPAND)
-        sizer.AddSpacer((0, 0), 1)
-        return sizer
-
-
-    # -------------------------------------------------------------------------
     # Event handler
     # -------------------------------------------------------------------------
 
@@ -373,7 +364,7 @@
         keycode = event.GetKeyCode()
         command = None
 
-        if keycode in [wx.WXK_LEFT, wx.WXK_RIGHT]:
+        if keycode in [wx.WXK_LEFT, wx.WXK_RIGHT, wx.WXK_UP, wx.WXK_DOWN]:
             (command, args) = GFKeyMapper.KeyMapper.getEvent(keycode,
                     event.ShiftDown(),
                     event.CmdDown(),