--- a/src/toolbar.c	Wed Feb 24 01:58:04 2010 -0600
+++ b/src/toolbar.c	Wed Feb 24 19:04:27 2010 -0600
@@ -1,7 +1,7 @@
 /* Generic toolbar implementation.
    Copyright (C) 1995 Board of Trustees, University of Illinois.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1995, 1996, 2003, 2004 Ben Wing.
+   Copyright (C) 1995, 1996, 2003, 2004, 2010 Ben Wing.
    Copyright (C) 1996 Chuck Thompson.
 
 This file is part of XEmacs.
@@ -777,15 +777,9 @@
       if (frame_size_changed)
 	{
 	  int width, height;
-	  if (!window_system_pixelated_geometry (wrap_frame (f)))
-	    pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
-				&width, &height);
-	  else
-	    width = FRAME_PIXWIDTH (f), height = FRAME_PIXHEIGHT (f);
-	  if (!HAS_FRAMEMETH_P (f, set_frame_size))
-	    change_frame_size (f, height, width, 0);
-	  else
-	    FRAMEMETH (f, set_frame_size, (f, width, height));
+	  pixel_to_frame_unit_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
+				   &width, &height);
+	  internal_set_frame_size (f, width, height, 0);
 	  MARK_FRAME_LAYOUT_CHANGED (f);
 	}