From d4e43f93ca8598393466ebe0e6befc3fd874bcff Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 21 May 2011 17:48:15 +0000 Subject: [PATCH] theide: fixed Bug #31: TheIDE menu losing focus when building git-svn-id: svn://ultimatepp.org/upp/trunk@3440 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Convert.h | 10 +++++----- uppsrc/ide/Build.cpp | 1 + uppsrc/ide/idewin.cpp | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uppsrc/Core/Convert.h b/uppsrc/Core/Convert.h index ee2745af5..9e38184de 100644 --- a/uppsrc/Core/Convert.h +++ b/uppsrc/Core/Convert.h @@ -70,11 +70,11 @@ const ConvertInt& StdConvertInt(); const ConvertInt& StdConvertIntNotNull(); struct ConvertInt64 : public ConvertInt { - ConvertInt& MinMax(int64 _min, int64 _max) { minval = _min; maxval = _max; return *this; } - ConvertInt& Min(int64 _min) { minval = _min; return *this; } - ConvertInt& Max(int64 _max) { maxval = _max; return *this; } - int64 GetMin() const { return minval; } - int64 GetMax() const { return maxval; } + ConvertInt64& MinMax(int64 _min, int64 _max) { minval = _min; maxval = _max; return *this; } + ConvertInt64& Min(int64 _min) { minval = _min; return *this; } + ConvertInt64& Max(int64 _max) { maxval = _max; return *this; } + int64 GetMin() const { return minval; } + int64 GetMax() const { return maxval; } #ifdef flagSO ConvertInt64(int64 minval = -INT64_MAX, int64 maxval = INT64_MAX, bool notnull = false); diff --git a/uppsrc/ide/Build.cpp b/uppsrc/ide/Build.cpp index f21148e15..4e73f76d0 100644 --- a/uppsrc/ide/Build.cpp +++ b/uppsrc/ide/Build.cpp @@ -66,6 +66,7 @@ void Ide::EndBuilding(bool ok) BeepMuteInformation(); else BeepMuteExclamation(); + ShowConsole(); } void Ide::DoBuild() diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp index fd55b4597..fab692c53 100644 --- a/uppsrc/ide/idewin.cpp +++ b/uppsrc/ide/idewin.cpp @@ -221,7 +221,6 @@ void Ide::Serialize(Stream& s) { void Ide::PutConsole(const char *s) { - ShowConsole(); console << s << "\n"; }