* Remove main.h from files that don't require it.

* Remove include guard in main.h as it's no longer required.
 * Sort wx headers and wrap with #ifndef WX_PRE.
 * Add #define WX_PRE to stdwx.h.

Originally committed to SVN as r3502.

aegisub/src/audio_display.cpp

@@ -45,7 +45,6 @@
 #include <vector>
 #include "audio_display.h"
 #include "audio_provider_stream.h"
-#include "main.h"
 #include "ass_dialogue.h"
 #include "subs_grid.h"
 #include "ass_file.h"

aegisub/src/audio_player_alsa.cpp

@@ -46,7 +46,6 @@
 #include "audio_player_manager.h"
 #include "audio_provider_manager.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include "audio_player_alsa.h"
 #include "options.h"

aegisub/src/audio_player_alsa.h

@@ -44,7 +44,6 @@
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include <alsa/asoundlib.h>
 #include "options.h"

aegisub/src/audio_player_dsound.h

@@ -43,7 +43,6 @@
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include <mmsystem.h>
 #include <dsound.h>

aegisub/src/audio_player_openal.cpp

@@ -46,7 +46,6 @@
 #include "audio_player_manager.h"
 #include "audio_provider_manager.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include "audio_player_openal.h"
 #include "options.h"

aegisub/src/audio_player_openal.h

@@ -44,7 +44,6 @@
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include "audio_player_manager.h"
 #include "options.h"

aegisub/src/audio_player_oss.cpp

@@ -43,7 +43,6 @@
 #include "audio_player_manager.h"
 #include "audio_provider_manager.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include "audio_player_oss.h"
 #include "options.h"

aegisub/src/audio_player_oss.h

@@ -54,7 +54,6 @@
 #include "include/aegisub/audio_player.h"
 #include "include/aegisub/audio_provider.h"
 #include "utils.h"
-#include "main.h"
 #include "frame_main.h"
 #include "options.h"
 

aegisub/src/dialog_fonts_collector.cpp

@@ -53,7 +53,6 @@
 #include "options.h"
 #include "frame_main.h"
 #include "subs_grid.h"
-#include "main.h"
 #include "font_file_lister.h"
 #include "utils.h"
 #include "help_button.h"

aegisub/src/main.cpp

@@ -39,15 +39,17 @@
 // Includes
 #include "config.h"
 
-#include <wx/wxprec.h>
+#ifndef WX_PRE
 #include <wx/config.h>
-#include <wx/filename.h>
-#include <wx/msgdlg.h>
-#include <wx/mimetype.h>
-#include <wx/utils.h>
-#include <wx/stdpaths.h>
-#include <wx/filefn.h>
 #include <wx/datetime.h>
+#include <wx/filefn.h>
+#include <wx/filename.h>
+#include <wx/mimetype.h>
+#include <wx/msgdlg.h>
+#include <wx/stdpaths.h>
+#include <wx/utils.h>
+#include <wx/wxprec.h>
+#endif
 
 #include "main.h"
 #include "frame_main.h"

aegisub/src/main.h

@@ -35,18 +35,16 @@
 ///
 
 
-#ifndef MAIN_H
-
-/// DOCME
-#define MAIN_H
-
-
 ///////////////////
 // Include headers
-#include <wx/wxprec.h>
+
+#ifndef WX_PRE
 #include <wx/app.h>
-#include <wx/stackwalk.h>
 #include <wx/file.h>
+#include <wx/stackwalk.h>
+#include <wx/wxprec.h>
+#endif
+
 #include "aegisublocale.h"
 
 
@@ -101,7 +99,7 @@ public:
 	bool OnInit();
 	int OnExit();
 	int OnRun();
-	
+
 #ifdef __WXMAC__
 	// Apple events
 	virtual void MacOpenFile(const wxString &filename);
@@ -139,9 +137,4 @@ public:
 	~StackWalker();
 	void OnStackFrame(const wxStackFrame& frame);
 };
-#endif
+#endif // wxUSE_STACKWALKER
-
-
-#endif
-
-

aegisub/src/stdwx.h

@@ -49,6 +49,7 @@
 // Setup
 #define WIN32_LEAN_AND_MEAN
 
+#define WX_PRE
 
 #include "config.h"
 

aegisub/src/video_box.cpp

@@ -59,7 +59,6 @@
 #include "vfr.h"
 #include "subs_edit_box.h"
 #include "utils.h"
-#include "main.h"
 #include "toggle_bitmap.h"
 #include "visual_tool.h"
 #include "help_button.h"