Index: class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs	(revision 104925)
+++ class/Managed.Windows.Forms/System.Windows.Forms/Theme.cs	(working copy)
@@ -1010,40 +1010,15 @@
 		public abstract void TreeViewDrawNodePlusMinus (TreeView treeView, TreeNode node, Graphics dc, int x, int middle);
 		#endregion
 
-		public virtual void DrawManagedWindowDecorations (Graphics dc, Rectangle clip, InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-		}
+		#region Managed window
+		public abstract void DrawManagedWindowDecorations (Graphics dc, Rectangle clip, InternalWindowManager wm);
+		public abstract int ManagedWindowTitleBarHeight (InternalWindowManager wm);
+		public abstract int ManagedWindowBorderWidth (InternalWindowManager wm);
+		public abstract int ManagedWindowIconWidth (InternalWindowManager wm);
+		public abstract Size ManagedWindowButtonSize (InternalWindowManager wm);
+		public abstract void ManagedWindowSetButtonLocations (InternalWindowManager wm);
+		#endregion
 
-		public virtual int ManagedWindowTitleBarHeight (InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-			return 15;
-		}
-
-		public virtual int ManagedWindowBorderWidth (InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-			return 3;
-		}
-
-		public virtual int ManagedWindowIconWidth (InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-			return ManagedWindowTitleBarHeight (wm) - 5;
-		}
-
-		public virtual Size ManagedWindowButtonSize (InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-			return new Size (10, 10);
-		}
-
-		public virtual void ManagedWindowSetButtonLocations (InternalWindowManager wm)
-		{
-			// Just making virtual for now so all the themes still build.
-		}
-
 		#region	ControlPaint Methods
 		public abstract void CPDrawBorder (Graphics graphics, Rectangle bounds, Color leftColor, int leftWidth,
 			ButtonBorderStyle leftStyle, Color topColor, int topWidth, ButtonBorderStyle topStyle,
Index: class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(revision 104925)
+++ class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs	(working copy)
@@ -5908,6 +5908,7 @@
 		}
 		#endregion
 
+		#region Managed window
 		public override int ManagedWindowTitleBarHeight (InternalWindowManager wm)
 		{
 			if (wm.IsToolWindow && !wm.IsMinimized)
@@ -6129,6 +6130,7 @@
 			ControlPaint.DrawCaptionButton (dc, button.Rectangle,
 					button.Caption, button.State);
 		}
+		#endregion
 
 		#region ControlPaint
 		public override void CPDrawBorder (Graphics graphics, Rectangle bounds, Color leftColor, int leftWidth,