Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ChangeLog

@@ -0,0 +1,55 @@
+2010-06-25  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* TabControlPainter.cs: Use TabControl.Font to draw instead of
+	TabPage.Font values.
+	Fixes bits of #551032.
+
+2010-05-17  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* TabControlPainter.cs: When drawing the contents of our tabs use 
+	TabControl.Padding instead of BorderThickness and FocusRectSpacing.
+
+2008-10-20  Jonathan Pobst  <monkey@jpobst.com>
+
+	* ToolStripPainter.cs: Don't paint over a set BackgroundImage.
+
+2008-09-16  Jonathan Pobst  <monkey@jpobst.com>
+
+	* TabControlPainter.cs: Hook tab painting into ShowFocusCues.
+
+2008-07-31  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Added DrawScrollButton.
+
+2008-07-09  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs, ToolStripPainter.cs: Now falls back to the default
+	implementation when Visual Styles should not be used.
+
+2008-05-21  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Enabled support for the hot style.
+
+2008-05-19  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Refactored: Used DrawBackground instead of Draw.
+
+2008-05-07  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* ToolStripPainter.cs: Added.
+
+2008-04-30  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Ordered usings.
+
+2008-04-28  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Fixed duplication.
+
+2008-04-28  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* TabControlPainter.cs: Added.
+	
+2008-04-25  George Giolfan  <georgegiolfan@yahoo.com>
+
+	* CheckBoxPainter.cs, RadioButtonPainter.cs: Added.

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/CheckBoxPainter.cs

@@ -0,0 +1,104 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2008 George Giolfan
+//
+// Authors:
+//	George Giolfan (georgegiolfan@yahoo.com)
+
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+namespace System.Windows.Forms.Theming.VisualStyles
+{
+	class CheckBoxPainter : Default.CheckBoxPainter
+	{
+		public override void DrawNormalCheckBox (Graphics g, Rectangle bounds, Color backColor, Color foreColor, CheckState state)
+		{
+			CheckBoxState check_box_state;
+			switch (state) {
+			case CheckState.Checked:
+				check_box_state = CheckBoxState.CheckedNormal;
+				break;
+			case CheckState.Indeterminate:
+				check_box_state = CheckBoxState.MixedNormal;
+				break;
+			default:
+				check_box_state = CheckBoxState.UncheckedNormal;
+				break;
+			}
+			DrawCheckBox (g, bounds, check_box_state);
+		}
+		public override void DrawHotCheckBox (Graphics g, Rectangle bounds, Color backColor, Color foreColor, CheckState state)
+		{
+			CheckBoxState check_box_state;
+			switch (state) {
+			case CheckState.Checked:
+				check_box_state = CheckBoxState.CheckedHot;
+				break;
+			case CheckState.Indeterminate:
+				check_box_state = CheckBoxState.MixedHot;
+				break;
+			default:
+				check_box_state = CheckBoxState.UncheckedHot;
+				break;
+			}
+			DrawCheckBox (g, bounds, check_box_state);
+		}
+		public override void DrawPressedCheckBox (Graphics g, Rectangle bounds, Color backColor, Color foreColor, CheckState state)
+		{
+			CheckBoxState check_box_state;
+			switch (state) {
+			case CheckState.Checked:
+				check_box_state = CheckBoxState.CheckedPressed;
+				break;
+			case CheckState.Indeterminate:
+				check_box_state = CheckBoxState.MixedPressed;
+				break;
+			default:
+				check_box_state = CheckBoxState.UncheckedPressed;
+				break;
+			}
+			DrawCheckBox (g, bounds, check_box_state);
+		}
+		public override void DrawDisabledCheckBox (Graphics g, Rectangle bounds, Color backColor, Color foreColor, CheckState state)
+		{
+			CheckBoxState check_box_state;
+			switch (state) {
+			case CheckState.Checked:
+				check_box_state = CheckBoxState.CheckedDisabled;
+				break;
+			case CheckState.Indeterminate:
+				check_box_state = CheckBoxState.MixedDisabled;
+				break;
+			default:
+				check_box_state = CheckBoxState.UncheckedDisabled;
+				break;
+			}
+			DrawCheckBox (g, bounds, check_box_state);
+		}
+		static void DrawCheckBox (Graphics g, Rectangle bounds, CheckBoxState state)
+		{
+			CheckBoxRenderer.DrawCheckBox (
+				g,
+				bounds.Location,
+				state
+			);
+		}
+	}
+}

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/RadioButtonPainter.cs

@@ -0,0 +1,56 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2008 George Giolfan
+//
+// Authors:
+//	George Giolfan (georgegiolfan@yahoo.com)
+
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+namespace System.Windows.Forms.Theming.VisualStyles
+{
+	class RadioButtonPainter : Default.RadioButtonPainter
+	{
+		public override void DrawNormalRadioButton (Graphics g, Rectangle bounds, Color backColor, Color foreColor, bool isChecked)
+		{
+			DrawRadioButton (g, bounds, isChecked ? RadioButtonState.CheckedNormal : RadioButtonState.UncheckedNormal);
+		}
+		public override void DrawHotRadioButton(Graphics g, Rectangle bounds, Color backColor, Color foreColor, bool isChecked)
+		{
+			DrawRadioButton (g, bounds, isChecked ? RadioButtonState.CheckedHot : RadioButtonState.UncheckedHot);
+		}
+		public override void DrawPressedRadioButton(Graphics g, Rectangle bounds, Color backColor, Color foreColor, bool isChecked)
+		{
+			DrawRadioButton (g, bounds, isChecked ? RadioButtonState.CheckedPressed : RadioButtonState.UncheckedPressed);
+		}
+		public override void DrawDisabledRadioButton(Graphics g, Rectangle bounds, Color backColor, Color foreColor, bool isChecked)
+		{
+			DrawRadioButton (g, bounds, isChecked ? RadioButtonState.CheckedDisabled : RadioButtonState.UncheckedDisabled);
+		}
+		static void DrawRadioButton (Graphics g, Rectangle bounds, RadioButtonState state)
+		{
+			RadioButtonRenderer.DrawRadioButton (
+				g,
+				bounds.Location,
+				state
+			);
+		}
+	}
+}

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/TabControlPainter.cs

@@ -0,0 +1,265 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2008 George Giolfan
+//
+// Authors:
+//	George Giolfan (georgegiolfan@yahoo.com)
+
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+namespace System.Windows.Forms.Theming.VisualStyles
+{
+	class TabControlPainter : Default.TabControlPainter
+	{
+		static bool ShouldPaint (TabControl tabControl) {
+			return ThemeVisualStyles.RenderClientAreas &&
+				tabControl.Alignment == TabAlignment.Top &&
+				tabControl.DrawMode == TabDrawMode.Normal;
+		}
+		protected override void DrawBackground (Graphics dc, Rectangle area, TabControl tab)
+		{
+			if (!ShouldPaint (tab)) {
+				base.DrawBackground (dc, area, tab);
+				return;
+			}
+
+			VisualStyleElement element = VisualStyleElement.Tab.Pane.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.DrawBackground (dc, area, tab);
+				return;
+			}
+			Rectangle panel_rectangle = GetTabPanelRect (tab);
+			if (panel_rectangle.IntersectsWith (area))
+				new VisualStyleRenderer (element).DrawBackground (dc, panel_rectangle, area);
+		}
+		protected override int DrawTab (Graphics dc, TabPage page, TabControl tab, Rectangle bounds, bool is_selected)
+		{
+			if (!ShouldPaint (tab))
+				return base.DrawTab (dc, page, tab, bounds, is_selected);
+			VisualStyleElement element = GetVisualStyleElement (tab, page, is_selected);
+			if (!VisualStyleRenderer.IsElementDefined (element))
+				return base.DrawTab (dc, page, tab, bounds, is_selected);
+			new VisualStyleRenderer (element).DrawBackground (dc, bounds);
+			bounds.Inflate (
+				-(tab.Padding.X),
+				-(tab.Padding.Y));
+			Rectangle text_area = bounds;
+			if (tab.ImageList != null && page.ImageIndex >= 0 && page.ImageIndex < tab.ImageList.Images.Count) {
+				int image_y = bounds.Y + (bounds.Height - tab.ImageList.ImageSize.Height) / 2;
+				tab.ImageList.Draw (dc, new Point (bounds.X, image_y), page.ImageIndex);
+				int image_occupied_space = tab.ImageList.ImageSize.Width + 2;
+				text_area.X += image_occupied_space;
+				text_area.Width -= image_occupied_space;
+			}
+			if (page.Text != null)
+				dc.DrawString (page.Text, tab.Font, SystemBrushes.ControlText, text_area, DefaultFormatting);
+			if (tab.Focused && is_selected && tab.ShowFocusCues)
+				ControlPaint.DrawFocusRectangle (dc, bounds);
+			return 0;
+		}
+		static VisualStyleElement GetVisualStyleElement (TabControl tabControl, TabPage tabPage, bool selected)
+		{
+			bool top_edge = tabPage.Row == tabControl.RowCount;
+			int tab_page_index = tabControl.TabPages.IndexOf (tabPage);
+			bool left_edge = true;
+			int index;
+			for (index = tabControl.SliderPos; index < tab_page_index; index++)
+				if (tabControl.TabPages [index].Row == tabPage.Row) {
+					left_edge = false;
+					break;
+				}
+			bool right_edge = true;
+			for (index = tab_page_index; index < tabControl.TabCount; index++)
+				if (tabControl.TabPages [index].Row == tabPage.Row) {
+					right_edge = false;
+					break;
+				}
+			if (!tabPage.Enabled)
+				#region Disabled
+				if (top_edge)
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItem.Disabled;
+						else
+							return VisualStyleElement.Tab.TopTabItemLeftEdge.Disabled;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItemRightEdge.Disabled;
+						else
+							return VisualStyleElement.Tab.TopTabItem.Disabled;
+				else
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItem.Disabled;
+						else
+							return VisualStyleElement.Tab.TabItemLeftEdge.Disabled;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItemRightEdge.Disabled;
+						else
+							return VisualStyleElement.Tab.TabItem.Disabled;
+				#endregion
+			else if (selected)
+				#region Pressed
+				if (top_edge)
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItem.Pressed;
+						else
+							return VisualStyleElement.Tab.TopTabItemLeftEdge.Pressed;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItemRightEdge.Pressed;
+						else
+							return VisualStyleElement.Tab.TopTabItem.Pressed;
+				else
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItem.Pressed;
+						else
+							return VisualStyleElement.Tab.TabItemLeftEdge.Pressed;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItemRightEdge.Pressed;
+						else
+							return VisualStyleElement.Tab.TabItem.Pressed;
+				#endregion
+			else if (tabControl.EnteredTabPage == tabPage)
+				#region Hot
+				if (top_edge)
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItem.Hot;
+						else
+							return VisualStyleElement.Tab.TopTabItemLeftEdge.Hot;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItemRightEdge.Hot;
+						else
+							return VisualStyleElement.Tab.TopTabItem.Hot;
+				else
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItem.Hot;
+						else
+							return VisualStyleElement.Tab.TabItemLeftEdge.Hot;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItemRightEdge.Hot;
+						else
+							return VisualStyleElement.Tab.TabItem.Hot;
+				#endregion
+			else
+				#region Normal
+				if (top_edge)
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItemBothEdges.Normal;
+						else
+							return VisualStyleElement.Tab.TopTabItemLeftEdge.Normal;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TopTabItemRightEdge.Normal;
+						else
+							return VisualStyleElement.Tab.TopTabItem.Normal;
+				else
+					if (left_edge)
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItemBothEdges.Normal;
+						else
+							return VisualStyleElement.Tab.TabItemLeftEdge.Normal;
+					else
+						if (right_edge)
+							return VisualStyleElement.Tab.TabItemRightEdge.Normal;
+						else
+							return VisualStyleElement.Tab.TabItem.Normal;
+				#endregion
+		}
+		public override bool HasHotElementStyles (TabControl tabControl)
+		{
+			if (!ShouldPaint (tabControl))
+				return base.HasHotElementStyles (tabControl);
+			return true;
+		}
+		protected override void DrawScrollButton (Graphics dc, Rectangle bounds, Rectangle clippingArea, ScrollButton button, PushButtonState state)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.DrawScrollButton (dc, bounds, clippingArea, button, state);
+				return;
+			}
+			VisualStyleElement element;
+			if (button == ScrollButton.Left)
+				switch (state) {
+				case PushButtonState.Hot:
+					element = VisualStyleElement.Spin.DownHorizontal.Hot;
+					break;
+				case PushButtonState.Pressed:
+					element = VisualStyleElement.Spin.DownHorizontal.Pressed;
+					break;
+				default:
+					element = VisualStyleElement.Spin.DownHorizontal.Normal;
+					break;
+				}
+			else
+				switch (state) {
+				case PushButtonState.Hot:
+					element = VisualStyleElement.Spin.UpHorizontal.Hot;
+					break;
+				case PushButtonState.Pressed:
+					element = VisualStyleElement.Spin.UpHorizontal.Pressed;
+					break;
+				default:
+					element = VisualStyleElement.Spin.UpHorizontal.Normal;
+					break;
+				}
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				if (button == ScrollButton.Left)
+					switch (state) {
+					case PushButtonState.Hot:
+						element = VisualStyleElement.ScrollBar.ArrowButton.LeftHot;
+						break;
+					case PushButtonState.Pressed:
+						element = VisualStyleElement.ScrollBar.ArrowButton.LeftPressed;
+						break;
+					default:
+						element = VisualStyleElement.ScrollBar.ArrowButton.LeftNormal;
+						break;
+					}
+				else
+					switch (state) {
+					case PushButtonState.Hot:
+						element = VisualStyleElement.ScrollBar.ArrowButton.RightHot;
+						break;
+					case PushButtonState.Pressed:
+						element = VisualStyleElement.ScrollBar.ArrowButton.RightPressed;
+						break;
+					default:
+						element = VisualStyleElement.ScrollBar.ArrowButton.RightNormal;
+						break;
+					}
+				if (!VisualStyleRenderer.IsElementDefined (element)) {
+					base.DrawScrollButton (dc, bounds, clippingArea, button, state);
+					return;
+				}
+			}
+			new VisualStyleRenderer (element).DrawBackground (dc, bounds, clippingArea);
+		}
+	}
+}

mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ToolStripPainter.cs

@@ -0,0 +1,213 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2008 George Giolfan
+//
+// Authors:
+//	George Giolfan (georgegiolfan@yahoo.com)
+
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+namespace System.Windows.Forms.Theming.VisualStyles
+{
+	class ToolStripPainter : Default.ToolStripPainter
+	{
+		static bool IsDisabled (ToolStripItem toolStripItem)
+		{
+			return !toolStripItem.Enabled;
+		}
+		static bool IsPressed (ToolStripItem toolStripItem)
+		{
+			return toolStripItem.Pressed;
+		}
+		static bool IsChecked (ToolStripItem toolStripItem)
+		{
+			ToolStripButton tool_strip_button = toolStripItem as ToolStripButton;
+			if (tool_strip_button == null)
+				return false;
+			return tool_strip_button.Checked;
+		}
+		static bool IsHot (ToolStripItem toolStripItem)
+		{
+			return toolStripItem.Selected;
+		}
+		public override void OnRenderButtonBackground (ToolStripItemRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderButtonBackground (e);
+				return;
+			}
+			VisualStyleElement element;
+			if (IsDisabled (e.Item))
+				element = VisualStyleElement.ToolBar.Button.Disabled;
+			else if (IsPressed (e.Item))
+				element = VisualStyleElement.ToolBar.Button.Pressed;
+			else if (IsChecked (e.Item))
+				if (IsHot (e.Item))
+					element = VisualStyleElement.ToolBar.Button.HotChecked;
+				else
+					element = VisualStyleElement.ToolBar.Button.Checked;
+			else if (IsHot (e.Item))
+				element = VisualStyleElement.ToolBar.Button.Hot;
+			else
+				element = VisualStyleElement.ToolBar.Button.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderButtonBackground (e);
+				return;
+			}
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.Item.Bounds);
+		}
+		public override void OnRenderDropDownButtonBackground (ToolStripItemRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderDropDownButtonBackground (e);
+				return;
+			}
+			VisualStyleElement element;
+			if (IsDisabled (e.Item))
+				element = VisualStyleElement.ToolBar.DropDownButton.Disabled;
+			else if (IsPressed (e.Item))
+				element = VisualStyleElement.ToolBar.DropDownButton.Pressed;
+			else if (IsChecked (e.Item))
+				if (IsHot (e.Item))
+					element = VisualStyleElement.ToolBar.DropDownButton.HotChecked;
+				else
+					element = VisualStyleElement.ToolBar.DropDownButton.Checked;
+			else if (IsHot (e.Item))
+				element = VisualStyleElement.ToolBar.DropDownButton.Hot;
+			else
+				element = VisualStyleElement.ToolBar.DropDownButton.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderDropDownButtonBackground (e);
+				return;
+			}
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.Item.Bounds);
+		}
+		public override void OnRenderGrip (ToolStripGripRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderGrip (e);
+				return;
+			}
+			if (e.GripStyle == ToolStripGripStyle.Hidden)
+				return;
+			VisualStyleElement element = e.GripDisplayStyle == ToolStripGripDisplayStyle.Vertical ?
+				VisualStyleElement.Rebar.Gripper.Normal :
+				VisualStyleElement.Rebar.GripperVertical.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderGrip (e);
+				return;
+			}
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.GripDisplayStyle == ToolStripGripDisplayStyle.Vertical ?
+				// GetPartSize seems to return useless values.
+				new Rectangle (2, 0, 5, 20) :
+				new Rectangle (0, 2, 20, 5));
+		}
+		public override void OnRenderOverflowButtonBackground (ToolStripItemRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderOverflowButtonBackground (e);
+				return;
+			}
+			VisualStyleElement element = e.ToolStrip.Orientation == Orientation.Horizontal ?
+				VisualStyleElement.Rebar.Chevron.Normal :
+				VisualStyleElement.Rebar.ChevronVertical.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderOverflowButtonBackground (e);
+				return;
+			}
+			OnRenderButtonBackground (e);
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.Item.Bounds);
+		}
+		public override void OnRenderSeparator (ToolStripSeparatorRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderSeparator (e);
+				return;
+			}
+			VisualStyleElement element = e.ToolStrip.Orientation == Orientation.Horizontal ?
+				VisualStyleElement.ToolBar.SeparatorHorizontal.Normal :
+				VisualStyleElement.ToolBar.SeparatorVertical.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderSeparator (e);
+				return;
+			}
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.Item.Bounds);
+		}
+		public override void OnRenderSplitButtonBackground (ToolStripItemRenderEventArgs e)
+		{
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderSplitButtonBackground (e);
+				return;
+			}
+			VisualStyleElement element, drop_down_element;
+			if (IsDisabled (e.Item)) {
+				element = VisualStyleElement.ToolBar.SplitButton.Disabled;
+				drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.Disabled;;
+			} else if (IsPressed (e.Item)) {
+				element = VisualStyleElement.ToolBar.SplitButton.Pressed;
+				drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.Pressed;
+			} else if (IsChecked (e.Item))
+				if (IsHot (e.Item)) {
+					element = VisualStyleElement.ToolBar.SplitButton.HotChecked;
+					drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.HotChecked;
+				} else {
+					element = VisualStyleElement.ToolBar.Button.Checked;
+					drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.Checked;
+				}
+			else if (IsHot (e.Item)) {
+				element = VisualStyleElement.ToolBar.SplitButton.Hot;
+				drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.Hot;
+			} else {
+				element = VisualStyleElement.ToolBar.SplitButton.Normal;
+				drop_down_element = VisualStyleElement.ToolBar.SplitButtonDropDown.Normal;
+			}
+			if (!VisualStyleRenderer.IsElementDefined (element) ||
+				!VisualStyleRenderer.IsElementDefined (drop_down_element)) {
+				base.OnRenderSplitButtonBackground (e);
+				return;
+			}
+			ToolStripSplitButton tool_strip_split_button = (ToolStripSplitButton)e.Item;
+			VisualStyleRenderer renderer = new VisualStyleRenderer (element);
+			renderer.DrawBackground (e.Graphics, tool_strip_split_button.ButtonBounds);
+			renderer.SetParameters (drop_down_element);
+			renderer.DrawBackground (e.Graphics, tool_strip_split_button.DropDownButtonBounds);
+		}
+		public override void OnRenderToolStripBackground (ToolStripRenderEventArgs e)
+		{
+			if (e.ToolStrip.BackgroundImage != null)
+				return;
+				
+			if (!ThemeVisualStyles.RenderClientAreas) {
+				base.OnRenderToolStripBackground (e);
+				return;
+			}
+			VisualStyleElement element;
+			if (e.ToolStrip is StatusStrip)
+				element = VisualStyleElement.Status.Bar.Normal;
+			else
+				element = VisualStyleElement.Rebar.Band.Normal;
+			if (!VisualStyleRenderer.IsElementDefined (element)) {
+				base.OnRenderToolStripBackground (e);
+				return;
+			}
+			new VisualStyleRenderer (element).DrawBackground (e.Graphics, e.ToolStrip.Bounds, e.AffectedBounds);
+		}
+	}
+}