From 39701cf46c38dccd38e8e39b07dcdb423152226f Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 10 Sep 2009 13:09:05 +0000 Subject: [PATCH] CtrlLib: Fixed minor issue in TabCtrl, PGSQL: Fixed minor encoding problem git-svn-id: svn://ultimatepp.org/upp/trunk@1569 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/TabCtrl.cpp | 3 +++ uppsrc/PostgreSQL/PostgreSQL.cpp | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/uppsrc/CtrlLib/TabCtrl.cpp b/uppsrc/CtrlLib/TabCtrl.cpp index 89e1f2cf4..9494848b6 100644 --- a/uppsrc/CtrlLib/TabCtrl.cpp +++ b/uppsrc/CtrlLib/TabCtrl.cpp @@ -133,7 +133,10 @@ void TabCtrl::Layout() tabs.TopPos(0, th + style->sel.bottom) .HSizePos(0, style->sel.left + style->sel.right); SyncTabs(); + if(tab.GetCount() && tab.Top().Right() < TabsRight()) + x0 = 0; SyncHot(); + ScrollInto(sel); pane.VSizePos(style->tabheight + style->edge.top, style->edge.bottom) .HSizePos(style->edge.left, style->edge.right); left.LeftPos(0, 16).TopPos(th - 16, 16); diff --git a/uppsrc/PostgreSQL/PostgreSQL.cpp b/uppsrc/PostgreSQL/PostgreSQL.cpp index 9ef4b0ef7..f950eb348 100644 --- a/uppsrc/PostgreSQL/PostgreSQL.cpp +++ b/uppsrc/PostgreSQL/PostgreSQL.cpp @@ -155,8 +155,6 @@ bool PostgreSQLPerformScript(const String& txt, StatementExecutor& se, Gate2= 0) - return PQerrorMessage(conn); return FromCharset(PQerrorMessage(conn)); } @@ -327,8 +325,8 @@ bool PostgreSQLSession::Open(const char *connect) Close(); conn = PQconnectdb(connect); if(PQstatus(conn) != CONNECTION_OK) - { - SetError(ErrorMessage(), "Opening database"); + { + SetError(FromSystemCharset(PQerrorMessage(conn)), "Opening database"); Close(); return false; }