From 49abae269817597377d38d06631e3592f7062866 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 16 May 2010 07:06:08 +0000
Subject: [PATCH] Fix a merge conflict and some newline issues

Originally committed to SVN as r4290.
---
 aegisub/src/video_display.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 96bad8454..8749ae16c 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -131,13 +131,13 @@ VideoDisplay::VideoDisplay(VideoBox *box, VideoSlider *ControlSlider, wxTextCtrl
 , SubsPosition(SubsPosition)
 , PositionDisplay(PositionDisplay)
 , videoOut(new VideoOutGL())
-, box(box)
-, freeSize(false)
 , tool(new VisualToolCross(this, video, box->visualSubToolBar))
 , activeMode(Video_Mode_Standard)
 , toolBar(box->visualSubToolBar)
 , scriptW(INT_MIN)
 , scriptH(INT_MIN)
+, box(box)
+, freeSize(false)
 {
 	box->Bind(wxEVT_COMMAND_TOOL_CLICKED, &VideoDisplay::OnMode, this, Video_Mode_Standard, Video_Mode_Vector_Clip);
 	SetCursor(wxNullCursor);
@@ -469,15 +469,7 @@ void VideoDisplay::OnMouseEvent(wxMouseEvent& event) {
 		return;
 	}
 
-<<<<<<< HEAD
-	// Enforce correct cursor display
-	ShowCursor(visualMode != 0);
-
-	// Click?
 	if (event.ButtonDown(wxMOUSE_BTN_ANY)) {
-=======
-	if (event.ButtonDown(wxMOUSE_BTN_ANY) || Options.AsBool(L"Video Autofocus")) {
->>>>>>> b1a392b... Make visual tools use only screen coordinates.
 		SetFocus();
 	}
 	int wheel = event.GetWheelRotation();