r5646 - trunk/gnue-forms/src/uidrivers/win32/widgets

[btami]

Author: btami
Date: 2004-04-06 07:24:45 -0500 (Tue, 06 Apr 2004)
New Revision: 5646

Modified:
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
Log:
fixed a lin/win lf/crlf issue

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-04-06 
12:22:54 UTC (rev 5645)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-04-06 
12:24:45 UTC (rev 5646)
@@ -29,7 +29,7 @@
 
 from types import StringType, UnicodeType
 import win32api, win32gui, win32con, win32ui, commctrl
-import struct, array
+import struct, array ,re
 
 from gnue.common import events
 
@@ -358,7 +358,11 @@
       elif gfObject.style == 'dropdown':
         win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, -1, value) 
# CB_SETCURSEL, value, 0)
       else:
-        win32gui.SetWindowText(self._hwnd, str(value))
+        if hasattr(gfObject,'Char__height') and gfObject.Char__height > 1:
+          corrvalue = re.sub(r'(?<!\r)\n', r'\r\n', value)
+          win32gui.SetWindowText(self._hwnd, corrvalue)
+        else:
+          win32gui.SetWindowText(self._hwnd, str(value))
     except:
       pass
 
@@ -502,8 +506,7 @@
       pass
 
     # display unicode chars properly
-    if type(value)==UnicodeType:
-      value=textEncode(value) #.encode('mbcs')
+    value=textEncode(value) #.encode('mbcs') ?
       
     widget.SetValue(value)
     widget.Enable(enabled)