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

[btami]

Author: btami
Date: 2005-06-26 06:09:49 -0500 (Sun, 26 Jun 2005)
New Revision: 7657

Modified:
   trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py
   trunk/gnue-forms/src/uidrivers/win32/MenuBar.py
   trunk/gnue-forms/src/uidrivers/win32/ToolBar.py
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/common.py
   trunk/gnue-forms/src/uidrivers/win32/dialog.py
   trunk/gnue-forms/src/uidrivers/win32/dialogs.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/image.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
Log:
cleanup

Modified: trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py  2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py  2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -25,7 +25,7 @@
 # NOTES:
 #
 
-import win32gui, win32con
+import win32gui
 
 __win32App = None
 

Modified: trunk/gnue-forms/src/uidrivers/win32/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/MenuBar.py     2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/MenuBar.py     2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -24,12 +24,14 @@
 #
 # NOTES:
 #
+
+import win32gui
+import win32con
 
-import string
-import win32api, win32gui, win32ui, win32con, commctrl
+from gnue.common import events
+
 from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
 from gnue.forms.uidrivers.win32.common import getNextId, textEncode
-from gnue.common import events
 
 _menustyle = win32con.MF_STRING
 
@@ -37,17 +39,16 @@
 
   # Create the menu
   def init(self):
-    self.menu = win32ui.CreateMenu()
-    self._hmnu = self.menu.GetHandle()
+    self.menu = win32gui.CreateMenu()
     return self.menu
 
   # Add a (sub)menu
   def addMenu(self, name, parent):
-    menu = win32ui.CreatePopupMenu()
-    parent.AppendMenu(_menustyle | win32con.MF_POPUP, menu.GetHandle(), 
textEncode(name))
+    menu = win32gui.CreatePopupMenu()
+    win32gui.AppendMenu(parent, _menustyle | win32con.MF_POPUP, menu, 
textEncode(name))
     # One would think this would go in init(),
     # but, no... win32 has to be a jerkoff.
-    win32gui.SetMenu(self.container.GetHwnd(), self._hmnu )
+    win32gui.SetMenu(self.container.GetHwnd(), self.menu )
     return menu
 
   # Add a menu item (action)
@@ -67,9 +68,9 @@
       except KeyError:
         pass
 
-    id = getNextId()
+    id = getNextId()
     self.container.addDescription(id, textEncode(userAction.description) or '')
-    parent.AppendMenu(_menustyle, id, textEncode(label))
+    win32gui.AppendMenu(parent, _menustyle, id, textEncode(label))
     event = 'request' + userAction.event
     self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
 
@@ -78,17 +79,23 @@
 
   # Add a separator
   def addSeparator(self, parent):
-    parent.AppendMenu(win32con.MF_SEPARATOR, 0, "")
+    win32gui.AppendMenu(parent, win32con.MF_SEPARATOR, 0, "")
 
   # Enable a menu item
   def enableItem(self, item):
-    parent, id = item
-    parent.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_ENABLED)
+    parent, id = item
+    try:
+      win32gui.EnableMenuItem(parent, id, 
win32con.MF_BYCOMMAND|win32con.MF_ENABLED)
+    except:
+      pass
 
   # Disable a menu item
-  def disableItem(self, item):
+  def disableItem(self, item):
     parent, id = item
-    parent.EnableMenuItem(id,win32con.MF_BYCOMMAND|win32con.MF_GRAYED)
+    try:
+      win32gui.EnableMenuItem(parent, id, 
win32con.MF_BYCOMMAND|win32con.MF_GRAYED)
+    except:
+      pass
 
 _cachedIcons = {}
 

Modified: trunk/gnue-forms/src/uidrivers/win32/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/ToolBar.py     2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/ToolBar.py     2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -24,14 +24,23 @@
 #
 # NOTES:
 #
+
+import os
+import sys
+import array
+import struct
 
-import string, sys, struct, os, array
-import win32api, win32gui, win32con, commctrl
+import win32api
+import win32con
+import win32gui
+import commctrl
+
+from gnue.common import events
+from gnue.common.apps import GConfig
+
+from gnue.forms.uidrivers._commonGuiToolkit.ToolBar import ToolBar as 
_BaseToolBar
 from gnue.forms.uidrivers.win32.widgets._base import Win32Window
-from gnue.forms.uidrivers._commonGuiToolkit.ToolBar import ToolBar as 
_BaseToolBar
 from gnue.forms.uidrivers.win32.common import getNextId, textEncode
-from gnue.common.apps import GConfig
-from gnue.common import events
 
 winver = sys.getwindowsversion()
 XP = winver[0]==5 and winver[1]==1 and winver[3]==2

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -37,6 +37,7 @@
   import win32gui, win32con, afxres, commctrl, win32clipboard, win32ui
 except ImportError:
   raise Exceptions.DriverNotSupported, _("The GNUe-Forms Win32 driver requires 
PyWin32.")
+from pywin.mfc import window
 
 from gnue.common import events
 from gnue.common.apps import GDebug
@@ -160,8 +161,7 @@
     #
 #    if not self._disableSplash:
 #      self.splash = UIWXSplashScreen()
-
-
+
     font_name = gConfigForms('faceName')
     if not font_name:
       # explicite boolean check forces generated report parameter dialog
@@ -173,45 +173,30 @@
 
       lf = win32gui.GetObject(win32gui.GetStockObject(fnt))
       font_name = lf.lfFaceName
-
-      #~ print lf.lfHeight, lf.lfWidth, \
-        #~ lf.lfEscapement, lf.lfOrientation, lf.lfWeight, \
-        #~ lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, \
-        #~ lf.lfOutPrecision, lf.lfClipPrecision, lf.lfQuality, \
-        #~ lf.lfPitchAndFamily, lf.lfFaceName 
-
-    #~ print 'font_name=',font_name
-    
+
     font_spec = {'name':font_name, 'height':int(gConfigForms('pointSize'))}
     self._font = win32ui.CreateFont(font_spec)
 
 
-    #
     # Create a dummy window used to compute sizes
-    #
-    from pywin.mfc import window
     dummyWindow = window.Wnd(win32ui.CreateWnd())
     dc = dummyWindow.GetWindowDC()
+
     dc.SelectObject(self._font)
     metrics = dc.GetTextMetrics()
     maxWidth = metrics["tmAveCharWidth"]
     maxHeight = metrics["tmHeight"]
     maxDescent = metrics["tmDescent"]
     maxLeading = metrics["tmExternalLeading"]
-
+
     self.textWidth    = int(maxWidth+maxLeading)  # The pixel width of text 
inside a widget
     self.textWidth    = int(math.ceil(self.textWidth*1.1))
     self.textHeight   = int(maxHeight+maxDescent)  # The pixel height of text 
inside a widget
-    self.widgetWidth  = self.textWidth            # The pixel width of a 1 
char widget (for things like buttons)
+    self.widgetWidth  = self.textWidth             # The pixel width of a 1 
char widget (for things like buttons)
     self.widgetHeight = self.textHeight + 5       # The pixel height of a 1 
char widget (for things like buttons)
-
-    #
-    # Close dummy window so app doesn't hang when all other windows closed
-    #
-#    dummyWindow.Close()
+
     dummyWindow.ReleaseDC(dc)
-
-
+
   #############################################################################
   #
   # Private UIBase support functions
@@ -548,9 +533,9 @@
       if id == self.detailID:
         text = self.detail
       if '\r\n' in text:
-        w = max ([self.dc.GetTextExtent(t) [0] for t in text.split ('\r\n')])
+        w = max ([win32gui.GetTextExtentPoint32(self.dc, t) [0] for t in 
text.split ('\r\n')])
       else:
-        w, h = self.dc.GetTextExtent(text)
+        w, h = win32gui.GetTextExtentPoint32(self.dc, text)
       return w + 40
     else:
       l,t,r,b = win32gui.GetWindowRect(item)
@@ -564,9 +549,9 @@
       if id == self.detailID:
         text = self.detail
       if '\r\n' in text:
-        h = sum ([self.dc.GetTextExtent(t) [1] for t in text.split ('\r\n')])
+        h = sum ([win32gui.GetTextExtentPoint32(self.dc, t) [1] for t in 
text.split ('\r\n')])
       else:
-        w, h = self.dc.GetTextExtent(text)
+        w, h = win32gui.GetTextExtentPoint32(self.dc, text)
       if id == self.detailID:
         h += 2 # extra for WS_EX_STATICEDGE
       return h

Modified: trunk/gnue-forms/src/uidrivers/win32/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/common.py      2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/common.py      2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -25,12 +25,12 @@
 # NOTES:
 #
 
-import string
-import win32gui, win32con
-from win32con import *
+from types import UnicodeType, StringType
+
+import win32gui
+
 from gnue.common import events
 from gnue.common.apps import GConfig
-from types import UnicodeType, StringType
 
 
 _idPos = 1000

Modified: trunk/gnue-forms/src/uidrivers/win32/dialog.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/dialog.py      2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/dialog.py      2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -24,7 +24,6 @@
 import sys
 import struct
 
-import win32ui
 import win32api
 import win32gui
 import win32con
@@ -74,23 +73,7 @@
 
   def OnInitDialog(self, hwnd, msg, wparam, lparam):
     self.hwnd = hwnd
-    
-    # Create a LOGFONT structure for the current font in use
-    hFont   = win32gui.GetObject (win32gui.SendMessage (hwnd, 
win32con.WM_GETFONT, 0, 0))
-    newFont = win32ui.CreateFont ( \
-        {'name'            : hFont.lfFaceName,
-         'height'          : hFont.lfHeight,
-         'width'           : hFont.lfWidth,
-         'charset'         : hFont.lfCharSet,
-         'weight'          : hFont.lfWeight,
-         'italic'          : hFont.lfItalic,
-         'underline'       : hFont.lfUnderline,
-         'pitch and family': hFont.lfPitchAndFamily})
-
-    # Use this font in the device context of the dialog
-    PyCWnd = win32ui.CreateWindowFromHandle(hwnd)
-    self.dc = PyCWnd.GetDC ()
-    of = self.dc.SelectObject (newFont)
+    self.dc = win32gui.GetDC(hwnd)
 
 
   def OnClose(self, hwnd, msg, wparam, lparam):

Modified: trunk/gnue-forms/src/uidrivers/win32/dialogs.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/dialogs.py     2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -25,7 +25,6 @@
 import struct
 import textwrap
 
-import win32ui
 import win32api
 import win32gui
 import win32con
@@ -287,12 +286,12 @@
     if (id in self.__labels) or (id in self.__texts):
       text = win32gui.GetWindowText(item)
       if '\n' in text:
-        w = max ([self.dc.GetTextExtent(t) [0] for t in text.split ('\n')])
+        w = max ([win32gui.GetTextExtentPoint32(self.dc, t) [0] for t in 
text.split ('\n')])
       else:
-        w, h = self.dc.GetTextExtent(text)
+        w, h = win32gui.GetTextExtentPoint32(self.dc, text)
       return w
     elif id in self.__inputs:
-      w, h = self.dc.GetTextExtent('W'*12)
+      w, h = win32gui.GetTextExtentPoint32(self.dc, 'W'*12)
       return w
     else:
       l,t,r,b = win32gui.GetWindowRect(item)
@@ -303,12 +302,12 @@
     if (id in self.__labels) or (id in self.__texts):
       text = win32gui.GetWindowText(item)
       if '\n' in text:
-        h = sum ([self.dc.GetTextExtent(t) [1] for t in text.split ('\n')])
+        h = sum ([win32gui.GetTextExtentPoint32(self.dc, t) [1] for t in 
text.split ('\n')])
       else:
-        w, h = self.dc.GetTextExtent(text)
+        w, h = win32gui.GetTextExtentPoint32(self.dc, text)
       return h
     elif id in self.__inputs:
-      w, h = self.dc.GetTextExtent('W')
+      w, h = win32gui.GetTextExtentPoint32(self.dc, 'W')
       return h + 5
     else:
       l,t,r,b = win32gui.GetWindowRect(item)
@@ -326,7 +325,7 @@
     thisLine = ""
     for part in text.split('\n'):
       for word in part.split():
-        if self.dc.GetTextExtent(thisLine + word)[0] > width:
+        if win32gui.GetTextExtentPoint32(self.dc, thisLine + word)[0] > width:
           textSoFar += thisLine + " \n"
           thisLine = word + " "
         else:
@@ -391,7 +390,7 @@
     for (ix, itemId) in enumerate (self.__labels):
       item = win32gui.GetDlgItem(hwnd, itemId)
       text = win32gui.GetWindowText(item)
-      (width, height) = self.dc.GetTextExtent (text)
+      (width, height) = win32gui.GetTextExtentPoint32(self.dc, text)
       maxW = max (maxW, width)
 
       win32gui.SetWindowPos(item, 0, 0, 0, width, height, flags)
@@ -407,10 +406,10 @@
       item = win32gui.GetDlgItem(hwnd, itemId)
       text = win32gui.GetWindowText(item)
       if '\n' in text:
-        width  = max ([self.dc.GetTextExtent (p) [0] for p in text.split 
('\n')])
-        height = sum ([self.dc.GetTextExtent (p) [1] for p in text.split 
('\n')])
+        width  = max ([win32gui.GetTextExtentPoint32(self.dc, p) [0] for p in 
text.split ('\n')])
+        height = sum ([win32gui.GetTextExtentPoint32(self.dc, p) [1] for p in 
text.split ('\n')])
       else:
-        (width, height) = self.dc.GetTextExtent (text)
+        (width, height) = win32gui.GetTextExtentPoint32(self.dc, text)
 
       (left, top, w, h) = win32gui.GetWindowRect(item)
       left, top = win32gui.ScreenToClient(self.hwnd, (left, top))

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2005-06-26 
11:09:49 UTC (rev 7657)
@@ -24,10 +24,15 @@
 #
 # NOTES:
 #
+
+import re
+import struct
 
-from types import StringType, UnicodeType
-import win32api, win32gui, win32con, win32ui, commctrl
-import struct, array ,re
+import win32ui
+import win32api
+import win32gui
+import win32con
+import commctrl
 
 from gnue.common import events
 
@@ -61,10 +66,10 @@
       parent._children.append(self)
 
     self._hwnd = win32gui.CreateWindowEx(styleEx, className, windowTitle, 
style, x,y, width,height, hparent, menu, instance, None)
-    
+
     # this is only for SetFont
     self._PyCWnd = win32ui.CreateWindowFromHandle(self._hwnd)
-    
+
     self._uiDriver = uidriver
     self._uiDriver._win32app._HwndToTkObj[self._hwnd] = self
 
@@ -234,7 +239,7 @@
     else:
       return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
 
-  def SetFont(self,font):
+  def SetFont(self, font):
       self._PyCWnd.SetFont(font,1)
 
   def GetId(self):

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2005-06-26 08:47:41 UTC 
(rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/box.py 2005-06-26 11:09:49 UTC 
(rev 7657)
@@ -24,7 +24,7 @@
 #
 # NOTES:
 #
-import win32gui, win32con
+import win32con
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
 from gnue.forms.uidrivers.win32.common import *

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/button.py      2005-06-26 
11:09:49 UTC (rev 7657)
@@ -25,7 +25,7 @@
 # NOTES:
 #
 
-import win32gui, win32con
+import win32con
 
 from gnue.common import events
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Button

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2005-06-26 
11:09:49 UTC (rev 7657)
@@ -25,9 +25,10 @@
 # NOTES:
 #
 
-import win32gui, win32con
+import win32gui
+import win32con
+
 from gnue.common import events
-
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Entry
 from gnue.forms.uidrivers.win32.common import *
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2005-06-26 
11:09:49 UTC (rev 7657)
@@ -23,10 +23,15 @@
 # A PyWin32 based user interface driver for GNUe forms.
 #
 # NOTES:
-#
-import string, struct
+#
 
-import win32api, win32gui, win32con, commctrl
+import struct
+
+import win32ui
+import win32api
+import win32gui
+import win32con
+import commctrl
 
 from gnue.forms.uidrivers.win32.common import *
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
@@ -89,7 +94,7 @@
       0)
 
     self._uiDriver._win32app._MainWindowList.append(self.mainWindow)
-      
+
     if self._form.style == 'dialog':
       centerWindow(self.mainWindow.GetHwnd())
 
@@ -156,10 +161,10 @@
       win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 2, 
textEncode(insertValue))
 
     if currentRecord and  maxRecord:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 3, 
string.strip("%s/%s" % (currentRecord,maxRecord)))
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 3, 
("%s/%s" % (currentRecord,maxRecord)).strip())
 
     if currentPage and  maxPage:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 4, 
string.strip("%s/%s" % (currentPage,maxPage)))
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 4, 
("%s/%s" % (currentPage,maxPage)).strip())
 
     return
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2005-06-26 08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/wrappers.py       
2005-06-26 11:09:49 UTC (rev 7657)
@@ -23,14 +23,19 @@
 # A PyWin32 based user interface driver for GNUe forms.
 #
 # NOTES:
-#
-import string, struct, array
+#
+
+import array
+import struct
 
-import win32gui, win32con, win32api, commctrl
+import win32gui
+import win32con
+import win32api
+import commctrl
 
-from gnue.common import events
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window, 
Win32Page
 from gnue.forms.uidrivers.win32.common import *
+
 
 class ScrollableWrapper(Win32Window): 
   def __init__(self, uiform): 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/image.py       2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/image.py       2005-06-26 
11:09:49 UTC (rev 7657)
@@ -24,10 +24,11 @@
 #
 # NOTES:
 #
+
+import win32con
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Image
 from gnue.forms.uidrivers.win32.common import getNextId
-import win32con
 
 #
 # UIImage

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/label.py       2005-06-26 
11:09:49 UTC (rev 7657)
@@ -25,7 +25,7 @@
 # NOTES:
 #
 
-import win32gui, win32con
+import win32con
 
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
 from gnue.forms.uidrivers.win32.common import *

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/page.py        2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/page.py        2005-06-26 
11:09:49 UTC (rev 7657)
@@ -25,8 +25,6 @@
 # NOTES:
 #
 
-import win32gui, win32con
-
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper
 
 #

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-06-26 
08:47:41 UTC (rev 7656)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-06-26 
11:09:49 UTC (rev 7657)
@@ -25,10 +25,11 @@
 # NOTES:
 #
 
-import struct
-import win32gui, win32con
-from gnue.common import events
+import struct
 
+import win32gui
+import win32con
+
 from gnue.forms.uidrivers.win32.widgets._base import UIHelper, Win32Window
 from gnue.forms.uidrivers.win32.common import getNextId