* Move some headers below the rest as they need wx settings that don't seem to be inited when the header is first in the list.

* Add some missing headers and reposition one from the file to header.
 * Revert r3516 as it's no longer needed.

Originally committed to SVN as r3518.

aegisub/src/aegisublocale.cpp

@@ -42,11 +42,11 @@
 #ifndef AGI_PRE
 #include <locale.h>
 
-#include <wx/choicdlg.h>
 #include <wx/dir.h>
 #include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/stdpaths.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "aegisublocale.h"

aegisub/src/audio_box.cpp

@@ -42,10 +42,10 @@
 #ifndef AGI_PRE
 #include <math.h>
 
-#include <wx/laywin.h>
 #include <wx/recguard.h>
 #include <wx/statline.h>
 #include <wx/tglbtn.h>
+#include <wx/laywin.h> // Keep this last so wxSW_3D is set.
 #endif
 
 #include "audio_box.h"

aegisub/src/audio_provider_hd.h

@@ -42,6 +42,7 @@
 // Headers
 #include "include/aegisub/audio_provider.h"
 #include <wx/file.h>
+#include <wx/thread.h>
 
 
 

aegisub/src/browse_button.cpp

@@ -40,9 +40,9 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/dirdlg.h>
 #include <wx/filedlg.h>
 #include <wx/fontdlg.h>
+#include <wx/dirdlg.h> // Keep this last so wxDirDialog is set.
 #endif
 
 #include "browse_button.h"

aegisub/src/dialog_style_manager.cpp

@@ -40,12 +40,12 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/choicdlg.h>
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/intl.h>
 #include <wx/tokenzr.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_dialogue.h"

aegisub/src/ffmpegsource_common.cpp

@@ -42,12 +42,8 @@
 // Headers
 #ifndef AGI_PRE
 #include <map>
-
-/// Force wx to use Choice Dialogue
-/// @todo Find out why this is needed.
-#define wxUSE_CHOICEDLG 1
-#include <wx/choicdlg.h>
 #include <wx/dir.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ffmpegsource_common.h"

aegisub/src/help_button.cpp

@@ -40,8 +40,6 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <map>
-
 #include <wx/filename.h>
 #include <wx/log.h>
 #include <wx/mimetype.h>

aegisub/src/help_button.h

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

aegisub/src/mkv_wrap.cpp

@@ -45,9 +45,9 @@
 
 #include <algorithm>
 
-#include <wx/choicdlg.h>
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_file.h"

aegisub/src/subtitle_format.cpp

@@ -40,8 +40,8 @@
 #include "config.h"
 
 #ifndef AGI_PRE
-#include <wx/choicdlg.h>
 #include <wx/intl.h>
+#include <wx/choicdlg.h> // Keep this last so wxUSE_CHOICEDLG is set.
 #endif
 
 #include "ass_file.h"