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

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/24 11:20:07

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

Log message:
        minor fixes to let reports run with --ui win32

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/common.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/entry.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/UIdriver.py
diff -c gnue/forms/src/uidrivers/win32/UIdriver.py:1.14 
gnue/forms/src/uidrivers/win32/UIdriver.py:1.15
*** gnue/forms/src/uidrivers/win32/UIdriver.py:1.14     Thu May  8 16:14:07 2003
--- gnue/forms/src/uidrivers/win32/UIdriver.py  Sat May 24 11:20:07 2003
***************
*** 129,143 ****
  #      self.splash = UIWXSplashScreen()
  
  
      #
      # Create a dummy window used to compute sizes 
      #
      from pywin.mfc import window
-     font_spec = {'name':'Courier New', 'height':int(gConfig('pointSize'))}
-     font = win32ui.CreateFont (font_spec)
      dummyWindow = window.Wnd(win32ui.CreateWnd())
      dc = dummyWindow.GetWindowDC()
!     dc.SelectObject (font)
      metrics = dc.GetTextMetrics()
      maxWidth = metrics["tmAveCharWidth"]
      maxHeight = metrics["tmHeight"]
--- 129,145 ----
  #      self.splash = UIWXSplashScreen()
  
  
+     font_spec = {'name':'Courier New', 
'height':int(gConfigForms('pointSize'))}
+     font = win32ui.CreateFont(font_spec)
+     setWidgetBaseFont(font)
+ 
      #
      # Create a dummy window used to compute sizes 
      #
      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"]
Index: gnue/forms/src/uidrivers/win32/common.py
diff -c gnue/forms/src/uidrivers/win32/common.py:1.7 
gnue/forms/src/uidrivers/win32/common.py:1.8
*** gnue/forms/src/uidrivers/win32/common.py:1.7        Thu May  8 16:14:07 2003
--- gnue/forms/src/uidrivers/win32/common.py    Sat May 24 11:20:07 2003
***************
*** 74,82 ****
    global _font
    widget.SetFont(_font)
    
- font_spec = {'name':'Courier New', 'height':int(gConfig('pointSize'))}
- _font = win32ui.CreateFont (font_spec)
- 
  def setWidgetBaseFont(font):
    global _font
    _font = font
--- 74,79 ----
Index: gnue/forms/src/uidrivers/win32/widgets/entry.py
diff -c gnue/forms/src/uidrivers/win32/widgets/entry.py:1.8 
gnue/forms/src/uidrivers/win32/widgets/entry.py:1.9
*** gnue/forms/src/uidrivers/win32/widgets/entry.py:1.8 Thu May  8 16:14:07 2003
--- gnue/forms/src/uidrivers/win32/widgets/entry.py     Sat May 24 11:20:07 2003
***************
*** 62,69 ****
        style = win32con.WS_CHILD | win32con.BS_AUTOCHECKBOX
        styleEx = 0
        className = "BUTTON"
!       width = event.textWidth
        height = event.textHeight
        
      else: # Normal text box
        style = win32con.WS_CHILD | win32con.ES_NOHIDESEL | \
--- 62,70 ----
        style = win32con.WS_CHILD | win32con.BS_AUTOCHECKBOX
        styleEx = 0
        className = "BUTTON"
! ##      width = event.textWidth
        height = event.textHeight
+       width = height
        
      else: # Normal text box
        style = win32con.WS_CHILD | win32con.ES_NOHIDESEL | \