gnue/forms/src/uidrivers/win32 MenuBar.py ToolB...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/03/04 07:49:37

Modified files:
        forms/src/uidrivers/win32: MenuBar.py ToolBar.py 

Log message:
        fixing menubar/toolbar events

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/MenuBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/ToolBar.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/MenuBar.py
diff -c gnue/forms/src/uidrivers/win32/MenuBar.py:1.1 
gnue/forms/src/uidrivers/win32/MenuBar.py:1.2
*** gnue/forms/src/uidrivers/win32/MenuBar.py:1.1       Mon Mar  3 16:28:07 2003
--- gnue/forms/src/uidrivers/win32/MenuBar.py   Tue Mar  4 07:49:36 2003
***************
*** 32,37 ****
--- 32,38 ----
  from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
  from gnue.forms.uidrivers.win32.common import getNextId
  from gnue.common.apps import GDebug
+ from gnue.common import events
  
  _menustyle = win32con.MF_STRING | win32con.MF_POPUP
  
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.2 
gnue/forms/src/uidrivers/win32/ToolBar.py:1.3
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.2       Mon Mar  3 16:30:05 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py   Tue Mar  4 07:49:36 2003
***************
*** 33,38 ****
--- 33,39 ----
  from gnue.forms.uidrivers._commonGuiToolkit.ToolBar import ToolBar as 
_BaseToolBar
  from gnue.forms.uidrivers.win32.common import getNextId
  from gnue.common.apps import GDebug
+ from gnue.common import events
  
  class ToolBar(_BaseToolBar):
  
***************
*** 81,87 ****
  
  
      # Create an event binding in windows
!     idCommand = getNextId()
      event = 'request' + userAction.event
      self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
  
--- 82,88 ----
  
  
      # Create an event binding in windows
!     id = getNextId()
      event = 'request' + userAction.event
      self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
  
***************
*** 90,101 ****
      iBitmap = win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDBITMAP, 1, 
tbab)
  
  #    TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
!     tbb=struct.pack("iiiili", iBitmap, idCommand, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_BUTTON, 0, 0)
      win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDBUTTONS, 1, tbb)
  
      win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDSTRING, 0, 
userAction.description or '');
  
!     return (parent, idCommand)
  
  
    # Add a separator
--- 91,102 ----
      iBitmap = win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDBITMAP, 1, 
tbab)
  
  #    TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
!     tbb=struct.pack("iiiili", iBitmap, id, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_BUTTON, 0, 0)
      win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDBUTTONS, 1, tbb)
  
      win32gui.SendMessage(parent.GetId(), commctrl.TB_ADDSTRING, 0, 
userAction.description or '');
  
!     return (parent, id)
  
  
    # Add a separator