To: vim-dev@vim.org
Subject: Patch 5.6.003
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.6.003
Problem:    GTK GUI: Loading a user defined toolbar bitmap gives a warning
	    about the colormap.  Probably because the window has not been
	    opened yet.
Solution:   Use gdk_pixmap_colormap_create_from_xpm() to convert the xpm file.
	    (Keith Radebaugh)
Files:	    src/gui_gtk.c


*** ../vim-5.6.2/src/gui_gtk.c	Sat Jan  8 21:11:02 2000
--- src/gui_gtk.c	Fri Jan 21 10:56:29 2000
***************
*** 532,539 ****
  	STRCAT(full_pathname, name);
  	STRCAT(full_pathname, ".xpm");
  	if (mch_access((const char *)full_pathname, F_OK) == 0)
! 	    *pixmap = gdk_pixmap_create_from_xpm(
! 				    gui.mainwin->window,
  				    mask,
  				    &gui.mainwin->style->bg[GTK_STATE_NORMAL],
  				    (const char *)full_pathname);
--- 532,540 ----
  	STRCAT(full_pathname, name);
  	STRCAT(full_pathname, ".xpm");
  	if (mch_access((const char *)full_pathname, F_OK) == 0)
! 	    *pixmap = gdk_pixmap_colormap_create_from_xpm(
! 				    NULL,
! 				    gtk_widget_get_colormap(gui.mainwin),
  				    mask,
  				    &gui.mainwin->style->bg[GTK_STATE_NORMAL],
  				    (const char *)full_pathname);
*** ../vim-5.6.2/src/version.c	Fri Jan 21 11:08:55 2000
--- src/version.c	Fri Jan 21 11:08:19 2000
***************
*** 420,421 ****
--- 420,423 ----
  {   /* Add new patch number below this line */
+ /**/
+     3,
  /**/

-- 
       His head smashed in,  and his heart cut out,
       And his liver removed, and his bowels unplugged,
       And his nostrils raped, and his bottom burned off,
       And his penis split ... and his ...
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

--/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\--
  \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /