fixed some merge errors

Vocaluxe/Base/Fonts/CGlyph.cs

@@ -23,7 +23,7 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Drawing.Text;
 using System.Runtime.InteropServices;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base.Fonts
 {

VocaluxeLib/IBasic.cs

@@ -114,12 +114,9 @@ namespace VocaluxeLib
 
     public interface IDrawing
     {
-        RectangleF GetTextBounds(CText text);
-
         void DrawTexture(STexture texture, SRectF rect);
         void DrawTexture(STexture texture, SRectF rect, SColorF color);
-        void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds);
-        void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored);
+        void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
         void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
 
         STexture AddTexture(string fileName);
@@ -148,7 +145,7 @@ namespace VocaluxeLib
         void SetFont(string fontName);
         void SetStyle(EStyle fontStyle);
 
-        RectangleF GetTextBounds(CText text, float textHeight);
+        RectangleF GetTextBounds(CText text);
 
         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);

VocaluxeLib/Menu/CText.cs

@@ -579,7 +579,7 @@ namespace VocaluxeLib.Menu
                         break;
                 }
 
-                bounds = CBase.Fonts.GetTextBounds(this, h);
+                bounds = CBase.Fonts.GetTextBounds(this);
             }
 
             float x = X;