gnue-forms/src/uidrivers/win32 TODO UILoginHand...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/09/06 05:59:06

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

Log message:
        cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/TODO.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/UILoginHandler.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/UIdriver.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/common.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gnue-forms/src/uidrivers/win32/TODO
diff -c gnue-forms/src/uidrivers/win32/TODO:1.6 
gnue-forms/src/uidrivers/win32/TODO:1.7
*** gnue-forms/src/uidrivers/win32/TODO:1.6     Tue Jul  1 15:13:37 2003
--- gnue-forms/src/uidrivers/win32/TODO Sat Sep  6 05:59:05 2003
***************
*** 1,5 ****
  * scrollable windows for image widgets
- * scrollbar widget
  * splash screen
  * textencoding support
  
--- 1,4 ----
Index: gnue-forms/src/uidrivers/win32/UILoginHandler.py
diff -c gnue-forms/src/uidrivers/win32/UILoginHandler.py:1.5 
gnue-forms/src/uidrivers/win32/UILoginHandler.py:1.6
*** gnue-forms/src/uidrivers/win32/UILoginHandler.py:1.5        Wed Jun  4 
13:00:16 2003
--- gnue-forms/src/uidrivers/win32/UILoginHandler.py    Sat Sep  6 05:59:05 2003
***************
*** 188,195 ****
  
  
    def OnInitDialog(self, hwnd, msg, wparam, lparam):
-     # TODO: calculate and reposition the dialog items
-     # TODO: and resize the dialog window
      self.hwnd = hwnd
  
      bmCtrl = win32gui.GetDlgItem(self.hwnd, self.ID_BITMAP)
--- 188,193 ----
***************
*** 303,325 ****
                                x, y,
                                self.Width(id), self.Height(id),
                                win32con.SWP_NOACTIVATE | win32con.SWP_NOZORDER)
- 
- #  def GetCharWidth(self):
- #    PyCWnd = win32ui.CreateWindowFromHandle(self.hwnd)
- #    font = win32gui.GetStockObject(win32con.SYSTEM_FONT)
- #    xwin32gui.SendMessage(self.hwnd, win32con.WM_SETFONT, font, 0)
- #    PyCWnd.SetFont(font,1)
- 
- #    dc = PyCWnd.GetWindowDC()
- #    dc.SelectObject(font)
- 
- #    metrics = dc.GetTextMetrics()
- #    maxWidth = metrics["tmAveCharWidth"]
- #    maxLeading = metrics["tmExternalLeading"]
- 
- #    PyCWnd.ReleaseDC(dc)
- 
- #    return int(maxWidth+maxLeading)
- 
- #    win32gui.SendMessage(id, WM_SETFONT,
- #                              font, 0)
--- 301,303 ----
Index: gnue-forms/src/uidrivers/win32/UIdriver.py
diff -c gnue-forms/src/uidrivers/win32/UIdriver.py:1.20 
gnue-forms/src/uidrivers/win32/UIdriver.py:1.21
*** gnue-forms/src/uidrivers/win32/UIdriver.py:1.20     Thu Aug 21 16:58:49 2003
--- gnue-forms/src/uidrivers/win32/UIdriver.py  Sat Sep  6 05:59:05 2003
***************
*** 302,305 ****
        self.dispatchEvent('requestEXIT',_form=self._form)
      else:
        event.Destroy()
-       # wxExit() TODO: Try and work this into navigator or here if it still 
hangs
--- 302,304 ----
Index: gnue-forms/src/uidrivers/win32/common.py
diff -c gnue-forms/src/uidrivers/win32/common.py:1.9 
gnue-forms/src/uidrivers/win32/common.py:1.10
*** gnue-forms/src/uidrivers/win32/common.py:1.9        Tue Jul  1 14:36:28 2003
--- gnue-forms/src/uidrivers/win32/common.py    Sat Sep  6 05:59:05 2003
***************
*** 33,62 ****
  from gnue.common import events
  from gnue.common.apps import GConfig
  
- # Finishing creation of dictionary for language font encodings
- encodings = {
- #FIX#    'iso8859-1': wxFONTENCODING_ISO8859_1,
- #FIX#    'iso8859-2': wxFONTENCODING_ISO8859_2,
- #FIX#    'iso8859-3': wxFONTENCODING_ISO8859_3,
- #FIX#    'iso8859-4': wxFONTENCODING_ISO8859_4,
- #FIX#    'iso8859-5': wxFONTENCODING_ISO8859_5,
- #FIX#    'iso8859-6': wxFONTENCODING_ISO8859_6,
- #FIX#    'iso8859-7': wxFONTENCODING_ISO8859_7,
- #FIX#    'iso8859-8': wxFONTENCODING_ISO8859_8,
- #FIX#    'iso8859-9': wxFONTENCODING_ISO8859_9,
- #FIX#    'iso8859-10': wxFONTENCODING_ISO8859_10,
- #FIX#    'iso8859-11': wxFONTENCODING_ISO8859_11,
- #FIX#    'iso8859-12': wxFONTENCODING_ISO8859_12,
- #FIX#    'iso8859-13': wxFONTENCODING_ISO8859_13,
- #FIX#    'iso8859-14': wxFONTENCODING_ISO8859_14,
- #FIX#    'iso8859-15': wxFONTENCODING_ISO8859_15,
- #FIX#    'koi8': wxFONTENCODING_KOI8,
- #FIX#    'koi8-r': wxFONTENCODING_KOI8,
- #FIX#    'cp1250': wxFONTENCODING_CP1250,
- #FIX#    'cp1251': wxFONTENCODING_CP1251,
- #FIX#    'cp1252': wxFONTENCODING_CP1252
-    '':''
-     }
  
  _idPos = 1000
  
--- 33,38 ----
Index: gnue-forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue-forms/src/uidrivers/win32/widgets/_base.py:1.23 
gnue-forms/src/uidrivers/win32/widgets/_base.py:1.24
*** gnue-forms/src/uidrivers/win32/widgets/_base.py:1.23        Thu Aug 21 
14:31:05 2003
--- gnue-forms/src/uidrivers/win32/widgets/_base.py     Sat Sep  6 05:59:06 2003
***************
*** 451,457 ****
      id = widget.GetId()
      self._uiDriver._IdToGFObj[id]=gfobject
      self._uiDriver._IdToUIObj[id]=uiobject
- #    widget.__origBackgroundColor = widget.GetBackgroundColour()
  
    def _deleteFromCrossRef(self, widget, object):
      id = widget.GetId()
--- 451,456 ----
***************
*** 486,495 ****
      self.widgets[index].SetFocus()
  
    def setValue(self, value, index=0, enabled=1):
-     # These must be here or dropdown style controls
-     # will get events they shouldn't and break.
      widget = self.widgets[index]
- #    widget.SetEvtHandlerEnabled(FALSE)
  
      # Check if foreign key changed
      gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
--- 485,491 ----
***************
*** 498,504 ****
            not gfObject._field._allowedValues == widget._origAllowedValues:
          widget._origAllowedValues = gfObject._field._allowedValues
          win32gui.SendMessage(widget.GetHwnd(), win32con.CB_RESETCONTENT, 0, 0)
- #        for value in gfObject._field._allowedValuesDescr:
          for value in gfObject._field.allowedValues()[1]:
            win32gui.SendMessage(widget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
value)
          widget.SetValue("")
--- 494,499 ----
***************
*** 507,518 ****
  
      widget.SetValue(value)
      widget.Enable(enabled)
- #    widget.SetEvtHandlerEnabled(TRUE)
- #    if enabled:
- #      widget.SetBackgroundColour(widget.__origBackgroundColor)
- #    else:
- #      widget.SetBackgroundColour(self._uiDriver._disabledColour)
- #    widget.Refresh()
  
  
    def setCursorPosition(self, position, index=0):
--- 502,507 ----