From 9f5d3e7a6e21d05436fed1bcb6d044c664fb9a67 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sun, 9 Mar 2008 17:25:12 +0000
Subject: [PATCH] More stuff in subs lib.

Originally committed to SVN as r1991.
---
 aegilib/aegilib.vcproj                           |  8 ++++----
 aegilib/include/aegilib/aegilib.h                |  2 +-
 aegilib/include/aegilib/{time.h => aegitime.h}   |  0
 aegilib/include/aegilib/section_entry_dialogue.h | 15 ++++++++-------
 aegisub/setup.cpp                                |  6 ++++--
 5 files changed, 17 insertions(+), 14 deletions(-)
 rename aegilib/include/aegilib/{time.h => aegitime.h} (100%)

diff --git a/aegilib/aegilib.vcproj b/aegilib/aegilib.vcproj
index a0138d596..b3f8d8fc8 100644
--- a/aegilib/aegilib.vcproj
+++ b/aegilib/aegilib.vcproj
@@ -167,6 +167,10 @@
 				RelativePath=".\include\aegilib\aegistring.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\aegilib\aegitime.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\aegilib\controller.h"
 				>
@@ -211,10 +215,6 @@
 				RelativePath=".\include\aegilib\section_entry_dialogue.h"
 				>
 			</File>
-			<File
-				RelativePath=".\include\aegilib\time.h"
-				>
-			</File>
 			<File
 				RelativePath=".\include\aegilib\view.h"
 				>
diff --git a/aegilib/include/aegilib/aegilib.h b/aegilib/include/aegilib/aegilib.h
index c456871de..62b95d9b2 100644
--- a/aegilib/include/aegilib/aegilib.h
+++ b/aegilib/include/aegilib/aegilib.h
@@ -46,7 +46,7 @@
 #include "manipulator.h"
 #include "section.h"
 #include "section_entry_dialogue.h"
-#include "time.h"
+#include "aegitime.h"
 
 
 //////////
diff --git a/aegilib/include/aegilib/time.h b/aegilib/include/aegilib/aegitime.h
similarity index 100%
rename from aegilib/include/aegilib/time.h
rename to aegilib/include/aegilib/aegitime.h
diff --git a/aegilib/include/aegilib/section_entry_dialogue.h b/aegilib/include/aegilib/section_entry_dialogue.h
index 6c96f4861..5e1a4f529 100644
--- a/aegilib/include/aegilib/section_entry_dialogue.h
+++ b/aegilib/include/aegilib/section_entry_dialogue.h
@@ -36,7 +36,7 @@
 
 #pragma once
 #include "exception.h"
-#include "time.h"
+#include "aegitime.h"
 #include "section_entry.h"
 
 
@@ -45,7 +45,8 @@ namespace Aegilib {
 	// Dialogue class
 	class SectionEntryDialogue : public SectionEntry {
 	private:
-		void ThrowUnsupported() const { throw Exception(Exception::Unsupported_Format_Feature); }
+		const static bool dodgeWarning = true;
+		void ThrowUnsupported() const { if (dodgeWarning) throw Exception(Exception::Unsupported_Format_Feature); }
 
 	public:
 		// Destructor
@@ -64,11 +65,11 @@ namespace Aegilib {
 		virtual bool HasMargins() const { return false; }
 
 		// Read accessors
-		virtual String GetText() const { ThrowUnsupported(); }
-		virtual Time GetStartTime() const { ThrowUnsupported(); }
-		virtual Time GetEndTime() const { ThrowUnsupported(); }
-		virtual int GetStartFrame() const { ThrowUnsupported(); }
-		virtual int GetEndFrame() const { ThrowUnsupported(); }
+		virtual String GetText() const { ThrowUnsupported(); return L""; }
+		virtual Time GetStartTime() const { ThrowUnsupported(); return 0; }
+		virtual Time GetEndTime() const { ThrowUnsupported(); return 0; }
+		virtual int GetStartFrame() const { ThrowUnsupported(); return 0; }
+		virtual int GetEndFrame() const { ThrowUnsupported(); return 0; }
 
 		// Write acessors
 		virtual void SetText(String text) { (void) text; ThrowUnsupported(); }
diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp
index c1fd767a5..1472f3b52 100644
--- a/aegisub/setup.cpp
+++ b/aegisub/setup.cpp
@@ -164,13 +164,15 @@
 // FreeType2
 #ifdef WITH_FREETYPE2
 #ifdef __WXDEBUG__
-//#pragma comment(lib,"freetype233MT_D.lib")
+#ifdef FT2_LIB_DEBUG
 #pragma comment(lib,FT2_LIB_DEBUG)
+#endif
 #else
-//#pragma comment(lib,"freetype233MT.lib")
+#ifdef FT2_LIB_RELEASE
 #pragma comment(lib,FT2_LIB_RELEASE)
 #endif
 #endif
+#endif
 
 
 ///////////////