Unicode fix from Will

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wxPython/lib/timectrl.py b/wxPython/wxPython/lib/timectrl.py
index 7347a2799a101ad33ea8647e4ff73768568eeb65..058b287e9cd881e7b5ff6ad91b86b9e1c63be7b3 100644 (file)
--- a/wxPython/wxPython/lib/timectrl.py
+++ b/wxPython/wxPython/lib/timectrl.py
@@ -517,6 +517,9 @@ class wxTimeCtrl(wxMaskedTextCtrl):
             value = self.GetValue()
             dbg('value = "%s"' % value)
 
             value = self.GetValue()
             dbg('value = "%s"' % value)
 

+        if type(value) == types.UnicodeType:
+            value = str(value)  # convert to regular string
+

         valid = True    # assume true
         if type(value) == types.StringType:
 
         valid = True    # assume true
         if type(value) == types.StringType:
 


@@ -547,7 +550,7 @@ class wxTimeCtrl(wxMaskedTextCtrl):
                 hour, minute, second = value.hour, value.minute, value.second
             else:
                 # Not a valid function argument
                 hour, minute, second = value.hour, value.minute, value.second
             else:
                 # Not a valid function argument

-                if self.__accept_mx:
+                if accept_mx:

                     error = 'GetWxDateTime requires wxDateTime, mxDateTime or parsable time string, passed %s'% repr(value)
                 else:
                     error = 'GetWxDateTime requires wxDateTime or parsable time string, passed %s'% repr(value)
                     error = 'GetWxDateTime requires wxDateTime, mxDateTime or parsable time string, passed %s'% repr(value)
                 else:
                     error = 'GetWxDateTime requires wxDateTime or parsable time string, passed %s'% repr(value)