* 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.
This commit is contained in:
Amar Takhar 2009-09-10 02:07:55 +00:00
parent 1a4e7375fd
commit d519f4589d
13 changed files with 18 additions and 32 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -39,15 +39,17 @@
// Includes // Includes
#include "config.h" #include "config.h"
#include <wx/wxprec.h> #ifndef WX_PRE
#include <wx/config.h> #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/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 "main.h"
#include "frame_main.h" #include "frame_main.h"

View file

@ -35,18 +35,16 @@
/// ///
#ifndef MAIN_H
/// DOCME
#define MAIN_H
/////////////////// ///////////////////
// Include headers // Include headers
#include <wx/wxprec.h>
#ifndef WX_PRE
#include <wx/app.h> #include <wx/app.h>
#include <wx/stackwalk.h>
#include <wx/file.h> #include <wx/file.h>
#include <wx/stackwalk.h>
#include <wx/wxprec.h>
#endif
#include "aegisublocale.h" #include "aegisublocale.h"
@ -139,9 +137,4 @@ public:
~StackWalker(); ~StackWalker();
void OnStackFrame(const wxStackFrame& frame); void OnStackFrame(const wxStackFrame& frame);
}; };
#endif #endif // wxUSE_STACKWALKER
#endif

View file

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

View file

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