r5172 - in trunk/gnue-forms/src/uidrivers/wx/widgets: . form

[jan]

Author: jan
Date: 2004-02-26 15:13:37 -0600 (Thu, 26 Feb 2004)
New Revision: 5172

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/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
Log:
update wx windows uidriver to accept unicode encoding


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-02-26 21:11:14 UTC 
(rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-02-26 21:13:37 UTC 
(rev 5172)
@@ -29,7 +29,7 @@
 from wxPython.wx import *
 
 from gnue.common import events
-
+from types import UnicodeType
 from gnue.forms.GFForm import *
 from gnue.forms.uidrivers._base.widgets._base import *
 from gnue.forms.uidrivers.wx.common import *
@@ -115,6 +115,8 @@
         widget._origAllowedValues = object._field._allowedValues
         widget.Clear()
         for value in object._field._allowedValuesDescr:
+          if type(value) == UnicodeType:
+            value=value.encode(gConfig('textEncoding'),'replace')
           widget.Append(value)
         widget.SetValue("")
         try:
@@ -125,6 +127,9 @@
     except AttributeError:
       pass
 
+    if type(value) == UnicodeType:
+      value=value.encode(gConfig('textEncoding'),'replace')
+            
     widget.SetValue(value)
     widget.Enable(enabled)
     widget.SetEvtHandlerEnabled(TRUE)

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-02-26 21:11:14 UTC 
(rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-02-26 21:13:37 UTC 
(rev 5172)
@@ -40,7 +40,8 @@
   def _createWidget(self, event, spacer):
 
     object = event.object
-    newWidget = wxStaticBox(event.container,-1,str(object.label),
+    newWidget = wxStaticBox(event.container,-1,
+                            
object.label.encode(gConfig('textEncoding'),'replace'),
                        
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,

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-02-26 21:11:14 UTC 
(rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-02-26 21:13:37 UTC 
(rev 5172)
@@ -41,7 +41,8 @@
 class UIButton(UIHelper):
   def _createWidget(self, event, spacer):
     object = event.object
-    newWidget = wxButton(event.container,-1,str(object.label),
+    newWidget = wxButton(event.container,-1,
+                         
object.label.encode(gConfig('textEncoding'),'replace'),
                          
wxPoint(object.Char__x*event.widgetWidth,(object.Char__y+spacer)*event.widgetHeight),
                          
wxSize(object.Char__width*event.widgetWidth,object.Char__height*event.widgetHeight)
                          )

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-02-26 21:11:14 UTC 
(rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-02-26 21:13:37 UTC 
(rev 5172)
@@ -28,6 +28,7 @@
 #
 from wxPython.wx import *
 from gnue.common import events
+from types import UnicodeType
 
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
 from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
@@ -49,7 +50,13 @@
 
     if style == 'dropdown':
       if event.initialize:
-        choices = object._field.allowedValues()[1]
+        for val in object._field.allowedValues()[1]:
+          choices = []
+          if type(val) == UnicodeType:
+            choices+=val.encode(gConfig('textEncoding'),'replace')
+          else:
+            choices+=val
+            
       else:
         choices = [""]
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-02-26 
21:11:14 UTC (rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-02-26 
21:13:37 UTC (rev 5172)
@@ -80,7 +80,7 @@
 
     self.containerFrame = self.mainWindow
 
-    self.mainWindow.SetTitle(str(self._form.title))
+    
self.mainWindow.SetTitle(self._form.title.encode(gConfig('textEncoding'),'replace'))
     EVT_CLOSE(self.mainWindow,self.closeTrap)
     initFont(self.mainWindow,1)
 
@@ -153,7 +153,7 @@
     if not self.statusBar:
       return
 
-    if tip != None: self.statusBar.SetStatusText(str(tip),0)
+    if tip != None: 
self.statusBar.SetStatusText(tip.encode(gConfig('textEncoding'),'replace'),0)
 
     if statusValue:
       self.statusBar.SetStatusText(statusValue,1)

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2004-02-26 
21:11:14 UTC (rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2004-02-26 
21:13:37 UTC (rev 5172)
@@ -120,7 +120,8 @@
     newWidget.SetSizer(sizer)
 
     self._pageList.append(newWidget)
-    self.pane.AddPage(newWidget,hasattr(object,'caption') and object.caption 
or object.name)
+    tabtitle=hasattr(object,'caption') and object.caption or object.name
+    self.pane.AddPage(newWidget,tabtitle.encode(gConfig('textEncoding')))
     self.pane.SetClientSize(self.layoutSize)
     self.fit()
     return newWidget

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/label.py  2004-02-26 21:11:14 UTC 
(rev 5171)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/label.py  2004-02-26 21:13:37 UTC 
(rev 5172)
@@ -49,7 +49,8 @@
   def _createWidget(self, event, spacer):
     object = event.object
     style = _alignmentStyle[object.alignment]
-    newWidget = wxStaticText(event.container, -1, str(object.text),
+    newWidget = wxStaticText(event.container, -1,
+                             
object.text.encode(gConfig('textEncoding'),'replace'),
                              wxPoint(object.Char__x*event.widgetWidth,
                                      
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight),
                              wxSize(self.itemWidth,self.itemHeight), style)