diff src/toolbar-msw.c @ 5125:b5df3737028a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 01:58:04 -0600
parents 16112448d484
children d372b17f63ce 8b2f75cecb89
line wrap: on
line diff
--- a/src/toolbar-msw.c	Wed Jan 20 07:05:57 2010 -0600
+++ b/src/toolbar-msw.c	Wed Feb 24 01:58:04 2010 -0600
@@ -294,7 +294,7 @@
 			  if (! (bitmap = mswindows_create_resized_bitmap 
 				 (p, f, bmwidth, bmheight)))
 			    {
-			      xfree (button_tbl, TBBUTTON *);
+			      xfree (button_tbl);
 			      if (ilist) ImageList_Destroy (ilist);
 			      gui_error ("Couldn't resize pixmap", instance);
 			    }
@@ -317,7 +317,7 @@
 					 ? ILC_MASK  : 0) | ILC_COLOR24, 
 					nbuttons, nbuttons * 2 )))
 			{
-			  xfree (button_tbl, TBBUTTON *);
+			  xfree (button_tbl);
 			  gui_error ("Couldn't create image list", instance);
 			}
 
@@ -332,7 +332,7 @@
 			    mask ? mask 
 			    : IMAGE_INSTANCE_MSWINDOWS_MASK (p))) < 0)
 			{
-			  xfree (button_tbl, TBBUTTON *);
+			  xfree (button_tbl);
 			  if (ilist)
 			    ImageList_Destroy (ilist);
 			  gui_error 
@@ -394,7 +394,7 @@
 			      NULL, 
 			      NULL))==NULL)
 	{
-	  xfree (button_tbl, TBBUTTON *);
+	  xfree (button_tbl);
 	  ImageList_Destroy (ilist);
 	  gui_error ("couldn't create toolbar", Qunbound);
 	}
@@ -468,7 +468,7 @@
       mswindows_move_toolbar (f, pos);
 
       if (button_tbl)
-	xfree (button_tbl, TBBUTTON *);
+	xfree (button_tbl);
 
       SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1);
     }