[Spambayes-checkins] spambayes/windows pop3proxy_tray.py,1.18,1.19

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv10059

Modified Files:
	pop3proxy_tray.py 
Log Message:
Better icons and icon loading code from Kenny Pitt.


Index: pop3proxy_tray.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/windows/pop3proxy_tray.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pop3proxy_tray.py	16 Dec 2003 05:06:34 -0000	1.18
--- pop3proxy_tray.py	17 Dec 2003 06:45:44 -0000	1.19
***************
*** 170,185 ****
              hexe = GetModuleHandle(None)
              icon_flags = win32con.LR_DEFAULTSIZE
!             self.hstartedicon = LoadImage(hexe, 1000, win32con.IMAGE_ICON, 0,
!                                           0, icon_flags)
!             self.hstoppedicon = LoadImage(hexe, 1010, win32con.IMAGE_ICON, 0,
!                                           0, icon_flags)
          else:
              # If we have no icon we fail in all sorts of places - so may as
              # well make it here :)
              icon_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE
!             self.hstartedicon = LoadImage(hinst, startedIconPathName, win32con.IMAGE_ICON, 0,
!                                           0, icon_flags)
!             self.hstoppedicon = LoadImage(hinst, stoppedIconPathName, win32con.IMAGE_ICON, 0,
!                                           0, icon_flags)
  
          flags = NIF_ICON | NIF_MESSAGE | NIF_TIP
--- 170,185 ----
              hexe = GetModuleHandle(None)
              icon_flags = win32con.LR_DEFAULTSIZE
!             self.hstartedicon = LoadImage(hexe, 1000, win32con.IMAGE_ICON,
!                                           16, 16, icon_flags)
!             self.hstoppedicon = LoadImage(hexe, 1010, win32con.IMAGE_ICON,
!                                           16, 16, icon_flags)
          else:
              # If we have no icon we fail in all sorts of places - so may as
              # well make it here :)
              icon_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE
!             self.hstartedicon = LoadImage(hinst, startedIconPathName, win32con.IMAGE_ICON,
!                                           16, 16, icon_flags)
!             self.hstoppedicon = LoadImage(hinst, stoppedIconPathName, win32con.IMAGE_ICON,
!                                           16, 16, icon_flags)
  
          flags = NIF_ICON | NIF_MESSAGE | NIF_TIP