[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32term.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32term.c |
Date: |
Sun, 11 Sep 2005 16:32:16 -0400 |
Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.230 emacs/src/w32term.c:1.231
*** emacs/src/w32term.c:1.230 Sun Aug 7 12:33:18 2005
--- emacs/src/w32term.c Sun Sep 11 20:32:10 2005
***************
*** 5267,5282 ****
struct frame *f;
Lisp_Object icon;
{
! HANDLE hicon;
if (FRAME_W32_WINDOW (f) == 0)
return 1;
if (NILP (icon))
! hicon = LoadIcon (hinst, EMACS_CLASS);
else if (STRINGP (icon))
! hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
! LR_DEFAULTSIZE | LR_LOADFROMFILE);
else if (SYMBOLP (icon))
{
LPCTSTR name;
--- 5267,5291 ----
struct frame *f;
Lisp_Object icon;
{
! HANDLE main_icon;
! HANDLE small_icon = NULL;
if (FRAME_W32_WINDOW (f) == 0)
return 1;
if (NILP (icon))
! main_icon = LoadIcon (hinst, EMACS_CLASS);
else if (STRINGP (icon))
! {
! /* Load the main icon from the named file. */
! main_icon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0,
! LR_DEFAULTSIZE | LR_LOADFROMFILE);
! /* Try to load a small icon to go with it. */
! small_icon = LoadImage (NULL, (LPCSTR) SDATA (icon), IMAGE_ICON,
! GetSystemMetrics (SM_CXSMICON),
! GetSystemMetrics (SM_CYSMICON),
! LR_LOADFROMFILE);
! }
else if (SYMBOLP (icon))
{
LPCTSTR name;
***************
*** 5296,5311 ****
else
return 1;
! hicon = LoadIcon (NULL, name);
}
else
return 1;
! if (hicon == NULL)
return 1;
PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_BIG,
! (LPARAM) hicon);
return 0;
}
--- 5305,5325 ----
else
return 1;
! main_icon = LoadIcon (NULL, name);
}
else
return 1;
! if (main_icon == NULL)
return 1;
PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_BIG,
! (LPARAM) main_icon);
!
! /* If there is a small icon that goes with it, set that too. */
! if (small_icon)
! PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_SMALL,
! (LPARAM) small_icon);
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/w32term.c,
Jason Rumney <=