r5310 - trunk/gnue-forms/src/uidrivers/wx/widgets/form

[jan]

Author: jan
Date: 2004-03-12 07:35:35 -0600 (Fri, 12 Mar 2004)
New Revision: 5310

Modified:
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
Log:
encode status bar text and title name with helper function


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-03-12 
13:34:05 UTC (rev 5309)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-03-12 
13:35:35 UTC (rev 5310)
@@ -30,8 +30,7 @@
 
 from wxPython.wx import *
 from gnue.common import events
-from gnue.forms.uidrivers.wx.common import *
-from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
+from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow, wxEncode, 
initFont
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
 
 import wrappers
@@ -80,7 +79,7 @@
 
     self.containerFrame = self.mainWindow
 
-    
self.mainWindow.SetTitle(self._form.title.encode(gConfig('textEncoding'),'replace'))
+    self.mainWindow.SetTitle(wxEncode(self._form.title))
     EVT_CLOSE(self.mainWindow,self.closeTrap)
     initFont(self.mainWindow,1)
 
@@ -153,13 +152,13 @@
     if not self.statusBar:
       return
 
-    if tip != None: 
self.statusBar.SetStatusText(tip.encode(gConfig('textEncoding'),'replace'),0)
+    if tip != None: self.statusBar.SetStatusText(wxEncode(tip),0)
 
     if statusValue:
-      self.statusBar.SetStatusText(statusValue,1)
+      self.statusBar.SetStatusText(wxEncode(statusValue),1)
 
     if insertValue:
-      self.statusBar.SetStatusText(insertValue,2)
+      self.statusBar.SetStatusText(wxEncode(insertValue),2)
 
     if currentRecord and  maxRecord:
       self.statusBar.SetStatusText(string.strip("%s/%s" % 
(currentRecord,maxRecord)),3)