From d519f4589dce5c7d5d3cb122437d4252d87d2f8b Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 10 Sep 2009 02:07:55 +0000 Subject: [PATCH] * 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 | 1 - aegisub/src/audio_player_alsa.cpp | 1 - aegisub/src/audio_player_alsa.h | 1 - aegisub/src/audio_player_dsound.h | 1 - aegisub/src/audio_player_openal.cpp | 1 - aegisub/src/audio_player_openal.h | 1 - aegisub/src/audio_player_oss.cpp | 1 - aegisub/src/audio_player_oss.h | 1 - aegisub/src/dialog_fonts_collector.cpp | 1 - aegisub/src/main.cpp | 16 +++++++++------- aegisub/src/main.h | 23 ++++++++--------------- aegisub/src/stdwx.h | 1 + aegisub/src/video_box.cpp | 1 - 13 files changed, 18 insertions(+), 32 deletions(-) diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index 826ca7f35..b57eddaed 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -45,7 +45,6 @@ #include #include "audio_display.h" #include "audio_provider_stream.h" -#include "main.h" #include "ass_dialogue.h" #include "subs_grid.h" #include "ass_file.h" diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp index a434aa095..e09ca0968 100644 --- a/aegisub/src/audio_player_alsa.cpp +++ b/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" diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h index 7c57b0a0b..70c907137 100644 --- a/aegisub/src/audio_player_alsa.h +++ b/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 #include "options.h" diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h index 72084abda..43a4da91f 100644 --- a/aegisub/src/audio_player_dsound.h +++ b/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 #include diff --git a/aegisub/src/audio_player_openal.cpp b/aegisub/src/audio_player_openal.cpp index fac7ec432..9dd05c8a6 100644 --- a/aegisub/src/audio_player_openal.cpp +++ b/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" diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h index c7284cf61..25f07b4d7 100644 --- a/aegisub/src/audio_player_openal.h +++ b/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" diff --git a/aegisub/src/audio_player_oss.cpp b/aegisub/src/audio_player_oss.cpp index b73ff1c0a..b4fc3c3db 100644 --- a/aegisub/src/audio_player_oss.cpp +++ b/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" diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h index ccf9398d7..fea6a5987 100644 --- a/aegisub/src/audio_player_oss.h +++ b/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" diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index 02c070bdb..fbc890e72 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/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" diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp index 9e877ebe0..ba6017ac1 100644 --- a/aegisub/src/main.cpp +++ b/aegisub/src/main.cpp @@ -39,15 +39,17 @@ // Includes #include "config.h" -#include +#ifndef WX_PRE #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#endif #include "main.h" #include "frame_main.h" diff --git a/aegisub/src/main.h b/aegisub/src/main.h index 68d3e1cb5..a29a7db58 100644 --- a/aegisub/src/main.h +++ b/aegisub/src/main.h @@ -35,18 +35,16 @@ /// -#ifndef MAIN_H - -/// DOCME -#define MAIN_H - - /////////////////// // Include headers -#include + +#ifndef WX_PRE #include -#include #include +#include +#include +#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 - - +#endif // wxUSE_STACKWALKER diff --git a/aegisub/src/stdwx.h b/aegisub/src/stdwx.h index 64d2e4f25..f4d3ff299 100644 --- a/aegisub/src/stdwx.h +++ b/aegisub/src/stdwx.h @@ -49,6 +49,7 @@ // Setup #define WIN32_LEAN_AND_MEAN +#define WX_PRE #include "config.h" diff --git a/aegisub/src/video_box.cpp b/aegisub/src/video_box.cpp index ae794d165..9d22a70a5 100644 --- a/aegisub/src/video_box.cpp +++ b/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"