Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6046/Demos
Modified Files:
win32gui_menu.py win32gui_taskbar.py
Log Message:
.ico files have changed location in python 2.5 binaries.
Index: win32gui_taskbar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_taskbar.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** win32gui_taskbar.py 10 Jan 2006 00:30:00 -0000 1.8
--- win32gui_taskbar.py 30 Oct 2007 09:27:13 -0000 1.9
***************
*** 36,39 ****
--- 36,42 ----
iconPathName = os.path.abspath(os.path.join( os.path.split(sys.executable)[0], "pyc.ico" ))
if not os.path.isfile(iconPathName):
+ # Look in DLLs dir, a-la py 2.5
+ iconPathName = os.path.abspath(os.path.join( os.path.split(sys.executable)[0], "DLLs", "pyc.ico" ))
+ if not os.path.isfile(iconPathName):
# Look in the source tree.
iconPathName = os.path.abspath(os.path.join( os.path.split(sys.executable)[0], "..\\PC\\pyc.ico" ))
Index: win32gui_menu.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/win32gui_menu.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32gui_menu.py 6 Sep 2007 06:44:54 -0000 1.5
--- win32gui_menu.py 30 Oct 2007 09:27:13 -0000 1.6
***************
*** 46,49 ****
--- 46,52 ----
UpdateWindow(self.hwnd)
iconPathName = os.path.abspath(os.path.join( sys.prefix, "pyc.ico" ))
+ # py2.5 includes the .ico files in the DLLs dir for some reason.
+ if not os.path.isfile(iconPathName):
+ iconPathName = os.path.abspath(os.path.join( os.path.split(sys.executable)[0], "DLLs", "pyc.ico" ))
if not os.path.isfile(iconPathName):
# Look in the source tree.
|
