r6668 - trunk/gnue-forms/src/uidrivers/wx/widgets

[kilo]

Author: kilo
Date: 2004-11-10 04:23:52 -0600 (Wed, 10 Nov 2004)
New Revision: 6668

Modified:
   trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
Log:
Uniformized entry size and position handling.

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -240,6 +240,12 @@
     """
     Creates a new WX widget and adds it to the cross reference table.
     """
+    object = event.object
+    if hasattr(object,'Char__y'):
+      self.itemY = (object.Char__y + spacer + (spacer * object._gap)) * 
event.widgetHeight
+    else:
+      self.itemY = -1
+
     newWidget = self._createWidget(event, spacer)
     initFont(newWidget)
     if event.initialize:

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -46,11 +46,14 @@
     Creates a new Static Box widget.
     """
     object = event.object
+
+    itemX =      self.itemX + (event.widgetWidth / 2)
+    itemY =      self.itemY + (event.widgetHeight / 2)
+    itemWidth =  (object.Char__width - 1) * event.widgetWidth
+    itemHeight = (object.Char__height - 1) * event.widgetHeight
+
     newWidget = wxStaticBox(event.container, -1, wxEncode(object.label),
-                       wxPoint(object.Char__x * event.widgetWidth + 
(event.widgetWidth / 2),
-                               (object.Char__y + spacer + (spacer * 
object._gap)) * event.widgetHeight + (event.widgetHeight / 2)),
-                       wxSize((object.Char__width - 1) * event.widgetWidth,
-                               (object.Char__height - 1) * event.widgetHeight))
+                       wxPoint(itemX, itemY), wxSize(itemWidth, itemHeight))
     return newWidget
 
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -48,10 +48,15 @@
     Creates a new Button widget.
     """
     object = event.object
+
+    itemX =      self.itemX
+    itemY =      (object.Char__y + spacer) * event.widgetHeight
+    itemWidth =  object.Char__width * event.widgetWidth
+    itemHeight = object.Char__height * event.widgetHeight
+
     newWidget = wxButton(event.container, -1, wxEncode(object.label),
-                         wxPoint(object.Char__x * event.widgetWidth, 
(object.Char__y + spacer) * event.widgetHeight),
-                         wxSize(object.Char__width * event.widgetWidth, 
object.Char__height * event.widgetHeight)
-                         )
+                         wxPoint(itemX, itemY), wxSize(itemWidth, itemHeight))
+
     if event.initialize:
       self._eventHandler = event.eventHandler
       EVT_BUTTON(newWidget, newWidget.GetId(), self.buttonHandler)

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -52,11 +52,10 @@
     """
     object = event.object
 
-    style = object.style
-    defaultPoint =  wxPoint(object.Char__x * event.widgetWidth,
-                            (object.Char__y + spacer + (object._gap * spacer)) 
* event.widgetHeight)
-    defaultSize  = wxSize(self.itemWidth, self.itemHeight + 1)
+    defaultPoint =  wxPoint(self.itemX, self.itemY)
+    defaultSize  = wxSize(self.itemWidth, self.itemHeight)
 
+    style = object.style
     if style == 'dropdown':
       if gConfigForms('dropdownMode') == 'auto':
         if  sys.platform == "win32":
@@ -82,8 +81,7 @@
       choices.sort()
 
       newWidget = wxComboBox(event.container, -1, "", defaultPoint,
-                             wxSize(self.itemWidth, self.itemHeight),
-                             choices, wxCB_DROPDOWN,) #|wxWANTS_CHARS,)
+                             defaultSize, choices, wxCB_DROPDOWN,) 
#|wxWANTS_CHARS,)
       if event.initialize:
         newWidget._origAllowedValues = object._field._allowedValues
         newWidget.SetValue("")
@@ -105,8 +103,7 @@
 
 #      choices.sort()
 
-      newWidget = wxListBox(event.container, -1, defaultPoint,
-                             wxSize(self.itemWidth, self.itemHeight),
+      newWidget = wxListBox(event.container, -1, defaultPoint, defaultSize,
                              choices, wxLB_SINGLE)
 
       newWidget.SetValue = lambda v: newWidget.SetStringSelection(v, True)
@@ -119,7 +116,8 @@
         EVT_LISTBOX_DCLICK(event.container, newWidget_Id, self.listboxHandler)
 
     elif style == 'label':
-      newWidget = wxStaticText(event.container, -1, "", defaultPoint, 
defaultSize,
+      newWidget = wxStaticText(event.container, -1, "", defaultPoint,
+                               wxSize(self.itemWidth, self.itemHeight + 1),
                                wxST_NO_AUTORESIZE)
       # To make the label consistent with the other entry styles...
       newWidget.SetValue = newWidget.SetLabel
@@ -127,8 +125,7 @@
 
     elif style == 'checkbox':
       newWidget = wxCheckBox(event.container, -1, wxEncode(object.label), 
defaultPoint,
-                             wxSize(self.itemWidth, event.textHeight),
-                             wxNO_BORDER | wxWANTS_CHARS)
+                             defaultSize, wxNO_BORDER | wxWANTS_CHARS)
       if event.initialize:
         newWidget.SetValue(0)
         EVT_CHECKBOX(newWidget, newWidget.GetId(), self.checkboxHandler)
@@ -143,12 +140,13 @@
         styles = 0
         value = ""
 
-      newWidget = wxTextCtrl(event.container, -1, value, defaultPoint, 
defaultSize, styles)
+      newWidget = wxTextCtrl(event.container, -1, value, defaultPoint, 
wxSize(self.itemWidth, self.itemHeight + 1), styles)
     self._eventHandler = event.eventHandler
     if event.initialize:
       _setDefaultEventHandlers(newWidget, event.eventHandler, 
event.initialize, self._uiDriver)
     return newWidget
 
+
   # --------------------------------------------------------------------------
   # Handles a dropdown's events in Windows mode
   # --------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -50,8 +50,7 @@
     png = wxEmptyBitmap(1, 1)
 
     self.pane = wxScrolledWindow(event.container, -1,
-                                 wxPoint(object.Char__x * event.widgetWidth,
-                                         (object.Char__y + spacer + (spacer * 
object._gap)) * event.widgetHeight),
+                                 wxPoint(self.itemX, self.itemY),
                                  wxSize(self.itemWidth, self.itemHeight))
     EVT_SIZE(self.pane, self.OnFrameSize)
     EVT_PAINT(self.pane, self.onPaint)

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/label.py  2004-11-09 19:24:04 UTC 
(rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/label.py  2004-11-10 10:23:52 UTC 
(rev 6668)
@@ -55,8 +55,7 @@
     object = event.object
     style = _alignmentStyle[object.alignment]
     newWidget = wxStaticText(event.container, -1, wxEncode(object.text),
-                             wxPoint(object.Char__x * event.widgetWidth,
-                                     (object.Char__y + spacer + (spacer * 
object._gap)) * event.widgetHeight),
+                             wxPoint(self.itemX, self.itemY),
                              wxSize(self.itemWidth, self.itemHeight), style)
     return newWidget
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py      2004-11-09 
19:24:04 UTC (rev 6667)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py      2004-11-10 
10:23:52 UTC (rev 6668)
@@ -49,9 +49,15 @@
     Creates a new wxScrollBar widget.
     """
     object = event.object
+
+    itemX =      self.itemX
+    itemY =      (object.Char__y + spacer) * event.widgetHeight
+    itemWidth =  object.Char__width * event.widgetWidth
+    itemHeight = object.Char__height * event.widgetHeight
+
     newWidget = self._widget = wxScrollBar(event.container, -1,
-                           wxPoint(object.Char__x * event.widgetWidth, 
(object.Char__y + spacer) * event.widgetHeight),
-                           wxSize(object.Char__width * event.widgetWidth, 
object.Char__height * event.widgetHeight),
+                           wxPoint(itemX, itemY),
+                           wxSize(itemWidth, itemHeight),
                            wxSB_VERTICAL)
 
     if event.initialize: