From d3a80e53c004eccfa01e496fc352543d8f176b40 Mon Sep 17 00:00:00 2001
From: micio <micio@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 4 Feb 2012 23:04:54 +0000
Subject: [PATCH] ide/Debuggers : fixed disassembly pane text size for GUI
 non-standard font size 12

git-svn-id: svn://ultimatepp.org/upp/trunk@4546 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Debuggers/Disas.cpp   | 8 ++++----
 uppsrc/ide/Debuggers/Gdb_MI2.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Debuggers/Disas.cpp b/uppsrc/ide/Debuggers/Disas.cpp
index d3fbdb3f3..9600f6828 100644
--- a/uppsrc/ide/Debuggers/Disas.cpp
+++ b/uppsrc/ide/Debuggers/Disas.cpp
@@ -36,8 +36,8 @@ void DbgDisas::Paint(Draw& w)
 		if(i == ip)
 			DrawHighlightImage(w, x + 2, y + (box.cy - 12) / 2, ipimg);
 		x += 18;
-		w.DrawText(x, y, n.code, StdFont(), ink);
-		w.DrawText(x + codecx, y, n.args, StdFont(), ink);
+		w.DrawText(x, y, n.code, StdFont(12), ink);
+		w.DrawText(x + codecx, y, n.args, StdFont(12), ink);
 		y += box.cy;
 		i++;
 	}
@@ -92,7 +92,7 @@ void DbgDisas::Clear()
 	inst.Clear();
 	taddr.Clear();
 	addr.Clear();
-	codecx = GetTextSize("movlmo", StdFont()).cx;
+	codecx = GetTextSize("movlmo", StdFont(12)).cx;
 }
 
 void  DbgDisas::Add(adr_t adr, const String& code, const String& args)
@@ -107,7 +107,7 @@ void  DbgDisas::Add(adr_t adr, const String& code, const String& args)
 	n.args = args;
 	sb.SetTotal(inst.GetCount());
 	Refresh();
-	int cx = GetTextSize(n.code, StdFont()).cx;
+	int cx = GetTextSize(n.code, StdFont(12)).cx;
 	if(cx > codecx)
 		codecx = cx;
 }
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
index 5c470c703..05f06c519 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
@@ -238,7 +238,7 @@ int Gdb_MI2::FindTabsRight(void)
 	
 	// bisect up it finds a point on last tab...
 	int iTab = -1;
-	int i;
+	int i = 0;
 	while(iTab != lastTab)
 	{
 		i = (i1 + i2) / 2;