* Remove #pragma once.

* Sort wx headers and wrap with #ifndef WX_PRE.
 * Add missing heade rto stdwx.h.
M    src/ass_attachment.h
M    src/subs_grid.cpp
M    src/ass_dialogue.cpp
M    src/ass_attachment.cpp
M    src/aegisub_endian.h
M    src/audio_display.cpp
M    src/audio_karaoke.cpp
M    src/dialog_kara_timing_copy.cpp
M    src/ass_dialogue.h
M    src/text_file_writer.cpp
M    src/stdwx.h

Originally committed to SVN as r3503.

aegisub/src/aegisub_endian.h

@@ -33,13 +33,6 @@
 /// @ingroup utility
 ///
 
-#pragma once
-
-#ifndef _AEGISUB_ENDIAN_H
-
-/// DOCME
-#define _AEGISUB_ENDIAN_H
-
 
 // Sanity check
 
@@ -468,6 +461,3 @@ namespace Endian {
 
 };
 
-#endif
-
-

aegisub/src/ass_attachment.cpp

@@ -39,8 +39,11 @@
 // Includes
 #include "config.h"
 
-#include <wx/wfstream.h>
+#ifndef WX_PRE
 #include <wx/filename.h>
+#include <wx/wfstream.h>
+#endif
+
 #include "ass_attachment.h"
 
 

aegisub/src/ass_attachment.h

@@ -35,9 +35,6 @@
 ///
 
 
-#pragma once
-
-
 ///////////
 // Headers
 #include "ass_entry.h"
@@ -104,5 +101,3 @@ public:
 	AssAttachment(wxString name);
 	~AssAttachment();
 };
-
-

aegisub/src/ass_dialogue.cpp

@@ -39,9 +39,12 @@
 // Includes
 #include "config.h"
 
-#include <fstream>
+#ifndef WX_PRE
-#include <wx/tokenzr.h>
 #include <wx/regex.h>
+#include <wx/tokenzr.h>
+#endif
+
+#include <fstream>
 #include "ass_dialogue.h"
 #include "ass_override.h"
 #include "vfr.h"

aegisub/src/ass_dialogue.h

@@ -35,9 +35,6 @@
 ///
 
 
-#pragma once
-
-
 ////////////
 // Includes
 #include <vector>
@@ -294,5 +291,3 @@ public:
 	AssDialogue(wxString data,int version=1);
 	~AssDialogue();
 };
-
-

aegisub/src/audio_display.cpp

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

aegisub/src/audio_karaoke.cpp

@@ -42,7 +42,6 @@
 #include "audio_karaoke.h"
 #include "audio_display.h"
 #include "audio_box.h"
-#include "ass_dialogue.h"
 #include "ass_override.h"
 #include <wx/tokenzr.h>
 #include <wx/menu.h>

aegisub/src/dialog_kara_timing_copy.cpp

@@ -44,7 +44,6 @@
 #include <deque>
 #include "dialog_kara_timing_copy.h"
 #include "ass_file.h"
-#include "ass_dialogue.h"
 #include "ass_style.h"
 #include "ass_override.h"
 #include "subs_grid.h"

aegisub/src/stdwx.h

@@ -77,6 +77,7 @@
 #include <wx/event.h>
 #include <wx/stc/stc.h>
 #include <wx/string.h>
+#include <wx/regex.h>
 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>

aegisub/src/subs_grid.cpp

@@ -45,7 +45,6 @@
 #include <wx/filename.h>
 #include "subs_grid.h"
 #include "ass_file.h"
-#include "ass_dialogue.h"
 #include "ass_style.h"
 #include "video_display.h"
 #include "video_context.h"

aegisub/src/text_file_writer.cpp

@@ -39,7 +39,6 @@
 #include <fstream>
 #include "text_file_writer.h"
 #include "options.h"
-#include "aegisub_endian.h"
 #include "charset_conv.h"