gnue-forms/src/uidrivers/win32 UIdriver.py comm...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/07/01 14:36:28

Modified files:
        src/uidrivers/win32: UIdriver.py common.py 
        src/uidrivers/win32/widgets: _base.py 

Log message:
        little font cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/common.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gnue-forms/src/uidrivers/win32/UIdriver.py
diff -c gnue-forms/src/uidrivers/win32/UIdriver.py:1.18 
gnue-forms/src/uidrivers/win32/UIdriver.py:1.19
*** gnue-forms/src/uidrivers/win32/UIdriver.py:1.18     Wed Jun 25 19:05:57 2003
--- gnue-forms/src/uidrivers/win32/UIdriver.py  Tue Jul  1 14:36:28 2003
***************
*** 44,50 ****
  from gnue.forms.uidrivers.win32.GFwin32App import *
  #from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
  from gnue.forms.uidrivers.win32.widgets._base  import *
- from gnue.forms.uidrivers.win32.common import setWidgetBaseFont
  
  
  def OnWMMenuselect(hwnd, msg, wParam, lParam, widget):
--- 44,49 ----
***************
*** 135,142 ****
  
  
      font_spec = {'name':'Courier New', 
'height':int(gConfigForms('pointSize'))}
!     font = win32ui.CreateFont(font_spec)
!     setWidgetBaseFont(font)
  
      #
      # Create a dummy window used to compute sizes 
--- 134,140 ----
  
  
      font_spec = {'name':'Courier New', 
'height':int(gConfigForms('pointSize'))}
!     self._font = win32ui.CreateFont(font_spec)
  
      #
      # Create a dummy window used to compute sizes 
***************
*** 144,150 ****
      from pywin.mfc import window
      dummyWindow = window.Wnd(win32ui.CreateWnd())
      dc = dummyWindow.GetWindowDC()
!     dc.SelectObject(font)
      metrics = dc.GetTextMetrics()
      maxWidth = metrics["tmAveCharWidth"]
      maxHeight = metrics["tmHeight"]
--- 142,148 ----
      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"]
Index: gnue-forms/src/uidrivers/win32/common.py
diff -c gnue-forms/src/uidrivers/win32/common.py:1.8 
gnue-forms/src/uidrivers/win32/common.py:1.9
*** gnue-forms/src/uidrivers/win32/common.py:1.8        Sat May 24 11:20:07 2003
--- gnue-forms/src/uidrivers/win32/common.py    Tue Jul  1 14:36:28 2003
***************
*** 65,82 ****
    _idPos += 1
    return _idPos
  
- #
- # Little global helper routine to set font according to options
- #
- # TODO: Not completed
- #
- def initFont(widget, affectsLayout=1):
-   global _font
-   widget.SetFont(_font)
-   
- def setWidgetBaseFont(font):
-   global _font
-   _font = font
  
  def centerWindow(hwnd):
    desktop = win32gui.GetDesktopWindow()
--- 65,70 ----
Index: gnue-forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue-forms/src/uidrivers/win32/widgets/_base.py:1.20 
gnue-forms/src/uidrivers/win32/widgets/_base.py:1.21
*** gnue-forms/src/uidrivers/win32/widgets/_base.py:1.20        Wed Jun 25 
19:05:57 2003
--- gnue-forms/src/uidrivers/win32/widgets/_base.py     Tue Jul  1 14:36:28 2003
***************
*** 35,41 ****
  
  from gnue.forms.GFForm import *
  from gnue.forms.uidrivers._base.widgets._base import *
- from gnue.forms.uidrivers.win32.common import initFont
  
  try:
    import ImageWin
--- 35,40 ----
***************
*** 498,504 ****
  
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
!     initFont(newWidget)
      self._addToCrossRef(newWidget,event.object,self)
      return newWidget
  
--- 497,503 ----
  
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
!     newWidget.SetFont(self._uiDriver._font)
      self._addToCrossRef(newWidget,event.object,self)
      return newWidget