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.

svn path=/trunk/mcs/; revision=159546

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ChangeLog
index 3912a4dfda2e30ac7b3fc550edd7c7e8f04a0e72..01f025a0c0129d5040971a1457aa5fc84ecc1ab1 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/ChangeLog
@@ -1,3 +1,9 @@
+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 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/TabControlPainter.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/TabControlPainter.cs
index 5cdd3a0fbc870c94955e9f1c99fdfa790169359a..45f509b4b176792132e964fdbdb7e8a55c8291b1 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/TabControlPainter.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/VisualStyles/TabControlPainter.cs
@@ -69,7 +69,7 @@ namespace System.Windows.Forms.Theming.VisualStyles
                                text_area.Width -= image_occupied_space;
                        }
                        if (page.Text != null)
-                               dc.DrawString (page.Text, page.Font, SystemBrushes.ControlText, text_area, DefaultFormatting);
+                               dc.DrawString (page.Text, tab.Font, SystemBrushes.ControlText, text_area, DefaultFormatting);
                        if (tab.Focused && is_selected && tab.ShowFocusCues)
                                ControlPaint.DrawFocusRectangle (dc, bounds);
                        return 0;