From 22a187b3107292ac5277e6e462f097617d18191d Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Thu, 8 Jun 2006 21:03:05 +0000
Subject: [PATCH] Minor stuff

Originally committed to SVN as r411.
---
 core/automation.cpp | 6 +++---
 core/base_grid.cpp  | 2 +-
 core/todo.txt       | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/automation.cpp b/core/automation.cpp
index a11349471..9e03949d8 100644
--- a/core/automation.cpp
+++ b/core/automation.cpp
@@ -297,7 +297,7 @@ namespace AutomationHelper {
 
 		wxLogDebug(_T("text_extents for: %s:%f:%d%d%d%d:%f:%f:%d:%d"), fontname.c_str(), fontsize, bold, italic, underline, strikeout, scale_x, scale_y, spacing, charset);
 
-#ifdef __WINDOWS__
+#ifdef WIN32
 		HDC thedc = CreateCompatibleDC(0);
 		if (!thedc) return 0;
 		SetMapMode(thedc, MM_TEXT);
@@ -353,7 +353,7 @@ namespace AutomationHelper {
 		DeleteObject(thedc);
 		DeleteObject(thefont);
 
-#else // not __WINDOWS__
+#else // not WIN32
 		wxMemoryDC thedc;
 
 		// fix fontsize to be 72 DPI
@@ -387,7 +387,7 @@ namespace AutomationHelper {
 			// If the inter-character spacing should be zero, kerning info can (and must) be used, so calculate everything in one go
 			thedc.GetTextExtent(intext, &resx, &resy, &resd, &resl);
 		}
-#endif
+#endif // WIN32
 
 		// Compensate for scaling
 		resx = (int)(scale_x / 100 * resx + 0.5);
diff --git a/core/base_grid.cpp b/core/base_grid.cpp
index 4c268e4e1..0e94b6aa2 100644
--- a/core/base_grid.cpp
+++ b/core/base_grid.cpp
@@ -380,7 +380,7 @@ void BaseGrid::DrawImage(wxDC &dc) {
 	for (int i=0;i<nDraw+1;i++) {
 		// Prepare
 		int curRow = i+yPos-1;
-		curDiag = GetDialogue(curRow);
+		curDiag = (curRow>=0) ? GetDialogue(curRow) : NULL;
 		dx = 0;
 		dy = i*lineHeight;
 
diff --git a/core/todo.txt b/core/todo.txt
index 6fc35a64d..d72d880fb 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -4,7 +4,6 @@
 High priority:
 
 Insert subtitles from another file, with possible shifting
-Snap subs to keyframes (req by Mentar)
 Open audio range
 
 
@@ -17,7 +16,6 @@ Advanced visual typesetting
 Audio timing assistant
 Shift times by current time
 SSA "Effects" dialog (as in, the "Effects" field in SSA standard)
-Split by karaoke (req by jfs)
 Jump to with negative values (req by jfs)
 Shift start/end by one, pushing adjascent line so they don't overlap (req by Mentar)
 Sort subs by initial time and style (req by Jcubed)
@@ -36,5 +34,4 @@ Support character set encoding by style (req by jfs)
 Semi-realtime preview of subs; refresh video if user hasn't entered text in a while (req by jfs)
 Filter list for displaying of subs by critereas (req by Jcubed)
 Multiple files support
-Motion estimation to automatically move signs
 Detachable video window (req by maxx-)