The source code

/** + + + + The source code + + + + +
/*!
+ * Ext JS Library 3.2.1
+ * Copyright(c) 2006-2010 Ext JS, Inc.
+ * licensing@extjs.com
+ * http://www.extjs.com/license
+ */
+/**
  * @class Ext.Panel
  * @extends Ext.Container
  * Panel is a container that has specific functionality and structural components that make
@@ -14,7 +21,7 @@
  * of being configured with a {@link Ext.Container#layout layout}, and containing child Components.
  * When either specifying child {@link Ext.Component#items items} of a Panel, or dynamically {@link Ext.Container#add adding} Components
  * to a Panel, remember to consider how you wish the Panel to arrange those child elements, and whether
- * those child elements need to be sized using one of Ext's built-in {@link Ext.Container#layout layout} schemes. By
+ * those child elements need to be sized using one of Ext's built-in {@link Ext.Container#layout layout} schemes. By
  * default, Panels use the {@link Ext.layout.ContainerLayout ContainerLayout} scheme. This simply renders
  * child components, appending them one after the other inside the Container, and does not apply any sizing
  * at all.
@@ -33,7 +40,7 @@ Ext.Panel = Ext.extend(Ext.Container, {
     /**
      * The Panel's header {@link Ext.Element Element}. Read-only.
      * This Element is used to house the {@link #title} and {@link #tools}
-     * 
Note: see the Note for {@link Ext.Component#el el} also.

+     * 
Note: see the Note for {@link Ext.Component#el el} also.
      * @type Ext.Element
      * @property header
      */
@@ -46,7 +53,7 @@ Ext.Panel = Ext.extend(Ext.Container, {
      * If this Panel is intended to be used as the host of a Layout (See {@link #layout}
      * then the body Element must not be loaded or changed - it is under the control
      * of the Panel's Layout.
-     * 
Note: see the Note for {@link Ext.Component#el el} also.

+     * 
Note: see the Note for {@link Ext.Component#el el} also.
      * @type Ext.Element
      * @property body
      */
@@ -66,8 +73,8 @@ Ext.Panel = Ext.extend(Ext.Container, {
      * A {@link Ext.DomHelper DomHelper} element specification object may be specified for any
      * Panel Element.
      * By default, the Default element in the table below will be used for the html markup to
-     * create a child element with the commensurate Default class name (baseCls will be
-     * replaced by {@link #baseCls}):
+     * create a child element with the commensurate Default class name (baseCls will be
+     * replaced by {@link #baseCls}):
      *       * Panel      Default  Default             Custom      Additional       Additional
      * Element    element  class               element     class            style
@@ -103,51 +110,51 @@ new Ext.Panel({
     footerStyle:    'background-color:red' // see {@link #bodyStyle}
 });
      * 
-     * The example above also explicitly creates a {@link #footer} with custom markup and
+     * 
The example above also explicitly creates a {@link #footer} with custom markup and
      * styling applied.
      */
     /**
      * @cfg {Object} headerCfg
      * A {@link Ext.DomHelper DomHelper} element specification object specifying the element structure
-     * of this Panel's {@link #header} Element.  See {@link #bodyCfg} also.
+     * of this Panel's {@link #header} Element.  See {@link #bodyCfg} also.
      */
     /**
      * @cfg {Object} bwrapCfg
      * A {@link Ext.DomHelper DomHelper} element specification object specifying the element structure
-     * of this Panel's {@link #bwrap} Element.  See {@link #bodyCfg} also.
+     * of this Panel's {@link #bwrap} Element.  See {@link #bodyCfg} also.
      */
     /**
      * @cfg {Object} tbarCfg
      * A {@link Ext.DomHelper DomHelper} element specification object specifying the element structure
-     * of this Panel's {@link #tbar} Element.  See {@link #bodyCfg} also.
+     * of this Panel's {@link #tbar} Element.  See {@link #bodyCfg} also.
      */
     /**
      * @cfg {Object} bbarCfg
      * A {@link Ext.DomHelper DomHelper} element specification object specifying the element structure
-     * of this Panel's {@link #bbar} Element.  See {@link #bodyCfg} also.
+     * of this Panel's {@link #bbar} Element.  See {@link #bodyCfg} also.
      */
     /**
      * @cfg {Object} footerCfg
      * A {@link Ext.DomHelper DomHelper} element specification object specifying the element structure
-     * of this Panel's {@link #footer} Element.  See {@link #bodyCfg} also.
+     * of this Panel's {@link #footer} Element.  See {@link #bodyCfg} also.
      */
     /**
      * @cfg {Boolean} closable
      * Panels themselves do not directly support being closed, but some Panel subclasses do (like
-     * {@link Ext.Window}) or a Panel Class within an {@link Ext.TabPanel}.  Specify true
-     * to enable closing in such situations. Defaults to false.
+     * {@link Ext.Window}) or a Panel Class within an {@link Ext.TabPanel}.  Specify true
+     * to enable closing in such situations. Defaults to false.
      */
     /**
      * The Panel's footer {@link Ext.Element Element}. Read-only.
-     * This Element is used to house the Panel's {@link #buttons} or {@link #fbar}.
-     * 
Note: see the Note for {@link Ext.Component#el el} also.

+     * This Element is used to house the Panel's {@link #buttons} or {@link #fbar}.
+     * 
Note: see the Note for {@link Ext.Component#el el} also.
      * @type Ext.Element
      * @property footer
      */
     /**
      * @cfg {Mixed} applyTo
      * The id of the node, a DOM node or an existing Element corresponding to a DIV that is already present in
-     * the document that specifies some panel-specific structural markup.  When applyTo is used,
+     * the document that specifies some panel-specific structural markup.  When applyTo is used,
      * constituent parts of the panel can be specified by CSS class name within the main element, and the panel
      * will automatically create those components from that markup. Any required components not specified in the
      * markup will be autogenerated if necessary.
@@ -178,7 +185,7 @@ new Ext.Panel({
      * The bottom toolbar of the panel. This can be a {@link Ext.Toolbar} object, a toolbar config, or an array of
      * buttons/button configs to be added to the toolbar.  Note that this is not available as a property after render.
      * To access the bottom toolbar after render, use {@link #getBottomToolbar}.
-     * Note: Although a Toolbar may contain Field components, these will not be updated by a load
+     * 
Note: Although a Toolbar may contain Field components, these will not be updated by a load
      * of an ancestor FormPanel. A Panel's toolbars are not part of the standard Container->Component hierarchy, and
      * so are not scanned to collect form items. However, the values will be submitted because form
      * submission parameters are collected from the DOM tree.

@@ -187,8 +194,8 @@ new Ext.Panel({
      * A {@link Ext.Toolbar Toolbar} object, a Toolbar config, or an array of
      * {@link Ext.Button Button}s/{@link Ext.Button Button} configs, describing a {@link Ext.Toolbar Toolbar} to be rendered into this Panel's footer element.
      * After render, the fbar property will be an {@link Ext.Toolbar Toolbar} instance.
-     * If {@link #buttons} are specified, they will supersede the fbar configuration property.
-     * The Panel's {@link #buttonAlign} configuration affects the layout of these items, for example:
+     * If {@link #buttons} are specified, they will supersede the fbar configuration property.
+     * The Panel's {@link #buttonAlign} configuration affects the layout of these items, for example:
      * 
 var w = new Ext.Window({
     height: 250,
@@ -200,7 +207,7 @@ var w = new Ext.Window({
             text: 'bbar Right'
         }]
     }),
-    {@link #buttonAlign}: 'left', // anything but 'center' or 'right' and you can use "-", and "->"
+    {@link #buttonAlign}: 'left', // anything but 'center' or 'right' and you can use '-', and '->'
                                   // to control the alignment of fbar items
     fbar: [{
         text: 'fbar Left'
@@ -209,40 +216,40 @@ var w = new Ext.Window({
     }]
 }).show();
      * 
-     * Note: Although a Toolbar may contain Field components, these will not be updated by a load
+     * 
Note: Although a Toolbar may contain Field components, these will not be updated by a load
      * of an ancestor FormPanel. A Panel's toolbars are not part of the standard Container->Component hierarchy, and
      * so are not scanned to collect form items. However, the values will be submitted because form
      * submission parameters are collected from the DOM tree.

      */
     /**
      * @cfg {Boolean} header
-     * true to create the Panel's header element explicitly, false to skip creating
-     * it.  If a {@link #title} is set the header will be created automatically, otherwise it will not.
-     * If a {@link #title} is set but header is explicitly set to false, the header
+     * true to create the Panel's header element explicitly, false to skip creating
+     * it.  If a {@link #title} is set the header will be created automatically, otherwise it will not.
+     * If a {@link #title} is set but header is explicitly set to false, the header
      * will not be rendered.
      */
     /**
      * @cfg {Boolean} footer
-     * true to create the footer element explicitly, false to skip creating it. The footer
-     * will be created automatically if {@link #buttons} or a {@link #fbar} have
-     * been configured.  See {@link #bodyCfg} for an example.
+     * true to create the footer element explicitly, false to skip creating it. The footer
+     * will be created automatically if {@link #buttons} or a {@link #fbar} have
+     * been configured.  See {@link #bodyCfg} for an example.
      */
     /**
      * @cfg {String} title
      * The title text to be used as innerHTML (html tags are accepted) to display in the panel
-     * {@link #header} (defaults to ''). When a title is specified the
-     * {@link #header} element will automatically be created and displayed unless
-     * {@link #header} is explicitly set to false.  If you do not want to specify a
-     * title at config time, but you may want one later, you must either specify a non-empty
-     * title (a blank space ' ' will do) or header:true so that the container
+     * {@link #header} (defaults to ''). When a title is specified the
+     * {@link #header} element will automatically be created and displayed unless
+     * {@link #header} is explicitly set to false.  If you do not want to specify a
+     * title at config time, but you may want one later, you must either specify a non-empty
+     * title (a blank space ' ' will do) or header:true so that the container
      * element will get created.
      */
     /**
      * @cfg {Array} buttons
-     * buttons will be used as {@link Ext.Container#items items} for the toolbar in
-     * the footer ({@link #fbar}). Typically the value of this configuration property will be
+     * buttons will be used as {@link Ext.Container#items items} for the toolbar in
+     * the footer ({@link #fbar}). Typically the value of this configuration property will be
      * an array of {@link Ext.Button}s or {@link Ext.Button} configuration objects.
-     * If an item is configured with minWidth or the Panel is configured with minButtonWidth,
+     * If an item is configured with minWidth or the Panel is configured with minButtonWidth,
      * that width will be applied to the item.
      */
     /**
@@ -255,7 +262,7 @@ var w = new Ext.Window({
      */
     /**
      * @cfg {Boolean} frame
-     * false by default to render with plain 1px square borders. true to render with
+     * false by default to render with plain 1px square borders. true to render with
      * 9 elements, complete with custom rounded corners (also see {@link Ext.Element#boxWrap}).
      * The template generated for each condition is depicted below:

      *
@@ -327,40 +334,40 @@ var w = new Ext.Window({
     /**
      * @cfg {Array} tools
      * An array of tool button configs to be added to the header tool area. When rendered, each tool is
-     * stored as an {@link Ext.Element Element} referenced by a public property called tools.<tool-type>
+     * stored as an {@link Ext.Element Element} referenced by a public property called tools.<tool-type>
      * Each tool config may contain the following properties:
      * 
      * id : StringRequired. The type
-     * of tool to create. By default, this assigns a CSS class of the form x-tool-<tool-type> to the
+     * of tool to create. By default, this assigns a CSS class of the form x-tool-<tool-type> to the
      * resulting tool Element. Ext provides CSS rules, and an icon sprite containing images for the tool types listed below.
      * The developer may implement custom tools by supplying alternate CSS rules and background images:
      * 
-     *  
 toggle (Created by default when {@link #collapsible} is true)
-     *  
 close
-     *  
 minimize
-     *  
 maximize
-     *  
 restore
-     *  
 gear
-     *  
 pin
-     *  
 unpin
-     *  
 right
-     *  
 left
-     *  
 up
-     *  
 down
-     *  
 refresh
-     *  
 minus
-     *  
 plus
-     *  
 help
-     *  
 search
-     *  
 save
-     *  
 print
+     *  
 toggle (Created by default when {@link #collapsible} is true)
+     *  
 close
+     *  
 minimize
+     *  
 maximize
+     *  
 restore
+     *  
 gear
+     *  
 pin
+     *  
 unpin
+     *  
 right
+     *  
 left
+     *  
 up
+     *  
 down
+     *  
 refresh
+     *  
 minus
+     *  
 plus
+     *  
 help
+     *  
 search
+     *  
 save
+     *  
 print
      * 
      * handler : FunctionRequired. The function to
      * call when clicked. Arguments passed are:
      * event : Ext.EventObjectThe click event.
      * toolEl : Ext.ElementThe tool Element.
      * panel : Ext.PanelThe host Panel
-     * tc : Ext.PanelThe tool configuration object
+     * tc : ObjectThe tool configuration object
      * 
      * stopEvent : BooleanDefaults to true. Specify as false to allow click event to propagate.
      * scope : ObjectThe scope in which to call the handler.
@@ -391,7 +398,7 @@ tools:[{
     }
 }]
 
-     * For the custom id of 'help' define two relevant css classes with a link to
+     * 
For the custom id of 'help' define two relevant css classes with a link to
      * a 15x15 image:
      * 
 .x-tool-help {background-image: url(images/help.png);}
@@ -426,7 +433,7 @@ var win = new Ext.Window({
     height:300,
     closeAction:'hide'
 });
-     * Note that the CSS class "x-tool-pdf" should have an associated style rule which provides an
+     * 
Note that the CSS class 'x-tool-pdf' should have an associated style rule which provides an
      * appropriate background image, something like:
     
     a.x-tool-pdf {background-image: url(../shared/extjs/images/pdf.gif)!important;}
@@ -434,96 +441,63 @@ var win = new Ext.Window({
      */
     /**
      * @cfg {Boolean} hideCollapseTool
-     * true to hide the expand/collapse toggle button when {@link #collapsible} == true,
-     * false to display it (defaults to false).
+     * true to hide the expand/collapse toggle button when {@link #collapsible} == true,
+     * false to display it (defaults to false).
      */
     /**
      * @cfg {Boolean} titleCollapse
-     * true to allow expanding and collapsing the panel (when {@link #collapsible} = true)
-     * by clicking anywhere in the header bar, false) to allow it only by clicking to tool button
-     * (defaults to false)). If this panel is a child item of a border layout also see the
+     * true to allow expanding and collapsing the panel (when {@link #collapsible} = true)
+     * by clicking anywhere in the header bar, false) to allow it only by clicking to tool button
+     * (defaults to false)). If this panel is a child item of a border layout also see the
      * {@link Ext.layout.BorderLayout.Region BorderLayout.Region}
-     * {@link Ext.layout.BorderLayout.Region#floatable floatable} config option.
-     */
-    /**
-     * @cfg {Boolean} autoScroll
-     * true to use overflow:'auto' on the panel's body element and show scroll bars automatically when
-     * necessary, false to clip any overflowing content (defaults to false).
+     * {@link Ext.layout.BorderLayout.Region#floatable floatable} config option.
      */
+
     /**
      * @cfg {Mixed} floating
      * This property is used to configure the underlying {@link Ext.Layer}. Acceptable values for this
      * configuration property are:

-     * false : Default.Display the panel inline where it is
+     * 
false : Default.Display the panel inline where it is
      * rendered.
-     * true : Float the panel (absolute position it with automatic
+     * 
true : Float the panel (absolute position it with automatic
      * shimming and shadow).
      * Setting floating to true will create an Ext.Layer for this panel and display the
      * panel at negative offsets so that it is hidden.
      * Since the panel will be absolute positioned, the position must be set explicitly
-     * after render (e.g., myPanel.setPosition(100,100);).
+     * after render (e.g., myPanel.setPosition(100,100);).
      * Note: when floating a panel you should always assign a fixed width,
      * otherwise it will be auto width and will expand to fill to the right edge of the viewport.
      * 
-     * {@link Ext.Layer object} : The specified object will be used
+     * 
{@link Ext.Layer object} : The specified object will be used
      * as the configuration object for the {@link Ext.Layer} that will be created.
      * 
      */
     /**
      * @cfg {Boolean/String} shadow
-     * true (or a valid Ext.Shadow {@link Ext.Shadow#mode} value) to display a shadow behind the
-     * panel, false to display no shadow (defaults to 'sides').  Note that this option
-     * only applies when {@link #floating} = true.
+     * true (or a valid Ext.Shadow {@link Ext.Shadow#mode} value) to display a shadow behind the
+     * panel, false to display no shadow (defaults to 'sides').  Note that this option
+     * only applies when {@link #floating} = true.
      */
     /**
      * @cfg {Number} shadowOffset
-     * The number of pixels to offset the shadow if displayed (defaults to 4). Note that this
-     * option only applies when {@link #floating} = true.
+     * The number of pixels to offset the shadow if displayed (defaults to 4). Note that this
+     * option only applies when {@link #floating} = true.
      */
     /**
      * @cfg {Boolean} shim
-     * false to disable the iframe shim in browsers which need one (defaults to true).
-     * Note that this option only applies when {@link #floating} = true.
-     */
-    /**
-     * @cfg {String/Object} html
-     * An HTML fragment, or a {@link Ext.DomHelper DomHelper} specification to use as the panel's body
-     * content (defaults to ''). The HTML content is added by the Panel's {@link #afterRender} method,
-     * and so the document will not contain this HTML at the time the {@link #render} event is fired.
-     * This content is inserted into the body before any configured {@link #contentEl} is appended.
-     */
-    /**
-     * @cfg {String} contentEl
-     * Specify the id of an existing HTML node to use as the panel's body content
-     * (defaults to '').

-     * Description : 
-     * This config option is used to take an existing HTML element and place it in the body
-     * of a new panel (it simply moves the specified DOM element into the body element of the Panel
-     * when the Panel is rendered to use as the content (it is not going to be the
-     * actual panel itself).
-     * 
-     * Notes : 
-     * The specified HTML Element is appended to the Panel's {@link #body} Element by the
-     * Panel's {@link #afterRender} method after any configured {@link #html HTML} has
-     * been inserted, and so the document will not contain this HTML at the time the
-     * {@link #render} event is fired.
-     * The specified HTML element used will not participate in any layout scheme that the
-     * Panel may use. It's just HTML. Layouts operate on child items.
-     * Add either the x-hidden or the x-hide-display CSS class to
-     * prevent a brief flicker of the content before it is rendered to the panel.
-     * 
-     * 
+     * false to disable the iframe shim in browsers which need one (defaults to true).
+     * Note that this option only applies when {@link #floating} = true.
      */
     /**
      * @cfg {Object/Array} keys
      * A {@link Ext.KeyMap} config object (in the format expected by {@link Ext.KeyMap#addBinding}
-     * used to assign custom key handling to this panel (defaults to null).
+     * used to assign custom key handling to this panel (defaults to null).
      */
     /**
      * @cfg {Boolean/Object} draggable
-     * true to enable dragging of this Panel (defaults to false).
+     * true to enable dragging of this Panel (defaults to false).
      * For custom drag/drop implementations, an Ext.Panel.DD config could also be passed
-     * in this config instead of true. Ext.Panel.DD is an internal, undocumented class which
+     * in this config instead of true. Ext.Panel.DD is an internal, undocumented class which
      * moves a proxy Element around in place of the Panel's element, but provides no other behaviour
      * during dragging or on drop. It is a subclass of {@link Ext.dd.DragSource}, so behaviour may be
      * added by implementing the interface methods of {@link Ext.dd.DragDrop} e.g.:
@@ -565,15 +539,9 @@ new Ext.Panel({
 }).show();
 
      */
-    /**
-     * @cfg {String} tabTip
-     * A string to be used as innerHTML (html tags are accepted) to show in a tooltip when mousing over
-     * the tab of a Ext.Panel which is an item of a {@link Ext.TabPanel}. {@link Ext.QuickTips}.init()
-     * must be called in order for the tips to render.
-     */
     /**
      * @cfg {Boolean} disabled
-     * Render this panel disabled (default is false). An important note when using the disabled
+     * Render this panel disabled (default is false). An important note when using the disabled
      * config on panels is that IE will often fail to initialize the disabled mask element correectly if
      * the panel's layout has not yet completed by the time the Panel is disabled during the render process.
      * If you experience this issue, you may need to instead use the {@link #afterlayout} event to initialize
@@ -594,10 +562,10 @@ new Ext.Panel({
      */
     /**
      * @cfg {Boolean} autoHeight
-     * true to use height:'auto', false to use fixed height (defaults to false).
-     * Note: Setting autoHeight:true means that the browser will manage the panel's height
+     * true to use height:'auto', false to use fixed height (defaults to false).
+     * Note: Setting autoHeight: true means that the browser will manage the panel's height
      * based on its contents, and that Ext will not manage it at all. If the panel is within a layout that
-     * manages dimensions (fit, border, etc.) then setting autoHeight:true
+     * manages dimensions (fit, border, etc.) then setting autoHeight: true
      * can cause issues with scrolling and will not generally work as expected since the panel will take
      * on the height of its contents rather than the height required by the Ext layout.
      */
@@ -605,64 +573,64 @@ new Ext.Panel({
 
     /**
      * @cfg {String} baseCls
-     * The base CSS class to apply to this panel's element (defaults to 'x-panel').
-     * Another option available by default is to specify 'x-plain' which strips all styling
+     * The base CSS class to apply to this panel's element (defaults to 'x-panel').
+     * 
Another option available by default is to specify 'x-plain' which strips all styling
      * except for required attributes for Ext layouts to function (e.g. overflow:hidden).
-     * See {@link #unstyled} also.
+     * See {@link #unstyled} also.
      */
     baseCls : 'x-panel',
     /**
      * @cfg {String} collapsedCls
      * A CSS class to add to the panel's element after it has been collapsed (defaults to
-     * 'x-panel-collapsed').
+     * 'x-panel-collapsed').
      */
     collapsedCls : 'x-panel-collapsed',
     /**
      * @cfg {Boolean} maskDisabled
-     * true to mask the panel when it is {@link #disabled}, false to not mask it (defaults
-     * to true).  Either way, the panel will always tell its contained elements to disable themselves
+     * true to mask the panel when it is {@link #disabled}, false to not mask it (defaults
+     * to true).  Either way, the panel will always tell its contained elements to disable themselves
      * when it is disabled, but masking the panel can provide an additional visual cue that the panel is
      * disabled.
      */
     maskDisabled : true,
     /**
      * @cfg {Boolean} animCollapse
-     * true to animate the transition when the panel is collapsed, false to skip the
-     * animation (defaults to true if the {@link Ext.Fx} class is available, otherwise false).
+     * true to animate the transition when the panel is collapsed, false to skip the
+     * animation (defaults to true if the {@link Ext.Fx} class is available, otherwise false).
      */
     animCollapse : Ext.enableFx,
     /**
      * @cfg {Boolean} headerAsText
-     * true to display the panel {@link #title} in the {@link #header},
-     * false to hide it (defaults to true).
+     * true to display the panel {@link #title} in the {@link #header},
+     * false to hide it (defaults to true).
      */
     headerAsText : true,
     /**
      * @cfg {String} buttonAlign
-     * The alignment of any {@link #buttons} added to this panel.  Valid values are 'right',
-     * 'left' and 'center' (defaults to 'right').
+     * The alignment of any {@link #buttons} added to this panel.  Valid values are 'right',
+     * 'left' and 'center' (defaults to 'right').
      */
     buttonAlign : 'right',
     /**
      * @cfg {Boolean} collapsed
-     * true to render the panel collapsed, false to render it expanded (defaults to
-     * false).
+     * true to render the panel collapsed, false to render it expanded (defaults to
+     * false).
      */
     collapsed : false,
     /**
      * @cfg {Boolean} collapseFirst
-     * true to make sure the collapse/expand toggle button always renders first (to the left of)
-     * any other tools in the panel's title bar, false to render it last (defaults to true).
+     * true to make sure the collapse/expand toggle button always renders first (to the left of)
+     * any other tools in the panel's title bar, false to render it last (defaults to true).
      */
     collapseFirst : true,
     /**
      * @cfg {Number} minButtonWidth
-     * Minimum width in pixels of all {@link #buttons} in this panel (defaults to 75)
+     * Minimum width in pixels of all {@link #buttons} in this panel (defaults to 75)
      */
     minButtonWidth : 75,
     /**
      * @cfg {Boolean} unstyled
-     * Overrides the {@link #baseCls} setting to {@link #baseCls} = 'x-plain' which renders
+     * Overrides the {@link #baseCls} setting to {@link #baseCls} = 'x-plain' which renders
      * the panel unstyled except for required attributes for Ext layouts to function (e.g. overflow:hidden).
      */
     /**
@@ -672,24 +640,38 @@ new Ext.Panel({
      * make sure a structural element is rendered even if not specified at config time (for example, you may want
      * to add a button or toolbar dynamically after the panel has been rendered).  Adding those elements to this
      * list will allocate the required placeholders in the panel when it is rendered.  Valid values are
-     * header
-     * tbar (top bar)
-     * body
-     * bbar (bottom bar)
-     * footer
+     * header
+     * tbar (top bar)
+     * body
+     * bbar (bottom bar)
+     * footer
      * 
-     * Defaults to 'body'.
+     * Defaults to 'body'.
      */
     elements : 'body',
     /**
      * @cfg {Boolean} preventBodyReset
-     * Defaults to false.  When set to true, an extra css class 'x-panel-normal'
+     * Defaults to false.  When set to true, an extra css class 'x-panel-normal'
      * will be added to the panel's element, effectively applying css styles suggested by the W3C
      * (see http://www.w3.org/TR/CSS21/sample.html) to the Panel's body element (not the header,
      * footer, etc.).
      */
     preventBodyReset : false,
 
+    /**
+     * @cfg {Number/String} padding
+     * A shortcut for setting a padding style on the body element. The value can either be
+     * a number to be applied to all sides, or a normal css string describing padding.
+     * Defaults to undefined.
+     *
+     */
+    padding: undefined,
+
+    /** @cfg {String} resizeEvent
+     * The event to listen to for resizing in layouts. Defaults to 'bodyresize'.
+     */
+    resizeEvent: 'bodyresize',
+
     // protected - these could be used to customize the behavior of the window,
     // but changing them would not be useful without further mofifications and
     // could lead to unexpected or undesirable results.
@@ -718,8 +700,8 @@ new Ext.Panel({
              * @event bodyresize
              * Fires after the Panel has been resized.
              * @param {Ext.Panel} p the Panel which has been resized.
-             * @param {Number} width The Panel's new width.
-             * @param {Number} height The Panel's new height.
+             * @param {Number} width The Panel body's new width.
+             * @param {Number} height The Panel body's new height.
              */
             'bodyresize',
             /**
@@ -803,62 +785,87 @@ new Ext.Panel({
             this.baseCls = 'x-plain';
         }
 
+
+        this.toolbars = [];
         // shortcuts
         if(this.tbar){
             this.elements += ',tbar';
-            if(Ext.isObject(this.tbar)){
-                this.topToolbar = this.tbar;
-            }
-            delete this.tbar;
+            this.topToolbar = this.createToolbar(this.tbar);
+            this.tbar = null;
+
         }
         if(this.bbar){
             this.elements += ',bbar';
-            if(Ext.isObject(this.bbar)){
-                this.bottomToolbar = this.bbar;
-            }
-            delete this.bbar;
+            this.bottomToolbar = this.createToolbar(this.bbar);
+            this.bbar = null;
         }
 
         if(this.header === true){
             this.elements += ',header';
-            delete this.header;
+            this.header = null;
         }else if(this.headerCfg || (this.title && this.header !== false)){
             this.elements += ',header';
         }
 
         if(this.footerCfg || this.footer === true){
             this.elements += ',footer';
-            delete this.footer;
+            this.footer = null;
         }
 
         if(this.buttons){
-            this.elements += ',footer';
-            var btns = this.buttons;
-            /**
-             * This Panel's Array of buttons as created from the {@link #buttons}
-             * config property. Read only.
-             * @type Array
-             * @property buttons
-             */
-            this.buttons = [];
-            for(var i = 0, len = btns.length; i < len; i++) {
-                if(btns[i].render){ // button instance
-                    this.buttons.push(btns[i]);
-                }else if(btns[i].xtype){
-                    this.buttons.push(Ext.create(btns[i], 'button'));
-                }else{
-                    this.addButton(btns[i]);
-                }
-            }
+            this.fbar = this.buttons;
+            this.buttons = null;
         }
         if(this.fbar){
-            this.elements += ',footer';
+            this.createFbar(this.fbar);
         }
         if(this.autoLoad){
             this.on('render', this.doAutoLoad, this, {delay:10});
         }
     },
 
+    // private
+    createFbar : function(fbar){
+        var min = this.minButtonWidth;
+        this.elements += ',footer';
+        this.fbar = this.createToolbar(fbar, {
+            buttonAlign: this.buttonAlign,
+            toolbarCls: 'x-panel-fbar',
+            enableOverflow: false,
+            defaults: function(c){
+                return {
+                    minWidth: c.minWidth || min
+                };
+            }
+        });
+        // @compat addButton and buttons could possibly be removed
+        // @target 4.0
+        /**
+         * This Panel's Array of buttons as created from the {@link #buttons}
+         * config property. Read only.
+         * @type Array
+         * @property buttons
+         */
+        this.fbar.items.each(function(c){
+            c.minWidth = c.minWidth || this.minButtonWidth;
+        }, this);
+        this.buttons = this.fbar.items.items;
+    },
+
+    // private
+    createToolbar: function(tb, options){
+        var result;
+        // Convert array to proper toolbar config
+        if(Ext.isArray(tb)){
+            tb = {
+                items: tb
+            };
+        }
+        result = tb.events ? Ext.apply(tb, options) : this.createComponent(Ext.apply({}, tb, options), 'toolbar');
+        this.toolbars.push(result);
+        return result;
+    },
+
     // private
     createElement : function(name, pnode){
         if(this[name]){
@@ -890,7 +897,25 @@ new Ext.Panel({
 
         var el = this.el,
             d = el.dom,
-            bw;
+            bw,
+            ts;
+
+
+        if(this.collapsible && !this.hideCollapseTool){
+            this.tools = this.tools ? this.tools.slice(0) : [];
+            this.tools[this.collapseFirst?'unshift':'push']({
+                id: 'toggle',
+                handler : this.toggleCollapse,
+                scope: this
+            });
+        }
+
+        if(this.tools){
+            ts = this.tools;
+            this.elements += (this.header !== false) ? ',header' : '';
+        }
+        this.tools = {};
+
         el.addClass(this.baseCls);
         if(d.firstChild){ // existing markup
             this.header = el.down('.'+this.headerCls);
@@ -937,6 +962,13 @@ new Ext.Panel({
             if(!this.footer){
                 this.bwrap.dom.lastChild.className += ' x-panel-nofooter';
             }
+            /*
+             * Store a reference to this element so:
+             * a) We aren't looking it up all the time
+             * b) The last element is reported incorrectly when using a loadmask
+             */
+            this.ft = Ext.get(this.bwrap.dom.lastChild);
+            this.mc = Ext.get(mc);
         }else{
             this.createElement('header', d);
             this.createElement('bwrap', d);
@@ -956,7 +988,7 @@ new Ext.Panel({
             }
         }
 
-        if(this.padding !== undefined) {
+        if(Ext.isDefined(this.padding)){
             this.body.setStyle('padding', this.body.addUnits(this.padding));
         }
 
@@ -1001,79 +1033,29 @@ new Ext.Panel({
             this.makeFloating(this.floating);
         }
 
-        if(this.collapsible){
-            this.tools = this.tools ? this.tools.slice(0) : [];
-            if(!this.hideCollapseTool){
-                this.tools[this.collapseFirst?'unshift':'push']({
-                    id: 'toggle',
-                    handler : this.toggleCollapse,
-                    scope: this
-                });
-            }
-            if(this.titleCollapse && this.header){
-                this.mon(this.header, 'click', this.toggleCollapse, this);
-                this.header.setStyle('cursor', 'pointer');
-            }
+        if(this.collapsible && this.titleCollapse && this.header){
+            this.mon(this.header, 'click', this.toggleCollapse, this);
+            this.header.setStyle('cursor', 'pointer');
         }
-        if(this.tools){
-            var ts = this.tools;
-            this.tools = {};
+        if(ts){
             this.addTool.apply(this, ts);
-        }else{
-            this.tools = {};
         }
 
-        if(this.buttons && this.buttons.length > 0){
-            this.fbar = new Ext.Toolbar({
-                items: this.buttons,
-                toolbarCls: 'x-panel-fbar'
-            });
-        }
-        this.toolbars = [];
+        // Render Toolbars.
         if(this.fbar){
-            this.fbar = Ext.create(this.fbar, 'toolbar');
-            this.fbar.enableOverflow = false;
-            if(this.fbar.items){
-                this.fbar.items.each(function(c){
-                    c.minWidth = c.minWidth || this.minButtonWidth;
-                }, this);
-            }
-            this.fbar.toolbarCls = 'x-panel-fbar';
-
-            var bct = this.footer.createChild({cls: 'x-panel-btns x-panel-btns-'+this.buttonAlign});
+            this.footer.addClass('x-panel-btns');
             this.fbar.ownerCt = this;
-            this.fbar.render(bct);
-            bct.createChild({cls:'x-clear'});
-            this.toolbars.push(this.fbar);
+            this.fbar.render(this.footer);
+            this.footer.createChild({cls:'x-clear'});
         }
-
         if(this.tbar && this.topToolbar){
-            if(Ext.isArray(this.topToolbar)){
-                this.topToolbar = new Ext.Toolbar(this.topToolbar);
-            }else if(!this.topToolbar.events){
-                this.topToolbar = Ext.create(this.topToolbar, 'toolbar');
-            }
             this.topToolbar.ownerCt = this;
             this.topToolbar.render(this.tbar);
-            this.toolbars.push(this.topToolbar);
         }
         if(this.bbar && this.bottomToolbar){
-            if(Ext.isArray(this.bottomToolbar)){
-                this.bottomToolbar = new Ext.Toolbar(this.bottomToolbar);
-            }else if(!this.bottomToolbar.events){
-                this.bottomToolbar = Ext.create(this.bottomToolbar, 'toolbar');
-            }
             this.bottomToolbar.ownerCt = this;
             this.bottomToolbar.render(this.bbar);
-            this.toolbars.push(this.bottomToolbar);
         }
-        Ext.each(this.toolbars, function(tb){
-            tb.on({
-                scope: this,
-                afterlayout: this.syncHeight,
-                remove: this.syncHeight
-            });
-        }, this);
     },
 
     /**
@@ -1089,14 +1071,17 @@ new Ext.Panel({
                 this.header.addClass('x-panel-icon');
                 this.header.replaceClass(old, this.iconCls);
             }else{
-                var hd = this.header.dom;
-                var img = hd.firstChild && String(hd.firstChild.tagName).toLowerCase() == 'img' ? hd.firstChild : null;
+                var hd = this.header,
+                    img = hd.child('img.x-panel-inline-icon');
                 if(img){
                     Ext.fly(img).replaceClass(old, this.iconCls);
                 }else{
-                    Ext.DomHelper.insertBefore(hd.firstChild, {
-                        tag:'img', src: Ext.BLANK_IMAGE_URL, cls:'x-panel-inline-icon '+this.iconCls
-                    });
+                    var hdspan = hd.child('span.' + this.headerTextCls);
+                    if (hdspan) {
+                        Ext.DomHelper.insertBefore(hdspan.dom, {
+                            tag:'img', src: Ext.BLANK_IMAGE_URL, cls:'x-panel-inline-icon '+this.iconCls
+                        });
+                    }
                  }
             }
         }
@@ -1106,18 +1091,16 @@ new Ext.Panel({
     // private
     makeFloating : function(cfg){
         this.floating = true;
-        this.el = new Ext.Layer(
-            Ext.isObject(cfg) ? cfg : {
-                shadow: this.shadow !== undefined ? this.shadow : 'sides',
-                shadowOffset: this.shadowOffset,
-                constrain:false,
-                shim: this.shim === false ? false : undefined
-            }, this.el
-        );
+        this.el = new Ext.Layer(Ext.apply({}, cfg, {
+            shadow: Ext.isDefined(this.shadow) ? this.shadow : 'sides',
+            shadowOffset: this.shadowOffset,
+            constrain:false,
+            shim: this.shim === false ? false : undefined
+        }), this.el);
     },
 
     /**
-     * Returns the {@link Ext.Toolbar toolbar} from the top ({@link #tbar}) section of the panel.
+     * Returns the {@link Ext.Toolbar toolbar} from the top ({@link #tbar}) section of the panel.
      * @return {Ext.Toolbar} The toolbar
      */
     getTopToolbar : function(){
@@ -1125,45 +1108,59 @@ new Ext.Panel({
     },
 
     /**
-     * Returns the {@link Ext.Toolbar toolbar} from the bottom ({@link #bbar}) section of the panel.
+     * Returns the {@link Ext.Toolbar toolbar} from the bottom ({@link #bbar}) section of the panel.
      * @return {Ext.Toolbar} The toolbar
      */
     getBottomToolbar : function(){
         return this.bottomToolbar;
     },
 
+    /**
+     * Returns the {@link Ext.Toolbar toolbar} from the footer ({@link #fbar}) section of the panel.
+     * @return {Ext.Toolbar} The toolbar
+     */
+    getFooterToolbar : function() {
+        return this.fbar;
+    },
+
     /**
      * Adds a button to this panel.  Note that this method must be called prior to rendering.  The preferred
      * approach is to add buttons via the {@link #buttons} config.
      * @param {String/Object} config A valid {@link Ext.Button} config.  A string will become the text for a default
      * button config, an object will be treated as a button config object.
      * @param {Function} handler The function to be called on button {@link Ext.Button#click}
-     * @param {Object} scope The scope to use for the button handler function
+     * @param {Object} scope The scope (this reference) in which the button handler function is executed. Defaults to the Button.
      * @return {Ext.Button} The button that was added
      */
     addButton : function(config, handler, scope){
-        var bc = {
-            handler: handler,
-            scope: scope,
-            minWidth: this.minButtonWidth,
-            hideParent:true
-        };
-        if(typeof config == "string"){
-            bc.text = config;
-        }else{
-            Ext.apply(bc, config);
+        if(!this.fbar){
+            this.createFbar([]);
         }
-        var btn = new Ext.Button(bc);
-        if(!this.buttons){
-            this.buttons = [];
+        if(handler){
+            if(Ext.isString(config)){
+                config = {text: config};
+            }
+            config = Ext.apply({
+                handler: handler,
+                scope: scope
+            }, config);
         }
-        this.buttons.push(btn);
-        return btn;
+        return this.fbar.add(config);
     },
 
     // private
     addTool : function(){
-        if(!this[this.toolTarget]) { // no where to render tools!
+        if(!this.rendered){
+            if(!this.tools){
+                this.tools = [];
+            }
+            Ext.each(arguments, function(arg){
+                this.tools.push(arg);
+            }, this);
+            return;
+        }
+         // nowhere to render tools!
+        if(!this[this.toolTarget]){
             return;
         }
         if(!this.toolTemplate){
@@ -1179,7 +1176,7 @@ new Ext.Panel({
             var tc = a[i];
             if(!this.tools[tc.id]){
                 var overCls = 'x-tool-'+tc.id+'-over';
-                var t = this.toolTemplate.insertFirst((tc.align !== 'left') ? this[this.toolTarget] : this[this.toolTarget].child('span'), tc, true);
+                var t = this.toolTemplate.insertFirst(this[this.toolTarget], tc, true);
                 this.tools[tc.id] = t;
                 t.enableDisplayMode('block');
                 this.mon(t, 'click',  this.createToolHandler(t, tc, overCls, this));
@@ -1203,35 +1200,33 @@ new Ext.Panel({
         }
     },
 
-    onLayout : function(){
-        if(this.toolbars.length > 0){
-            this.duringLayout = true;
+    onLayout : function(shallow, force){
+        Ext.Panel.superclass.onLayout.apply(this, arguments);
+        if(this.hasLayout && this.toolbars.length > 0){
             Ext.each(this.toolbars, function(tb){
-                tb.doLayout();
+                tb.doLayout(undefined, force);
             });
-            delete this.duringLayout;
             this.syncHeight();
         }
     },
 
     syncHeight : function(){
-        if(!(this.autoHeight || this.duringLayout)){
-            var last = this.lastSize;
-            if(last && !Ext.isEmpty(last.height)){
-                var old = last.height, h = this.el.getHeight();
-                if(old != 'auto' && old != h){
-                    var bd = this.body, bdh = bd.getHeight();
-                    h = Math.max(bdh + old - h, 0);
-                    if(bdh > 0 && bdh != h){
-                        bd.setHeight(h);
-                        if(Ext.isIE && h <= 0){
-                            return;
-                        }
-                        var sz = bd.getSize();
-                        this.fireEvent('bodyresize', sz.width, sz.height);
-                    }
-                }
-            }
+        var h = this.toolbarHeight,
+                bd = this.body,
+                lsh = this.lastSize.height,
+                sz;
+
+        if(this.autoHeight || !Ext.isDefined(lsh) || lsh == 'auto'){
+            return;
+        }
+
+
+        if(h != this.getToolbarHeight()){
+            h = Math.max(0, lsh - this.getFrameHeight());
+            bd.setHeight(h);
+            sz = bd.getSize();
+            this.toolbarHeight = this.getToolbarHeight();
+            this.onBodyResize(sz.width, sz.height);
         }
     },
 
@@ -1272,36 +1267,14 @@ new Ext.Panel({
         if(this.title){
             this.setTitle(this.title);
         }
-        this.setAutoScroll();
-        if(this.html){
-            this.body.update(Ext.isObject(this.html) ?
-                             Ext.DomHelper.markup(this.html) :
-                             this.html);
-            delete this.html;
-        }
-        if(this.contentEl){
-            var ce = Ext.getDom(this.contentEl);
-            Ext.fly(ce).removeClass(['x-hidden', 'x-hide-display']);
-            this.body.dom.appendChild(ce);
-        }
-        if(this.collapsed){
+        Ext.Panel.superclass.afterRender.call(this); // do sizing calcs last
+        if (this.collapsed) {
             this.collapsed = false;
             this.collapse(false);
         }
-        Ext.Panel.superclass.afterRender.call(this); // do sizing calcs last
         this.initEvents();
     },
 
-    // private
-    setAutoScroll : function(){
-        if(this.rendered && this.autoScroll){
-            var el = this.body || this.el;
-            if(el){
-                el.setOverflow('auto');
-            }
-        }
-    },
-
     // private
     getKeyMap : function(){
         if(!this.keyMap){
@@ -1318,6 +1291,18 @@ new Ext.Panel({
         if(this.draggable){
             this.initDraggable();
         }
+        if(this.toolbars.length > 0){
+            Ext.each(this.toolbars, function(tb){
+                tb.doLayout();
+                tb.on({
+                    scope: this,
+                    afterlayout: this.syncHeight,
+                    remove: this.syncHeight
+                });
+            }, this);
+            this.syncHeight();
+        }
+
     },
 
     // private
@@ -1330,19 +1315,21 @@ new Ext.Panel({
          * @type Ext.dd.DragSource.
          * @property dd
          */
-        this.dd = new Ext.Panel.DD(this, typeof this.draggable == 'boolean' ? null : this.draggable);
+        this.dd = new Ext.Panel.DD(this, Ext.isBoolean(this.draggable) ? null : this.draggable);
     },
 
     // private
-    beforeEffect : function(){
+    beforeEffect : function(anim){
         if(this.floating){
             this.el.beforeAction();
         }
-        this.el.addClass('x-panel-animated');
+        if(anim !== false){
+            this.el.addClass('x-panel-animated');
+        }
     },
 
     // private
-    afterEffect : function(){
+    afterEffect : function(anim){
         this.syncShadow();
         this.el.removeClass('x-panel-animated');
     },
@@ -1379,7 +1366,7 @@ new Ext.Panel({
             return;
         }
         var doAnim = animate === true || (animate !== false && this.animCollapse);
-        this.beforeEffect();
+        this.beforeEffect(doAnim);
         this.onCollapse(doAnim, animate);
         return this;
     },
@@ -1391,16 +1378,26 @@ new Ext.Panel({
                     Ext.apply(this.createEffect(animArg||true, this.afterCollapse, this),
                         this.collapseDefaults));
         }else{
-            this[this.collapseEl].hide();
-            this.afterCollapse();
+            this[this.collapseEl].hide(this.hideMode);
+            this.afterCollapse(false);
         }
     },
 
     // private
-    afterCollapse : function(){
+    afterCollapse : function(anim){
         this.collapsed = true;
         this.el.addClass(this.collapsedCls);
-        this.afterEffect();
+        if(anim !== false){
+            this[this.collapseEl].hide(this.hideMode);
+        }
+        this.afterEffect(anim);
+
+        // Reset lastSize of all sub-components so they KNOW they are in a collapsed container
+        this.cascade(function(c) {
+            if (c.lastSize) {
+                c.lastSize = { width: undefined, height: undefined };
+            }
+        });
         this.fireEvent('collapse', this);
     },
 
@@ -1417,7 +1414,7 @@ new Ext.Panel({
         }
         var doAnim = animate === true || (animate !== false && this.animCollapse);
         this.el.removeClass(this.collapsedCls);
-        this.beforeEffect();
+        this.beforeEffect(doAnim);
         this.onExpand(doAnim, animate);
         return this;
     },
@@ -1429,16 +1426,20 @@ new Ext.Panel({
                     Ext.apply(this.createEffect(animArg||true, this.afterExpand, this),
                         this.expandDefaults));
         }else{
-            this[this.collapseEl].show();
-            this.afterExpand();
+            this[this.collapseEl].show(this.hideMode);
+            this.afterExpand(false);
         }
     },
 
     // private
-    afterExpand : function(){
+    afterExpand : function(anim){
         this.collapsed = false;
-        this.afterEffect();
-        if(this.deferLayout !== undefined){
+        if(anim !== false){
+            this[this.collapseEl].show(this.hideMode);
+        }
+        this.afterEffect(anim);
+        if (this.deferLayout) {
+            delete this.deferLayout;
             this.doLayout(true);
         }
         this.fireEvent('expand', this);
@@ -1472,54 +1473,52 @@ new Ext.Panel({
     },
 
     // private
-    onResize : function(w, h){
-        if(w !== undefined || h !== undefined){
+    onResize : function(adjWidth, adjHeight, rawWidth, rawHeight){
+        var w = adjWidth,
+            h = adjHeight;
+
+        if(Ext.isDefined(w) || Ext.isDefined(h)){
             if(!this.collapsed){
-                if(typeof w == 'number'){
-                    w = this.adjustBodyWidth(w - this.getFrameWidth());
-                    if(this.tbar){
-                        this.tbar.setWidth(w);
-                        if(this.topToolbar){
-                            this.topToolbar.setSize(w);
-                        }
+                // First, set the the Panel's body width.
+                // If we have auto-widthed it, get the resulting full offset width so we can size the Toolbars to match
+                // The Toolbars must not buffer this resize operation because we need to know their heights.
+
+                if(Ext.isNumber(w)){
+                    this.body.setWidth(w = this.adjustBodyWidth(w - this.getFrameWidth()));
+                } else if (w == 'auto') {
+                    w = this.body.setWidth('auto').dom.offsetWidth;
+                } else {
+                    w = this.body.dom.offsetWidth;
+                }
+
+                if(this.tbar){
+                    this.tbar.setWidth(w);
+                    if(this.topToolbar){
+                        this.topToolbar.setSize(w);
                     }
-                    if(this.bbar){
-                        this.bbar.setWidth(w);
-                        if(this.bottomToolbar){
-                            this.bottomToolbar.setSize(w);
+                }
+                if(this.bbar){
+                    this.bbar.setWidth(w);
+                    if(this.bottomToolbar){
+                        this.bottomToolbar.setSize(w);
+                        // The bbar does not move on resize without this.
+                        if (Ext.isIE) {
+                            this.bbar.setStyle('position', 'static');
+                            this.bbar.setStyle('position', '');
                         }
                     }
+                }
+                if(this.footer){
+                    this.footer.setWidth(w);
                     if(this.fbar){
-                        var f = this.fbar,
-                            fWidth = 1,
-                            strict = Ext.isStrict;
-                        if(this.buttonAlign == 'left'){
-                           fWidth = w - f.container.getFrameWidth('lr');
-                        }else{
-                            //center/right alignment off in webkit
-                            if(Ext.isIE || Ext.isWebKit){
-                                //center alignment ok on webkit.
-                                //right broken in both, center on IE
-                                if(!(this.buttonAlign == 'center' && Ext.isWebKit) && (!strict || (!Ext.isIE8 && strict))){
-                                    (function(){
-                                        f.setWidth(f.getEl().child('.x-toolbar-ct').getWidth());
-                                    }).defer(1);
-                                }else{
-                                    fWidth = 'auto';
-                                }
-                            }else{
-                                fWidth = 'auto';
-                            }
-                        }
-                        f.setWidth(fWidth);
+                        this.fbar.setSize(Ext.isIE ? (w - this.footer.getFrameWidth('lr')) : 'auto');
                     }
-                    this.body.setWidth(w);
-                }else if(w == 'auto'){
-                    this.body.setWidth(w);
                 }
 
-                if(typeof h == 'number'){
-                    h = Math.max(0, this.adjustBodyHeight(h - this.getFrameHeight()));
+                // At this point, the Toolbars must be layed out for getFrameHeight to find a result.
+                if(Ext.isNumber(h)){
+                    h = Math.max(0, h - this.getFrameHeight());
+                    //h = Math.max(0, h - (this.getHeight() - this.body.getHeight()));
                     this.body.setHeight(h);
                 }else if(h == 'auto'){
                     this.body.setHeight(h);
@@ -1529,22 +1528,40 @@ new Ext.Panel({
                     this.el._mask.setSize(this.el.dom.clientWidth, this.el.getHeight());
                 }
             }else{
+                // Adds an event to set the correct height afterExpand.  This accounts for the deferHeight flag in panel
                 this.queuedBodySize = {width: w, height: h};
                 if(!this.queuedExpand && this.allowQueuedExpand !== false){
                     this.queuedExpand = true;
                     this.on('expand', function(){
                         delete this.queuedExpand;
                         this.onResize(this.queuedBodySize.width, this.queuedBodySize.height);
-                        this.doLayout();
                     }, this, {single:true});
                 }
             }
-            this.fireEvent('bodyresize', this, w, h);
+            this.onBodyResize(w, h);
         }
         this.syncShadow();
+        Ext.Panel.superclass.onResize.call(this, adjWidth, adjHeight, rawWidth, rawHeight);
+
     },
 
     // private
+    onBodyResize: function(w, h){
+        this.fireEvent('bodyresize', this, w, h);
+    },
+
+    // private
+    getToolbarHeight: function(){
+        var h = 0;
+        if(this.rendered){
+            Ext.each(this.toolbars, function(tb){
+                h += tb.getHeight();
+            }, this);
+        }
+        return h;
+    },
+
+    // deprecate
     adjustBodyHeight : function(h){
         return h;
     },
@@ -1565,13 +1582,12 @@ new Ext.Panel({
      * @return {Number} The frame width
      */
     getFrameWidth : function(){
-        var w = this.el.getFrameWidth('lr')+this.bwrap.getFrameWidth('lr');
+        var w = this.el.getFrameWidth('lr') + this.bwrap.getFrameWidth('lr');
 
         if(this.frame){
             var l = this.bwrap.dom.firstChild;
             w += (Ext.fly(l).getFrameWidth('l') + Ext.fly(l.firstChild).getFrameWidth('r'));
-            var mc = this.bwrap.dom.firstChild.firstChild.firstChild;
-            w += Ext.fly(mc).getFrameWidth('lr');
+            w += this.mc.getFrameWidth('lr');
         }
         return w;
     },
@@ -1581,22 +1597,27 @@ new Ext.Panel({
      * header and footer elements, but not including the body height).  To retrieve the body height see {@link #getInnerHeight}.
      * @return {Number} The frame height
      */
-    getFrameHeight : function(){
-        var h  = this.el.getFrameWidth('tb')+this.bwrap.getFrameWidth('tb');
-        h += (this.tbar ? this.tbar.getHeight() : 0) +
-             (this.bbar ? this.bbar.getHeight() : 0);
+    getFrameHeight : function() {
+        var h = Math.max(0, this.getHeight() - this.body.getHeight());
 
-        if(this.frame){
-            var hd = this.el.dom.firstChild;
-            var ft = this.bwrap.dom.lastChild;
-            h += (hd.offsetHeight + ft.offsetHeight);
-            var mc = this.bwrap.dom.firstChild.firstChild.firstChild;
-            h += Ext.fly(mc).getFrameWidth('tb');
-        }else{
-            h += (this.header ? this.header.getHeight() : 0) +
-                (this.footer ? this.footer.getHeight() : 0);
+        if (isNaN(h)) {
+            h = 0;
         }
         return h;
+
+        /* Deprecate
+            var h  = this.el.getFrameWidth('tb') + this.bwrap.getFrameWidth('tb');
+            h += (this.tbar ? this.tbar.getHeight() : 0) +
+                 (this.bbar ? this.bbar.getHeight() : 0);
+
+            if(this.frame){
+                h += this.el.dom.firstChild.offsetHeight + this.ft.dom.offsetHeight + this.mc.getFrameWidth('tb');
+            }else{
+                h += (this.header ? this.header.getHeight() : 0) +
+                    (this.footer ? this.footer.getHeight() : 0);
+            }
+            return h;
+        */
     },
 
     /**
@@ -1614,7 +1635,10 @@ new Ext.Panel({
      * @return {Number} The body height
      */
     getInnerHeight : function(){
-        return this.getSize().height - this.getFrameHeight();
+        return this.body.getHeight();
+        /* Deprecate
+            return this.getSize().height - this.getFrameHeight();
+        */
     },
 
     // private
@@ -1629,11 +1653,16 @@ new Ext.Panel({
         return this.body;
     },
 
+    // private
+    getContentTarget : function(){
+        return this.body;
+    },
+
     /**
      * Sets the title text for the panel and optionally the {@link #iconCls icon class}.
      * In order to be able to set the title, a header element must have been created
-     * for the Panel. This is triggered either by configuring the Panel with a non-blank {@link #title},
-     * or configuring it with {@link #header}: true.
+     * for the Panel. This is triggered either by configuring the Panel with a non-blank {@link #title},
+     * or configuring it with {@link #header}: true.
      * @param {String} title The title text to set
      * @param {String} iconCls (optional) {@link #iconCls iconCls} A user-defined CSS class that provides the icon image for this panel
      */
@@ -1662,13 +1691,13 @@ new Ext.Panel({
      * @param {Object/String/Function} config A config object containing any of the following options:
 
 panel.load({
-    url: "your-url.php",
-    params: {param1: "foo", param2: "bar"}, // or a URL encoded string
+    url: 'your-url.php',
+    params: {param1: 'foo', param2: 'bar'}, // or a URL encoded string
     callback: yourFunction,
     scope: yourObject, // optional scope for the callback
     discardUrl: false,
     nocache: false,
-    text: "Loading...",
+    text: 'Loading...',
     timeout: 30,
     scripts: false
 });
@@ -1686,32 +1715,46 @@ panel.load({
 
     // private
     beforeDestroy : function(){
+        Ext.Panel.superclass.beforeDestroy.call(this);
         if(this.header){
             this.header.removeAllListeners();
-            if(this.headerAsText){
-                Ext.Element.uncache(this.header.child('span'));
-            }
         }
-        Ext.Element.uncache(
-            this.header,
-            this.tbar,
-            this.bbar,
-            this.footer,
-            this.body,
-            this.bwrap
-        );
         if(this.tools){
             for(var k in this.tools){
                 Ext.destroy(this.tools[k]);
             }
         }
-        if(this.buttons){
-            for(var b in this.buttons){
-                Ext.destroy(this.buttons[b]);
+        if(this.toolbars.length > 0){
+            Ext.each(this.toolbars, function(tb){
+                tb.un('afterlayout', this.syncHeight, this);
+                tb.un('remove', this.syncHeight, this);
+            }, this);
+        }
+        if(Ext.isArray(this.buttons)){
+            while(this.buttons.length) {
+                Ext.destroy(this.buttons[0]);
+            }
+        }
+        if(this.rendered){
+            Ext.destroy(
+                this.ft,
+                this.header,
+                this.footer,
+                this.tbar,
+                this.bbar,
+                this.body,
+                this.mc,
+                this.bwrap,
+                this.dd
+            );
+            if (this.fbar) {
+                Ext.destroy(
+                    this.fbar,
+                    this.fbar.el
+                );
             }
         }
         Ext.destroy(this.toolbars);
-        Ext.Panel.superclass.beforeDestroy.call(this);
     },
 
     // private
@@ -1771,6 +1814,6 @@ panel.load({
  */
 });
 Ext.reg('panel', Ext.Panel);
-
    
-
+
+ \ No newline at end of file