gnue/forms/src/uidrivers/win32 ToolBar.py

[Bajusz Tamás]

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

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

Log message:
        fixing toolbar separators

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

Patches:
Index: gnue/forms/src/uidrivers/win32/ToolBar.py
diff -c gnue/forms/src/uidrivers/win32/ToolBar.py:1.7 
gnue/forms/src/uidrivers/win32/ToolBar.py:1.8
*** gnue/forms/src/uidrivers/win32/ToolBar.py:1.7       Sun Mar 16 18:57:28 2003
--- gnue/forms/src/uidrivers/win32/ToolBar.py   Sun Mar 23 07:24:28 2003
***************
*** 40,46 ****
    # Create the menu
    def init(self):
      hinst = win32api.GetModuleHandle(None)
!     style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS
      styleEx = 0
      self.toolbar = mainToolBar = Win32Window(self.driver, styleEx, 
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
        style, 0, 0, 0, 0,
--- 40,46 ----
    # Create the menu
    def init(self):
      hinst = win32api.GetModuleHandle(None)
!     style = win32con.WS_CHILD | commctrl.TBSTYLE_TOOLTIPS 
#|win32con.WS_BORDER | commctrl.TBSTYLE_FLAT
      styleEx = 0
      self.toolbar = mainToolBar = Win32Window(self.driver, styleEx, 
commctrl.TOOLBARCLASSNAME, "GNUe toolbar",
        style, 0, 0, 0, 0,
***************
*** 87,93 ****
      iBitmap = win32gui.SendMessage(parent.GetHwnd(), 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.GetHwnd(), commctrl.TB_ADDBUTTONS, 1, tbb)
  
      win32gui.SendMessage(parent.GetHwnd(), commctrl.TB_ADDSTRING, 0, 
userAction.description or '')
--- 87,93 ----
      iBitmap = win32gui.SendMessage(parent.GetHwnd(), commctrl.TB_ADDBITMAP, 
1, tbab)
  
  #    TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
!     tbb=struct.pack("iibbli", iBitmap, id, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_BUTTON, 0, 0)
      win32gui.SendMessage(parent.GetHwnd(), commctrl.TB_ADDBUTTONS, 1, tbb)
  
      win32gui.SendMessage(parent.GetHwnd(), commctrl.TB_ADDSTRING, 0, 
userAction.description or '')
***************
*** 97,107 ****
  
    # Add a separator
    def addSeparator(self):
! # TODO: this doesn't work
! #      tbb=struct.pack("iiiili", -1, 0, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_SEP, 0, 0)
! #      win32gui.SendMessage(self.toolbar.GetHwnd(), commctrl.TB_ADDBUTTONS, 
1, tbb)
!     return
!     self.toolbar.AddSeparator()
  
    # Enable a menu item
    def enableItem(self, item):
--- 97,104 ----
  
    # Add a separator
    def addSeparator(self):
!       tbb=struct.pack("iibbli", 0, 0, commctrl.TBSTATE_ENABLED, 
commctrl.TBSTYLE_SEP, 0, 0)
!       win32gui.SendMessage(self.toolbar.GetHwnd(), commctrl.TB_ADDBUTTONS, 1, 
tbb)
  
    # Enable a menu item
    def enableItem(self, item):