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

[jan]

Author: jan
Date: 2004-03-08 14:40:49 -0600 (Mon, 08 Mar 2004)
New Revision: 5269

Modified:
   trunk/gnue-forms/src/uidrivers/wx/MenuBar.py
   trunk/gnue-forms/src/uidrivers/wx/ToolBar.py
   trunk/gnue-forms/src/uidrivers/wx/common.py
   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/wrappers.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/label.py
Log:
replace direct usage of textEncoding with helper function wxEncode
add wxEncode to Tool and Menubar to allow unicodify _()


Modified: trunk/gnue-forms/src/uidrivers/wx/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/MenuBar.py        2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/MenuBar.py        2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -30,7 +30,8 @@
 import string
 from wxPython.wx import *
 from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
-  
+from common import wxEncode
+
 class MenuBar(_BaseMenuBar):
 
   # Create the menu
@@ -62,7 +63,9 @@
       label += '\t%s' % hotkey
 
     id = wxNewId()
-    item = wxMenuItem(parent, id, label, userAction.description or '')
+    item = wxMenuItem(parent, id, wxEncode(label),
+                      wxEncode(userAction.description) or '')
+    
     # Set the action icon if available
     if iconloc:
       try:
@@ -87,7 +90,7 @@
       self.addAction(name, parent, userAction, _skipHotkey=1)
       return
 
-    parent.SetLabel(id, label)
+    parent.SetLabel(id, wxEncode(label))
 
     event = 'request' + userAction.event
     EVT_MENU(self.driver._wxapp, id,

Modified: trunk/gnue-forms/src/uidrivers/wx/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/ToolBar.py        2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/ToolBar.py        2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -30,6 +30,7 @@
 import string, sys
 from wxPython.wx import *
 from gnue.forms.uidrivers._commonGuiToolkit.ToolBar import ToolBar as 
_BaseToolBar
+from common import wxEncode
   
 class ToolBar(_BaseToolBar):
 
@@ -76,7 +77,7 @@
       return
 
 
-    self.toolbar.AddSimpleTool(id, icon, userAction.description or '',
+    self.toolbar.AddSimpleTool(id, icon, wxEncode(userAction.description) or 
'',
                                isToggle=(userAction.canToggle and 1 or 0))
 
     self.toolbar.Realize()

Modified: trunk/gnue-forms/src/uidrivers/wx/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/common.py 2004-03-08 19:49:30 UTC (rev 
5268)
+++ trunk/gnue-forms/src/uidrivers/wx/common.py 2004-03-08 20:40:49 UTC (rev 
5269)
@@ -30,6 +30,7 @@
 #
 
 import string
+from types import UnicodeType
 from wxPython.wx import *
 from gnue.common import events
 from gnue.common.apps import GDebug
@@ -102,6 +103,13 @@
                               wxNORMAL,FALSE,'',enc))
 
 
+def wxEncode(u_string):    
+    if type(u_string)==UnicodeType:
+        return u_string.encode(gConfig('textEncoding'),'replace')
+    else:
+        return u_string
+
+
 #####################################################################
 ##
 ## Basic Event Processing
@@ -194,7 +202,6 @@
     object = self._uiDriver._IdToGFObj[_eventObjTowxWindow(event).GetId()]
 
     keycode = event.KeyCode()
-
     #
     # Sigh... a hack for using <enter> in multiline entries
     #

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -115,9 +115,7 @@
         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.Append(wxEncode(value))
         widget.SetValue("")
         try:
           # Not in wx 2.2.x
@@ -127,10 +125,7 @@
     except AttributeError:
       pass
 
-    if type(value) == UnicodeType:
-      value=value.encode(gConfig('textEncoding'),'replace')
-            
-    widget.SetValue(value)
+    widget.SetValue(wxEncode(value))
     widget.Enable(enabled)
     widget.SetEvtHandlerEnabled(TRUE)
     if enabled:

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/box.py    2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -29,6 +29,7 @@
 from wxPython.wx import *
 
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
+from gnue.forms.uidrivers.wx.common import wxEncode
 
 #
 # UIBox
@@ -40,8 +41,7 @@
   def _createWidget(self, event, spacer):
 
     object = event.object
-    newWidget = wxStaticBox(event.container,-1,
-                            
object.label.encode(gConfig('textEncoding'),'replace'),
+    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,

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -30,7 +30,7 @@
 
 from gnue.common import events
 from gnue.forms.uidrivers.wx.common import _setDefaultEventHandlers
-from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
+from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow, wxEncode
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
 
 #
@@ -41,8 +41,7 @@
 class UIButton(UIHelper):
   def _createWidget(self, event, spacer):
     object = event.object
-    newWidget = wxButton(event.container,-1,
-                         
object.label.encode(gConfig('textEncoding'),'replace'),
+    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)
                          )

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -31,7 +31,7 @@
 from types import UnicodeType
 
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
-from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
+from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow, wxEncode
 from gnue.forms.uidrivers.wx.common import _setDefaultEventHandlers
 
 #
@@ -58,11 +58,8 @@
       if event.initialize:
         choices = []
         for val in object._field.allowedValues()[1]:
-          if type(val) == UnicodeType:
-            choices.append(val.encode(gConfig('textEncoding'),'replace'))
-          else:
-            choices.append(val)
-
+          choices.append(wxEncode(val))
+          
       else:
         choices = [""]
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2004-03-08 
19:49:30 UTC (rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py  2004-03-08 
20:40:49 UTC (rev 5269)
@@ -121,7 +121,7 @@
 
     self._pageList.append(newWidget)
     tabtitle=hasattr(object,'caption') and object.caption or object.name
-    self.pane.AddPage(newWidget,tabtitle.encode(gConfig('textEncoding')))
+    self.pane.AddPage(newWidget,wxEncode(tabtitle))
     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-03-08 19:49:30 UTC 
(rev 5268)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/label.py  2004-03-08 20:40:49 UTC 
(rev 5269)
@@ -29,6 +29,7 @@
 from wxPython.wx import *
 
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
+from gnue.forms.uidrivers.wx.common import wxEncode
 
 
 _alignmentStyle = { 'left'  : wxALIGN_LEFT|wxST_NO_AUTORESIZE,
@@ -49,8 +50,7 @@
   def _createWidget(self, event, spacer):
     object = event.object
     style = _alignmentStyle[object.alignment]
-    newWidget = wxStaticText(event.container, -1,
-                             
object.text.encode(gConfig('textEncoding'),'replace'),
+    newWidget = wxStaticText(event.container, -1, wxEncode(object.text),
                              wxPoint(object.Char__x*event.widgetWidth,
                                      
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight),
                              wxSize(self.itemWidth,self.itemHeight), style)