mantarimay
/
Aegisub
forked from mia/Aegisub
1
0
Fork 0
Code Pull Requests Activity

VC 2005 compatibility stuff 

Originally committed to SVN as r12.
This commit is contained in:
Rodrigo Braz Monteiro 2006-01-19 01:42:39 +00:00
parent d44ddb3bf2
commit 6935e56b3d
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/ass_file.cpp
View File

@ -36,6 +36,8 @@
////////////
// Includes
#include <list>
#include <fstream>
#include "ass_file.h"
#include "ass_dialogue.h"
#include "ass_style.h"
@ -46,7 +48,6 @@
#include "text_file_reader.h"
#include "text_file_writer.h"
#include "version.h"
#include <fstream>
////////////////////// AssFile //////////////////////
@ -482,7 +483,7 @@ void AssFile::SaveSRT (wxString _filename,const wxString encoding) {
void AssFile::DialogueToSRT(AssDialogue *current,std::list<AssEntry*>::iterator prev) {
using std::list;
AssDialogue *previous;
if (prev != NULL) previous = AssEntry::GetAsDialogue(*prev);
if (prev != Line.end()) previous = AssEntry::GetAsDialogue(*prev);
else previous = NULL;
// Strip ASS tags
@ -522,7 +523,7 @@ void AssFile::DialogueToSRT(AssDialogue *current,std::list<AssEntry*>::iterator
void AssFile::ConvertToSRT () {
using std::list;
list<AssEntry*>::iterator next;
list<AssEntry*>::iterator prev = NULL;
list<AssEntry*>::iterator prev = Line.end();
// Sort lines
Line.sort(LessByPointedToValue<AssEntry>());
@ -702,7 +703,7 @@ void AssFile::InsertStyle (AssStyle *style) {
// Variables
using std::list;
AssEntry *curEntry;
list<AssEntry*>::iterator lastStyle = NULL;
list<AssEntry*>::iterator lastStyle = Line.end();
list<AssEntry*>::iterator cur;
int lasttime;
wxString lastGroup;
@ -718,7 +719,7 @@ void AssFile::InsertStyle (AssStyle *style) {
}
// No styles found, add them
if (lastStyle == NULL) {
if (lastStyle == Line.end()) {
// Add space
curEntry = new AssEntry(_T(""));
curEntry->group = lastGroup;

1
core/dialog_search_replace.cpp
View File

@ -36,6 +36,7 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/regex.h>
#include "dialog_search_replace.h"
#include "ass_file.h"

1
core/dialog_selection.cpp
View File

@ -36,6 +36,7 @@
///////////
// Headers
#include <wx/wxprec.h>
#include <wx/regex.h>
#include "dialog_selection.h"
#include "subs_grid.h"

7
core/main.cpp
View File

@ -34,6 +34,13 @@
//
////////////////////////////
// Enable XP-style controls
//#if defined(__WXMSW__) && !defined(__WXWINCE__)
//#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
//#endif
////////////
// Includes
#include <wx/wxprec.h>