From a16c8ed83871470c4fb2a8461151e0f076bdee0e Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Wed, 2 Sep 2009 08:23:18 +0000 Subject: [PATCH] Add parentheses to silence warning. (and for clarity) Originally committed to SVN as r3458. --- aegisub/src/dialog_detached_video.cpp | 2 +- aegisub/src/idle_field_event.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp index 068d9188f..898de9a71 100644 --- a/aegisub/src/dialog_detached_video.cpp +++ b/aegisub/src/dialog_detached_video.cpp @@ -69,7 +69,7 @@ DialogDetachedVideo::DialogDetachedVideo(FrameMain *par, const wxSize &initialDi if (Options.AsBool(_T("Detached video maximized"))) Maximize(); // Set obscure stuff - SetExtraStyle(GetExtraStyle() & (~wxWS_EX_BLOCK_EVENTS) | wxWS_EX_PROCESS_UI_UPDATES); + SetExtraStyle((GetExtraStyle() & ~wxWS_EX_BLOCK_EVENTS) | wxWS_EX_PROCESS_UI_UPDATES); // Set title wxFileName fn(VideoContext::Get()->videoName); diff --git a/aegisub/src/idle_field_event.cpp b/aegisub/src/idle_field_event.cpp index b0ed2c17b..9c697a8bf 100644 --- a/aegisub/src/idle_field_event.cpp +++ b/aegisub/src/idle_field_event.cpp @@ -137,7 +137,7 @@ void IdleFieldHandler::SetFocus() { /// void IdleFieldHandler::KillFocus() { bool modify = false; - if (text && text->GetValue().IsEmpty() || box && box->GetValue().IsEmpty()) modify = true; + if (text && (text->GetValue().IsEmpty() || box) && box->GetValue().IsEmpty()) modify = true; if (modify) { // Prepare