From 0d7b2c6e76a75b367fefbd88451088ca0a8a264e Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 8 Jan 2011 12:10:40 +0000
Subject: [PATCH] Add missing headers when not using precompiled header
 support.  Some minor formatting in libaegisub/common/hotkey.cpp.

Originally committed to SVN as r5135.
---
 aegisub/libaegisub/common/hotkey.cpp | 8 ++++++--
 aegisub/src/command/app.cpp          | 1 +
 aegisub/src/command/command.h        | 9 +++++++++
 aegisub/src/command/help.cpp         | 1 +
 aegisub/src/command/icon.cpp         | 2 ++
 aegisub/src/command/keyframe.cpp     | 1 +
 aegisub/src/command/subtitle.cpp     | 1 +
 aegisub/src/command/time.cpp         | 1 +
 aegisub/src/frame_main.cpp           | 1 +
 9 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp
index 847d73d9c..d9a87bb85 100644
--- a/aegisub/libaegisub/common/hotkey.cpp
+++ b/aegisub/libaegisub/common/hotkey.cpp
@@ -26,11 +26,15 @@
 #include <memory>
 #endif
 
+#include "libaegisub/hotkey.h"
+
 #include "libaegisub/access.h"
+#include "libaegisub/cajun/writer.h"
+#include "libaegisub/exception.h"
 #include "libaegisub/io.h"
 #include "libaegisub/json.h"
 #include "libaegisub/log.h"
-#include "libaegisub/hotkey.h"
+
 
 namespace agi {
 	namespace hotkey {
@@ -67,7 +71,7 @@ Hotkey::Hotkey(const std::string &file, const std::string &default_config):
     try {
 		stream = agi::io::Open(config_file);
 	} catch (const acs::AcsNotFound&) {
-stream = new std::istringstream(config_default);
+		stream = new std::istringstream(config_default);
     }
 
 
diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp
index b345dd53b..2231f282c 100644
--- a/aegisub/src/command/app.cpp
+++ b/aegisub/src/command/app.cpp
@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/msgdlg.h>
 #endif
 
 #include "command.h"
diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h
index db7fe8f41..d3bcf76b4 100644
--- a/aegisub/src/command/command.h
+++ b/aegisub/src/command/command.h
@@ -18,9 +18,18 @@
 /// @brief Command base class and main header.
 /// @ingroup command
 
+
+#ifndef AGI_PRE
+#include <map>
+#endif
+
+#include <libaegisub/exception.h>
+
 #include "../include/aegisub/context.h"
 #include "icon.h"
 
+
+
 DEFINE_BASE_EXCEPTION_NOINNER(CommandError, agi::Exception)
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconNone, CommandError, "command/icon")
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconInvalid, CommandError, "command/icon/invalid")
diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp
index 9982df193..d6a421a56 100644
--- a/aegisub/src/command/help.cpp
+++ b/aegisub/src/command/help.cpp
@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/msgdlg.h>
 #endif
 
 #include "command.h"
diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp
index dff538538..d02bbadc7 100644
--- a/aegisub/src/command/icon.cpp
+++ b/aegisub/src/command/icon.cpp
@@ -20,6 +20,8 @@
 
 
 #ifndef AGI_PRE
+#include <map>
+
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/mstream.h>
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index b361b24b9..71e301e2c 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/filedlg.h>
 #endif
 
 #include "command.h"
diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index 527021028..5078a7eb7 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <wx/filename.h>
 #include <wx/filedlg.h>
 #include <wx/choicdlg.h>
 #endif
diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp
index 60b52fec1..653b2264c 100644
--- a/aegisub/src/command/time.cpp
+++ b/aegisub/src/command/time.cpp
@@ -39,6 +39,7 @@
 #include "../config.h"
 
 #ifndef AGI_PRE
+#include <algorithm>
 #endif
 
 #include "command.h"
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index f3ccf7292..594f3ac29 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #ifndef AGI_PRE
+#include <wx/clipbrd.h>
 #include <wx/filename.h>
 #include <wx/image.h>
 #include <wx/mimetype.h>