* Remove wxprec.h from all files other than agi_pre.h. Including this in various headers is useless as it includes wx.h which includes dozens of 'common' wx headers. With this we're unable to tell which files rely on which interfaces. This commit removes them and manually places in required headers as-needed.

* Update agi_pre.h to include some missing headers, also move required windowsheaders to the top of the list
 * Use <> versus "" for the wx header in avisynth_wrap.cpp
 * Remove xx/wx.h from agi_pre.h as it's included by wxprec.h.

Originally committed to SVN as r3513.
This commit is contained in:
Amar Takhar 2009-09-10 10:26:50 +00:00
parent 84996c927f
commit 7a8c5229fd
148 changed files with 61 additions and 143 deletions

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/intl.h>
#include <locale.h>
#include <wx/dir.h>

View file

@ -106,8 +106,14 @@
/////////////////////
// wxWidgets headers
#include <wx/wxprec.h>
#include <wx/wxprec.h> // Leave this first.
// Windows
#ifdef __WXMSW__
#include <wx/msw/registry.h>
#endif
// All platforms.
#include <wx/accel.h>
#include <wx/app.h>
#include <wx/arrstr.h>
@ -125,6 +131,7 @@
#include <wx/combobox.h>
#include <wx/config.h>
#include <wx/control.h>
#include <wx/dataobj.h>
#include <wx/datetime.h>
#include <wx/dc.h>
#include <wx/dcclient.h>
@ -154,6 +161,7 @@
#include <wx/glcanvas.h>
#include <wx/grid.h>
#include <wx/hashmap.h>
#include <wx/icon.h>
#include <wx/image.h>
#include <wx/intl.h>
#include <wx/laywin.h>
@ -165,9 +173,6 @@
#include <wx/mimetype.h>
#include <wx/msgdlg.h>
#include <wx/mstream.h>
#ifdef __WXMSW__
#include <wx/msw/registry.h>
#endif
#include <wx/notebook.h>
#include <wx/panel.h>
#include <wx/radiobox.h>
@ -207,8 +212,6 @@
#include <wx/valtext.h>
#include <wx/wfstream.h>
#include <wx/window.h>
#include <wx/wx.h>
#include <wx/wxprec.h>
#include <wx/xml/xml.h>
#include <wx/zipstrm.h>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include "include/aegisub/exception.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/window.h>
#include <list>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/sizer.h>
#include <wx/arrstr.h>

View file

@ -40,11 +40,10 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <fstream>
#include <list>
#include <vector>
#include <wx/arrstr.h>
//////////////
// Prototypes

View file

@ -43,7 +43,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/arrstr.h>
#include <list>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include <stdint.h>

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/panel.h>
#include <wx/menu.h>

View file

@ -43,9 +43,9 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/window.h>
#include <wx/bitmap.h>
#include <wx/scrolbar.h>
#include <stdint.h>
#include "audio_provider_manager.h"
#include "audio_player_manager.h"

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/window.h>
#include <wx/log.h>
#include <wx/menu.h>

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include "audio_player_manager.h"
#include "options.h"
#ifdef WITH_ALSA

View file

@ -42,7 +42,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "audio_player_manager.h"
#include "audio_provider_manager.h"
#include "utils.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"

View file

@ -41,7 +41,6 @@
#ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h>
#include "utils.h"
#include "main.h"
#include "frame_main.h"

View file

@ -39,7 +39,6 @@
// Headers
#ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h>
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"

View file

@ -41,7 +41,6 @@
#ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h>
#include <mmsystem.h>
#include <dsound.h>
#include <process.h>

View file

@ -37,7 +37,6 @@
#ifdef WITH_DIRECTSOUND
#include <wx/wxprec.h>
#include "include/aegisub/audio_player.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/event.h>
#include <wx/timer.h>
#include <wx/thread.h>

View file

@ -42,7 +42,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "audio_player_manager.h"
#include "audio_provider_manager.h"
#include "utils.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"
#include "utils.h"

View file

@ -39,7 +39,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "audio_player_manager.h"
#include "audio_provider_manager.h"
#include "utils.h"

View file

@ -41,7 +41,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#ifdef HAVE_SOUNDCARD_H

View file

@ -42,7 +42,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <stdio.h>
#include "audio_player_pulse.h"
#include "audio_provider_manager.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <stdio.h>
#include "include/aegisub/audio_player.h"
#include "include/aegisub/audio_provider.h"

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/thread.h>
#include "audio_provider_ram.h"
#include "audio_provider_hd.h"

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#ifdef WITH_AVISYNTH
#include <wx/filename.h>
#include <Mmreg.h>

View file

@ -37,7 +37,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#ifdef WITH_AVISYNTH
#include <Mmreg.h>
#include "include/aegisub/audio_provider.h"

View file

@ -36,7 +36,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#ifdef WITH_FFMPEGSOURCE
#include "include/aegisub/audio_provider.h"
#include "ffmpegsource_common.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <stdint.h>
#include "factory_manager.h"
#include "include/aegisub/audio_provider.h"

View file

@ -40,7 +40,6 @@
#include "quicktime_common.h"
#ifdef WITH_QUICKTIME
#include <wx/wxprec.h>
#include <wx/log.h>
#include "include/aegisub/audio_provider.h"

View file

@ -42,7 +42,6 @@
/// Include guard for audio_spectrum.h
#define AUDIO_SPECTRUM_H
#include <wx/wxprec.h>
#include <stdint.h>
#include "audio_provider_manager.h"

View file

@ -63,6 +63,7 @@
#include <wx/filename.h>
#include <wx/filefn.h>
#include <wx/window.h>
#include <wx/log.h>
#include <assert.h>
#include <algorithm>

View file

@ -53,6 +53,7 @@
#include "lauxlib.h"
#endif
#include <wx/log.h>
#include <assert.h>
#include <algorithm>

View file

@ -57,6 +57,11 @@
#include <wx/button.h>
#include <wx/validate.h>
#include <wx/tokenzr.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/log.h>
#include <wx/panel.h>
#include <assert.h>
#include "colour_button.h"
#include "ass_style.h"

View file

@ -36,7 +36,8 @@
#pragma once
#include <wx/wxprec.h>
#include <wx/string.h>
#ifdef __WINDOWS__
#include "../../contrib/lua51/src/lua.h"
#else

View file

@ -46,7 +46,7 @@
#ifdef DEBUG_AVISYNTH_CODE
#include "main.h"
#include "wx/textfile.h"
#include <wx/textfile.h>
/// DOCME
wxTextFile avs_trace_file;

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#ifdef WITH_AVISYNTH
#include <windows.h>

View file

@ -40,8 +40,8 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/grid.h>
#include <wx/scrolbar.h>
#include <list>
#include <vector>

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/button.h>
#include <wx/textctrl.h>

View file

@ -41,7 +41,6 @@
#ifdef WITH_UNIVCHARDET
#include <list>
#include <wx/wxprec.h>
#include <wx/intl.h>
#include <wx/choicdlg.h>

View file

@ -39,7 +39,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "../universalchardet/nsUniversalDetector.h"

View file

@ -39,7 +39,6 @@
/// DOCME
#define COLORSPACE_H
#include <wx/wxprec.h>
#include <wx/colour.h>
#include <wx/string.h>

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/bmpbuttn.h>

View file

@ -43,6 +43,8 @@
#include <wx/stattext.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/panel.h>
#include <wx/textctrl.h>
#include "dialog_about.h"
#include "version.h"
#include "options.h"

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include "static_bmp.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/checklst.h>
#include <wx/slider.h>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
//////////////

View file

@ -48,6 +48,7 @@
#include <wx/dcscreen.h>
#include <wx/settings.h>
#include <wx/clipbrd.h>
#include <wx/dataobj.h>
#include "dialog_colorpicker.h"
#include "colorspace.h"
#include "ass_style.h"

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/filename.h>
#include "dialog_detached_video.h"
#include "video_box.h"

View file

@ -45,6 +45,7 @@
#include <wx/spinctrl.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/textctrl.h>
#include "video_provider_dummy.h"
#include "colour_button.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/sizer.h>
#include <wx/string.h>

View file

@ -40,9 +40,12 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/stc/stc.h>
#include <wx/button.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/dialog.h>
#include <wx/radiobox.h>
//////////////
// Prototypes

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include "ass_time.h"
#include "timeedit_ctrl.h"

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/listctrl.h>
#include <wx/regex.h>
#include <wx/checkbox.h>

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/listctrl.h>
#include <vector>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/checklst.h>

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/gauge.h>
#include <wx/stattext.h>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/string.h>
#include <wx/textctrl.h>

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/regex.h>
#include "dialog_search_replace.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/string.h>
#include <wx/combobox.h>

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/regex.h>
#include "dialog_selection.h"

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/textctrl.h>
#include <wx/checkbox.h>

View file

@ -38,7 +38,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>

View file

@ -39,7 +39,7 @@
// Includes
#include "config.h"
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/display.h>
#include <wx/dcclient.h>
#include "dialog_splash.h"

View file

@ -43,7 +43,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/frame.h>
#include <wx/timer.h>

View file

@ -43,11 +43,11 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/spinctrl.h>
#include <wx/combobox.h>
#include <wx/checkbox.h>
#include <wx/radiobox.h>
#include <wx/textctrl.h>
#include "colour_button.h"

View file

@ -43,7 +43,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/combobox.h>
#include <wx/listbox.h>

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/colour.h>
#include <wx/textctrl.h>

View file

@ -42,7 +42,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/sizer.h>
#include <wx/checkbox.h>

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/window.h>
#include <wx/msgdlg.h>
#include "dialog_tip.h"

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/settings.h>
#include "dialog_translation.h"
#include "ass_dialogue.h"

View file

@ -43,7 +43,10 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/stattext.h>
#include <wx/checkbox.h>
#include <wx/dialog.h>
#include "scintilla_text_ctrl.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dialog.h>
#include <wx/textctrl.h>
#include <wx/sizer.h>

View file

@ -39,6 +39,7 @@
// Headers
#include "config.h"
#include <wx/stattext.h>
#include "dialog_video_details.h"
#include "video_context.h"
#include "video_provider_manager.h"

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dnd.h>

View file

@ -46,6 +46,7 @@
#include <wx/button.h>
#include <wx/panel.h>
#include <wx/stattext.h>
#include <wx/checkbox.h>
#include "ass_export_filter.h"
#include "vfr.h"

View file

@ -40,8 +40,8 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/dir.h>
#include <wx/choicdlg.h>
#include "ffmpegsource_common.h"
#include "md5.h"
#include "standard_paths.h"

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/arrstr.h>
#include <map>

View file

@ -39,7 +39,6 @@
// Includes
#include "config.h"
#include <wx/wxprec.h>
#ifndef WIN32
#include "font_file_lister_fontconfig.h"
#include "charset_conv.h"

View file

@ -39,7 +39,6 @@
// Include headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/sysopt.h>
#include <wx/mimetype.h>
#include <wx/filename.h>

View file

@ -43,7 +43,6 @@
///////////////////
// Include headers
#include <wx/wxprec.h>
#include <wx/frame.h>
#include <wx/menu.h>
#include <wx/log.h>

View file

@ -39,7 +39,6 @@
// Include headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/mimetype.h>
#include <wx/filename.h>
#include <wx/tglbtn.h>

View file

@ -38,7 +38,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/bitmap.h>
#include <wx/font.h>
#ifdef __APPLE__

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/msgdlg.h>
#ifdef __APPLE__
#include <OpenGL/GL.h>

View file

@ -39,7 +39,6 @@
// Headers
#include "config.h"
#include <wx/wxprec.h>
#include <wx/mimetype.h>
#include <wx/log.h>
#include <wx/filename.h>

View file

@ -40,7 +40,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/button.h>

View file

@ -43,7 +43,6 @@
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/textctrl.h>

View file

@ -45,6 +45,7 @@
#include "text_file_writer.h"
#include <wx/filename.h>
#include <wx/accel.h>
#include <wx/log.h>

View file

@ -43,7 +43,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/string.h>
#include <wx/accel.h>
#include <map>

View file

@ -40,9 +40,9 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/event.h>
#include <wx/combobox.h>
#include <wx/textctrl.h>

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/event.h>
#include <wx/timer.h>
#include <wx/thread.h>

View file

@ -40,7 +40,6 @@
//////////
// Headers
#include <wx/wxprec.h>
#include "video_frame.h"
#include "aegisub.h"
#include "vfr.h"

View file

@ -38,7 +38,6 @@
///////////
// Headers
#include <list>
#include <wx/wxprec.h>
#include <wx/string.h>

View file

@ -48,7 +48,6 @@
#include <wx/msgdlg.h>
#include <wx/stdpaths.h>
#include <wx/utils.h>
#include <wx/wxprec.h>
#endif
#include "main.h"

View file

@ -42,7 +42,6 @@
#include <wx/app.h>
#include <wx/file.h>
#include <wx/stackwalk.h>
#include <wx/wxprec.h>
#endif
#include "aegisublocale.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <stdio.h>
#include <vector>
#include <list>

View file

@ -46,6 +46,9 @@
#include <wx/settings.h>
#include <wx/filefn.h>
#include <wx/utils.h>
#include <wx/msgdlg.h>
#include <wx/stopwatch.h>
#include "options.h"
#include "text_file_reader.h"
#include "text_file_writer.h"

View file

@ -40,7 +40,6 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <map>
#include "variable_data.h"

Some files were not shown because too many files have changed in this diff Show more