[pywin32-checkins] pywin32/win32/Demos win32gui_menu.py, 1.8.2.2, 1.8.2.3 win32gui_taskbar.py, 1.9.2.3, 1.9.2.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4381/win32/Demos

Modified Files:
      Tag: py3k
	win32gui_menu.py win32gui_taskbar.py 
Log Message:
merge more various changes from the trunk

Index: win32gui_taskbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_taskbar.py,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** win32gui_taskbar.py	3 Oct 2008 01:09:55 -0000	1.9.2.3
--- win32gui_taskbar.py	4 Dec 2008 07:28:46 -0000	1.9.2.4
***************
*** 37,41 ****
          win32gui.UpdateWindow(self.hwnd)
          self._DoCreateIcons()
!         
      def _DoCreateIcons(self):
          # Try and find a custom icon
--- 37,41 ----
          win32gui.UpdateWindow(self.hwnd)
          self._DoCreateIcons()
! 
      def _DoCreateIcons(self):
          # Try and find a custom icon

Index: win32gui_menu.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_menu.py,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** win32gui_menu.py	11 Sep 2008 07:48:21 -0000	1.8.2.2
--- win32gui_menu.py	4 Dec 2008 07:28:46 -0000	1.8.2.3
***************
*** 166,170 ****
          DeleteDC(hdcBitmap)
          item, extras = PackMENUITEMINFO(text="Menu with icon",
!                                         hbmpItem=hbm,
                                          wID=1011)
          InsertMenuItem(menu, 0, 1, item)
--- 166,170 ----
          DeleteDC(hdcBitmap)
          item, extras = PackMENUITEMINFO(text="Menu with icon",
!                                         hbmpItem=hbm.Detach(),
                                          wID=1011)
          InsertMenuItem(menu, 0, 1, item)