[gnue] r8790 - branches/forms-0.5/src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2006-10-16 04:39:16 -0500 (Mon, 16 Oct 2006)
New Revision: 8790

Modified:
   branches/forms-0.5/src/uidrivers/wx/widgets/_base.py
   branches/forms-0.5/src/uidrivers/wx/widgets/entry.py
Log:
Fixes for 3-state checkbox in wx uidriver (3-state now used in queries).


Modified: branches/forms-0.5/src/uidrivers/wx/widgets/_base.py
===================================================================
--- branches/forms-0.5/src/uidrivers/wx/widgets/_base.py        2006-10-16 
00:08:59 UTC (rev 8789)
+++ branches/forms-0.5/src/uidrivers/wx/widgets/_base.py        2006-10-16 
09:39:16 UTC (rev 8790)
@@ -190,7 +190,16 @@
     except AttributeError:
       pass
 
-    widget.SetValue(wxEncode(value))
+    if isinstance(widget, wx.CheckBox):
+        if value is None:
+            widget.Set3StateValue(wx.CHK_UNDETERMINED)
+        elif value:
+            widget.Set3StateValue(wx.CHK_CHECKED)
+        else:
+            widget.Set3StateValue(wx.CHK_UNCHECKED)
+    else:
+        widget.SetValue(wxEncode(value))
+
     widget.Enable(enabled)
     widget.SetEvtHandlerEnabled(TRUE)
 

Modified: branches/forms-0.5/src/uidrivers/wx/widgets/entry.py
===================================================================
--- branches/forms-0.5/src/uidrivers/wx/widgets/entry.py        2006-10-16 
00:08:59 UTC (rev 8789)
+++ branches/forms-0.5/src/uidrivers/wx/widgets/entry.py        2006-10-16 
09:39:16 UTC (rev 8790)
@@ -125,7 +125,7 @@
 
     elif style == 'checkbox':
       newWidget = wxCheckBox(event.container, -1, wxEncode(object.label), 
defaultPoint,
-                             defaultSize, wxNO_BORDER | wxWANTS_CHARS)
+                             defaultSize, wxNO_BORDER | wxWANTS_CHARS | 
wxCHK_3STATE)
       if event.initialize:
         newWidget.SetValue(0)
         EVT_CHECKBOX(newWidget, newWidget.GetId(), self.checkboxHandler)