From 166bcb5c43b1fa25beeab1a30aa24bf191bf616a Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Fri, 10 May 2013 19:47:49 +0200
Subject: [PATCH] fixed merge error

---
 VocaluxeLib/IBasic.cs     | 1 +
 VocaluxeLib/Menu/CText.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VocaluxeLib/IBasic.cs b/VocaluxeLib/IBasic.cs
index eadd5f58..2d71e3ae 100644
--- a/VocaluxeLib/IBasic.cs
+++ b/VocaluxeLib/IBasic.cs
@@ -146,6 +146,7 @@ namespace VocaluxeLib
         void SetStyle(EStyle fontStyle);
 
         RectangleF GetTextBounds(CText text);
+        RectangleF GetTextBounds(CText text, float textHeight);
 
         void DrawText(string text, float textHeight, float x, float y, float z, SColorF color);
         void DrawTextReflection(string text, float textHeight, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);
diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs
index 880cb6d0..ac8bd1c8 100644
--- a/VocaluxeLib/Menu/CText.cs
+++ b/VocaluxeLib/Menu/CText.cs
@@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu
                         break;
                 }
 
-                bounds = CBase.Fonts.GetTextBounds(this);
+                bounds = CBase.Fonts.GetTextBounds(this, h);
             }
 
             float x = X;