gnue/forms/src/uidrivers/win32/widgets _base.py...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/04/16 13:33:44

Modified files:
        forms/src/uidrivers/win32/widgets: _base.py button.py 

Log message:
        changing tabs with mouse now works too

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/button.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue/forms/src/uidrivers/win32/widgets/_base.py:1.10 
gnue/forms/src/uidrivers/win32/widgets/_base.py:1.11
*** gnue/forms/src/uidrivers/win32/widgets/_base.py:1.10        Tue Apr 15 
18:21:04 2003
--- gnue/forms/src/uidrivers/win32/widgets/_base.py     Wed Apr 16 13:33:44 2003
***************
*** 76,110 ****
    def _wndproc(self, hwnd, msg, wParam, lParam):
      if msg == win32con.WM_LBUTTONDOWN:
        gfObject = self._uiDriver._IdToGFObj[self._id]
!       uiobject = self._uiDriver._IdToUIObj[self._id]
    
        if 1: #not self.hasFocus():
        # Request Focus
!         uiobject._eventHandler('requestFOCUS',gfObject,_form=gfObject._form)
!         count = uiobject.widgets.index(self)
!         uiobject._eventHandler('requestJUMPRECORD',count - 
gfObject._visibleIndex,_form=gfObject._form)
  
        if gfObject._type == 'GFButton':
          self.SetFocus()
          self._connectTable[self._id](self._id)
        elif gfObject.style == 'checkbox':
!         uiobject._eventHandler('requestTOGGLECHKBOX',_form=gfObject._form)
        else:
          win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, lParam)
          gs = win32gui.SendMessage(hwnd, win32con.EM_GETSEL, 0, 0)
          cursorPosition = win32api.HIWORD(gs)
!         
uiobject._eventHandler('requestCURSORMOVE',position=cursorPosition,_form=gfObject._form)
  
      elif msg == win32con.WM_KEYDOWN:
        keycode = wParam
        gfObject = self._uiDriver._IdToGFObj[self._id]
        if (keycode in NOT_WM_CHAR_KEYS):
  
!         if gfObject.style == 'dropdown':
!           return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
! 
!         else:
!           object = self._uiDriver._IdToGFObj[self._id]
            action = None
  
            ShiftDown = (win32api.GetKeyState(win32con.VK_SHIFT) & 0x8000) and 
1 or 0
--- 76,107 ----
    def _wndproc(self, hwnd, msg, wParam, lParam):
      if msg == win32con.WM_LBUTTONDOWN:
        gfObject = self._uiDriver._IdToGFObj[self._id]
!       uiObject = self._uiDriver._IdToUIObj[self._id]
    
        if 1: #not self.hasFocus():
        # Request Focus
!         uiObject._eventHandler('requestFOCUS',gfObject,_form=gfObject._form)
!         count = uiObject.widgets.index(self)
!         uiObject._eventHandler('requestJUMPRECORD',count - 
gfObject._visibleIndex,_form=gfObject._form)
  
        if gfObject._type == 'GFButton':
          self.SetFocus()
          self._connectTable[self._id](self._id)
        elif gfObject.style == 'checkbox':
!         uiObject._eventHandler('requestTOGGLECHKBOX',_form=gfObject._form)
        else:
          win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, lParam)
          gs = win32gui.SendMessage(hwnd, win32con.EM_GETSEL, 0, 0)
          cursorPosition = win32api.HIWORD(gs)
!         
uiObject._eventHandler('requestCURSORMOVE',position=cursorPosition,_form=gfObject._form)
  
      elif msg == win32con.WM_KEYDOWN:
        keycode = wParam
        gfObject = self._uiDriver._IdToGFObj[self._id]
        if (keycode in NOT_WM_CHAR_KEYS):
  
!         if gfObject._type == 'GFButton' or (gfObject._type == 'GFEntry' and 
gfObject.style != 'dropdown'):
!           gfObject = self._uiDriver._IdToGFObj[self._id]
            action = None
  
            ShiftDown = (win32api.GetKeyState(win32con.VK_SHIFT) & 0x8000) and 
1 or 0
***************
*** 122,130 ****
  
              # Add the object's _form to the outgoing event
              # rather than every event in the function
!             action.__dict__.update({'_form':object._form})
!             uiobject = self._uiDriver._IdToUIObj[self._id]
!             uiobject._eventHandler(action)
  
      elif msg == win32con.WM_CHAR:
        # The TranslateMessage function generates a WM_CHAR message 
--- 119,130 ----
  
              # Add the object's _form to the outgoing event
              # rather than every event in the function
!             action.__dict__.update({'_form':gfObject._form})
!             uiObject = self._uiDriver._IdToUIObj[self._id]
!             uiObject._eventHandler(action)
! 
!         else:
!           return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
  
      elif msg == win32con.WM_CHAR:
        # The TranslateMessage function generates a WM_CHAR message 
***************
*** 136,142 ****
        # shift+enter (linefeed) 
        # tab 
  
!       object = self._uiDriver._IdToGFObj[self._id]
        action = None
        
        keycode = wParam
--- 136,142 ----
        # shift+enter (linefeed) 
        # tab 
  
!       gfObject = self._uiDriver._IdToGFObj[self._id]
        action = None
        
        keycode = wParam
***************
*** 153,159 ****
            not ControlDown and \
            not AltDown and \
            int (gConfigForms('enterIsNewLine')) and \
!           (hasattr(object,'Char__height') and object.Char__height) > 1:
  
          command = 'NEWLINE'
  
--- 153,159 ----
            not ControlDown and \
            not AltDown and \
            int (gConfigForms('enterIsNewLine')) and \
!           (hasattr(gfObject,'Char__height') and gfObject.Char__height) > 1:
  
          command = 'NEWLINE'
  
***************
*** 174,188 ****
                       code=10)
  
        elif command and not keycode in NOT_WM_CHAR_KEYS:
!           if keycode == 13 and object._type == 'GFButton':
              self._connectTable[self._id](self._id)
            else:
              action = events.Event('request%s' % command)
  
!       elif object._type == 'GFButton':
!         action = events.Event('buttonActivated',object)
  
!       elif object.style == 'checkbox':
          # <space> <=> <click>
          if keycode == 32:
              action = events.Event('requestTOGGLECHKBOX')
--- 174,188 ----
                       code=10)
  
        elif command and not keycode in NOT_WM_CHAR_KEYS:
!           if keycode == 13 and gfObject._type == 'GFButton':
              self._connectTable[self._id](self._id)
            else:
              action = events.Event('request%s' % command)
  
!       elif gfObject._type == 'GFButton':
!         action = events.Event('buttonActivated',gfObject)
  
!       elif gfObject.style == 'checkbox':
          # <space> <=> <click>
          if keycode == 32:
              action = events.Event('requestTOGGLECHKBOX')
***************
*** 204,225 ****
        if action:
        # Add the object's _form to the outgoing event
        # rather than every event in the function
!         action.__dict__.update({'_form':object._form})
!         uiobject = self._uiDriver._IdToUIObj[self._id]
!         uiobject._eventHandler(action)
  
!       if object.style == 'dropdown':
!         return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
        
      elif msg == win32con.WM_COMMAND:
  
        if win32api.HIWORD(wParam) == win32con.CBN_SELCHANGE:
          gfObject = self._uiDriver._IdToGFObj[self._id]
!         uiobject = self._uiDriver._IdToUIObj[self._id]
          if gfObject.style == 'dropdown':
            selection = self.GetValue()
            string = gfObject._field.allowedValues()[1][selection]
!           uiobject._eventHandler('requestREPLACEVALUE',object=gfObject,
                                index=selection, text=string,
                              _form=gfObject._form)
          return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
--- 204,226 ----
        if action:
        # Add the object's _form to the outgoing event
        # rather than every event in the function
!         action.__dict__.update({'_form':gfObject._form})
!         uiObject = self._uiDriver._IdToUIObj[self._id]
!         uiObject._eventHandler(action)
  
!       if gfObject._type == 'GFEntry':
!         if gfObject.style == 'dropdown':
!           return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
        
      elif msg == win32con.WM_COMMAND:
  
        if win32api.HIWORD(wParam) == win32con.CBN_SELCHANGE:
          gfObject = self._uiDriver._IdToGFObj[self._id]
!         uiObject = self._uiDriver._IdToUIObj[self._id]
          if gfObject.style == 'dropdown':
            selection = self.GetValue()
            string = gfObject._field.allowedValues()[1][selection]
!           uiObject._eventHandler('requestREPLACEVALUE',object=gfObject,
                                index=selection, text=string,
                              _form=gfObject._form)
          return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
***************
*** 311,316 ****
--- 312,322 ----
        window = self._uiDriver._IdToTkObj[hwndFrom]
        pageId = win32gui.SendMessage(window.GetHwnd(), commctrl.TCM_GETCURSEL, 
0, 0)
        window._children[pageId].Show()
+ 
+       id = window._children[pageId].GetId()
+       gfObject = self._uiDriver._IdToGFObj[id]
+       uiObject = self._uiDriver._IdToUIObj[id]
+       uiObject._uiForm._eventHandler('requestPAGE', pageId, 
_form=gfObject._form)
      elif code == -718: #commctrl.TTN_NEEDTEXT
        # TODO
        window = self._uiDriver._IdToTkObj[hwndFrom]
***************
*** 320,334 ****
  class Win32Entry(Win32Base):
      
    def SetValue(self, value):
!     object = self._uiDriver._IdToGFObj[self._id]
      try:
!       if object.style == 'checkbox':
          if value:
            val = win32con.BST_CHECKED
          else:
            val = win32con.BST_UNCHECKED
          win32gui.SendMessage(self._hwnd, win32con.BM_SETCHECK, val, 0)
!       elif object.style == 'dropdown':
          win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, -1, value) 
# CB_SETCURSEL, value, 0)
        else:
          win32gui.SetWindowText(self._hwnd, str(value))
--- 326,340 ----
  class Win32Entry(Win32Base):
      
    def SetValue(self, value):
!     gfObject = self._uiDriver._IdToGFObj[self._id]
      try:
!       if gfObject.style == 'checkbox':
          if value:
            val = win32con.BST_CHECKED
          else:
            val = win32con.BST_UNCHECKED
          win32gui.SendMessage(self._hwnd, win32con.BM_SETCHECK, val, 0)
!       elif gfObject.style == 'dropdown':
          win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, -1, value) 
# CB_SETCURSEL, value, 0)
        else:
          win32gui.SetWindowText(self._hwnd, str(value))
***************
*** 336,349 ****
        pass
  
    def GetValue(self):
!     object = self._uiDriver._IdToGFObj[self._id]
!     if object.style == 'checkbox':
        val = win32gui.SendMessage(self._hwnd, win32con.BM_GETCHECK, 0, 0) & 
win32con.BST_CHECKED
        if val:
          return 1
        else:
          return 0
!     elif object.style == 'dropdown':
        return win32gui.SendMessage(self._hwnd, win32con.CB_GETCURSEL, 0, 0)
      else:
        return win32gui.GetWindowText(self._hwnd)
--- 342,355 ----
        pass
  
    def GetValue(self):
!     gfObject = self._uiDriver._IdToGFObj[self._id]
!     if gfObject.style == 'checkbox':
        val = win32gui.SendMessage(self._hwnd, win32con.BM_GETCHECK, 0, 0) & 
win32con.BST_CHECKED
        if val:
          return 1
        else:
          return 0
!     elif gfObject.style == 'dropdown':
        return win32gui.SendMessage(self._hwnd, win32con.CB_GETCURSEL, 0, 0)
      else:
        return win32gui.GetWindowText(self._hwnd)
***************
*** 425,442 ****
  #    widget.SetEvtHandlerEnabled(FALSE)
  
      # Check if foreign key changed
! #    object = self._uiDriver._IdToGFObj[widget.GetId()]
  #    try:
! #      if object.style == "dropdown" and \
! #          not object._field._allowedValues == widget._origAllowedValues:
  #        try:
  #          # Not in wx 2.2.x
  #          widget.Freeze()
  #        except AttributeError:
  #          pass
! #        widget._origAllowedValues = object._field._allowedValues
  #        widget.Clear()
! #        for value in object._field._allowedValuesDescr:
  #          widget.Append(value)
  #        try:
  #          # Not in wx 2.2.x
--- 431,448 ----
  #    widget.SetEvtHandlerEnabled(FALSE)
  
      # Check if foreign key changed
! #    gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
  #    try:
! #      if gfObject.style == "dropdown" and \
! #          not gfObject._field._allowedValues == widget._origAllowedValues:
  #        try:
  #          # Not in wx 2.2.x
  #          widget.Freeze()
  #        except AttributeError:
  #          pass
! #        widget._origAllowedValues = gfObject._field._allowedValues
  #        widget.Clear()
! #        for value in gfObject._field._allowedValuesDescr:
  #          widget.Append(value)
  #        try:
  #          # Not in wx 2.2.x
Index: gnue/forms/src/uidrivers/win32/widgets/button.py
diff -c gnue/forms/src/uidrivers/win32/widgets/button.py:1.3 
gnue/forms/src/uidrivers/win32/widgets/button.py:1.4
*** gnue/forms/src/uidrivers/win32/widgets/button.py:1.3        Sun Mar  9 
18:08:46 2003
--- gnue/forms/src/uidrivers/win32/widgets/button.py    Wed Apr 16 13:33:44 2003
***************
*** 58,64 ****
  
  #  def buttonHandler(self,event):
    def buttonHandler(self, id):
!       print "in buttonHandler id=", id
        action = None
        gfObject = self._uiDriver._IdToGFObj[id]
        action = events.Event('buttonActivated',gfObject)
--- 58,64 ----
  
  #  def buttonHandler(self,event):
    def buttonHandler(self, id):
!       #print "in buttonHandler id=", id
        action = None
        gfObject = self._uiDriver._IdToGFObj[id]
        action = events.Event('buttonActivated',gfObject)