[gnue] r9028 - in trunk/gnue-forms/src/uidrivers/win32: . widgets

[btami]

Author: btami
Date: 2006-11-11 17:36:28 -0600 (Sat, 11 Nov 2006)
New Revision: 9028

Modified:
   trunk/gnue-forms/src/uidrivers/win32/dialogs.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
Log:
minor cosmetic changes

Modified: trunk/gnue-forms/src/uidrivers/win32/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2006-11-11 16:57:44 UTC 
(rev 9027)
+++ trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2006-11-11 23:36:28 UTC 
(rev 9028)
@@ -125,7 +125,7 @@
   def AddControl(self, field):
     label, name, ftype, default, master, elements = field
     cs = win32con.WS_CHILD | win32con.WS_VISIBLE
-    es = win32con.WS_EX_STATICEDGE
+    es = win32con.WS_EX_CLIENTEDGE
     
     position = (0, 0, 0, 0)
     if ftype == 'label' or ftype == 'warning':
@@ -319,18 +319,19 @@
       return h
     elif id in self.__inputs:
       w, h = win32gui.GetTextExtentPoint32(dc, 'W')
-      return h
+      return h + 6
     else:
       l,t,r,b = win32gui.GetWindowRect(item)
       return b-t
 
   def SetPosition(self, id, x, y):
     item = win32gui.GetDlgItem(self.hwnd, id)
-    win32gui.SetWindowPos(item, self.hwnd,
-                          x, y,
-                          self.Width(id), self.Height(id),
-                          win32con.SWP_NOACTIVATE | win32con.SWP_NOZORDER)
+    flags = win32con.SWP_NOACTIVATE | win32con.SWP_NOZORDER
+    w = self.Width(id)
+    h = self.Height(id)
 
+    win32gui.SetWindowPos(item, self.hwnd, x, y, w, h, flags)
+
   #~ def wrapText(self, text, width):
     #~ textSoFar = ""
     #~ thisLine = ""

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-11 
16:57:44 UTC (rev 9027)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-11 
23:36:28 UTC (rev 9028)
@@ -73,7 +73,7 @@
     else: # Normal text box
       height = self.itemHeight + 2
       width = self.itemWidth
-      style = win32con.WS_CHILD | win32con.ES_NOHIDESEL #| win32con.WS_BORDER
+      style = win32con.WS_CHILD #| win32con.WS_BORDER
 
       if hasattr(object,'Char__height') and object.Char__height > 1:
         style = style | win32con.ES_MULTILINE | win32con.ES_AUTOVSCROLL | \