|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.459
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.459
|
|
|
d6ba96 |
Problem: Can't change the icon after building Vim.
|
|
|
d6ba96 |
Solution: Load the icon from a file on startup. (Yasuhiro Matsumoto)
|
|
|
d6ba96 |
Files: src/gui_w32.c, src/os_mswin.c, src/os_win32.c,
|
|
|
d6ba96 |
src/proto/os_mswin.pro
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.458/src/gui_w32.c 2014-09-19 16:13:48.358419065 +0200
|
|
|
d6ba96 |
--- src/gui_w32.c 2014-09-23 21:53:17.382849313 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 1662,1667 ****
|
|
|
d6ba96 |
--- 1662,1675 ----
|
|
|
d6ba96 |
if (s_textArea == NULL)
|
|
|
d6ba96 |
return FAIL;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ /* Try loading an icon from $RUNTIMEPATH/bitmaps/vim.ico. */
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ HANDLE hIcon = NULL;
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
+ if (mch_icon_load(&hIcon) == OK && hIcon != NULL)
|
|
|
d6ba96 |
+ SendMessage(s_hwnd, WM_SETICON, ICON_SMALL, hIcon);
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
#ifdef FEAT_MENU
|
|
|
d6ba96 |
s_menuBar = CreateMenu();
|
|
|
d6ba96 |
#endif
|
|
|
d6ba96 |
*** ../vim-7.4.458/src/os_mswin.c 2014-09-09 12:25:27.768501863 +0200
|
|
|
d6ba96 |
--- src/os_mswin.c 2014-09-23 21:52:50.582849254 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 928,933 ****
|
|
|
d6ba96 |
--- 928,960 ----
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ /*
|
|
|
d6ba96 |
+ * Passed to do_in_runtimepath() to load a vim.ico file.
|
|
|
d6ba96 |
+ */
|
|
|
d6ba96 |
+ static void
|
|
|
d6ba96 |
+ mch_icon_load_cb(char_u *fname, void *cookie)
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ HANDLE *h = (HANDLE *)cookie;
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
+ *h = LoadImage(NULL,
|
|
|
d6ba96 |
+ fname,
|
|
|
d6ba96 |
+ IMAGE_ICON,
|
|
|
d6ba96 |
+ 64,
|
|
|
d6ba96 |
+ 64,
|
|
|
d6ba96 |
+ LR_LOADFROMFILE | LR_LOADMAP3DCOLORS);
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
+ /*
|
|
|
d6ba96 |
+ * Try loading an icon file from 'runtimepath'.
|
|
|
d6ba96 |
+ */
|
|
|
d6ba96 |
+ int
|
|
|
d6ba96 |
+ mch_icon_load(iconp)
|
|
|
d6ba96 |
+ HANDLE *iconp;
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ return do_in_runtimepath((char_u *)"bitmaps/vim.ico",
|
|
|
d6ba96 |
+ FALSE, mch_icon_load_cb, iconp);
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
int
|
|
|
d6ba96 |
mch_libcall(
|
|
|
d6ba96 |
char_u *libname,
|
|
|
d6ba96 |
*** ../vim-7.4.458/src/os_win32.c 2014-09-09 12:25:27.764501863 +0200
|
|
|
d6ba96 |
--- src/os_win32.c 2014-09-23 21:47:03.318848496 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 2446,2452 ****
|
|
|
d6ba96 |
return;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/* Extract the first icon contained in the Vim executable. */
|
|
|
d6ba96 |
! g_hVimIcon = ExtractIcon(NULL, exe_name, 0);
|
|
|
d6ba96 |
if (g_hVimIcon != NULL)
|
|
|
d6ba96 |
g_fCanChangeIcon = TRUE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
--- 2446,2453 ----
|
|
|
d6ba96 |
return;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/* Extract the first icon contained in the Vim executable. */
|
|
|
d6ba96 |
! if (mch_icon_load((HANDLE *)&g_hVimIcon) == FAIL || g_hVimIcon == NULL)
|
|
|
d6ba96 |
! g_hVimIcon = ExtractIcon(NULL, exe_name, 0);
|
|
|
d6ba96 |
if (g_hVimIcon != NULL)
|
|
|
d6ba96 |
g_fCanChangeIcon = TRUE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
*** ../vim-7.4.458/src/proto/os_mswin.pro 2013-08-10 13:37:39.000000000 +0200
|
|
|
d6ba96 |
--- src/proto/os_mswin.pro 2014-09-23 21:49:29.746848816 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 21,26 ****
|
|
|
d6ba96 |
--- 21,27 ----
|
|
|
d6ba96 |
int mch_chdir __ARGS((char *path));
|
|
|
d6ba96 |
int can_end_termcap_mode __ARGS((int give_msg));
|
|
|
d6ba96 |
int mch_screenmode __ARGS((char_u *arg));
|
|
|
d6ba96 |
+ int mch_icon_load __ARGS((HANDLE *iconp));
|
|
|
d6ba96 |
int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result));
|
|
|
d6ba96 |
void DumpPutS __ARGS((const char *psz));
|
|
|
d6ba96 |
int mch_get_winpos __ARGS((int *x, int *y));
|
|
|
d6ba96 |
*** ../vim-7.4.458/src/version.c 2014-09-23 18:37:52.426823701 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-09-23 21:36:07.806847064 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 743,744 ****
|
|
|
d6ba96 |
--- 743,746 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 459,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
If Microsoft would build a car...
|
|
|
d6ba96 |
... You'd have to press the "Start" button to turn the engine off.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|