Some tweaks to help Linux compatibility

Originally committed to SVN as r124.

core/avisynth_wrap.cpp

@@ -37,6 +37,8 @@
 ////////////
 // Includes
 #include "avisynth_wrap.h"
+
+#ifdef __WINDOWS__
 #include "options.h"
 
 ///////////////////////////////
@@ -86,3 +88,5 @@ AviSynthWrapper::~AviSynthWrapper() {
 		FreeLibrary(hLib);
 	}
 }
+
+#endif

core/avisynth_wrap.h

@@ -40,10 +40,13 @@
 
 ///////////
 // Headers
-#include <windows.h>
 #include <wx/wxprec.h>
+
+#ifdef __WINDOWS__
+#include <windows.h>
 #include "avisynth.h"
 
+
 //////////////////////////////////
 // Typedef to make my life easier
 typedef IScriptEnvironment* __stdcall FUNC(int);
@@ -65,3 +68,4 @@ public:
 };
 
 #endif
+#endif

core/frame_main.cpp

@@ -893,10 +893,12 @@ void FrameMain::LoadAudio(wxString filename,bool FromVideo) {
 		wxString err(error);
 		wxMessageBox(err, _T("Error opening audio file"), wxOK | wxICON_ERROR, this);
 	}
+	#ifdef __WINDOWS__ 
 	catch (AvisynthError err) {
 		wxMessageBox (wxString(_T("AviSynth error: ")) + wxString(err.msg,wxConvUTF8), _T("Error loading audio"), wxOK | wxICON_ERROR);
 		return;
 	}
+	#endif
 	catch (...) {
 		wxMessageBox(_T("Unknown error"), _T("Error opening audio file"), wxOK | wxICON_ERROR, this);
 	}

core/main.cpp

@@ -34,13 +34,6 @@
 //
 
 
-////////////////////////////
-// 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>

core/subs_grid.cpp

@@ -1056,7 +1056,7 @@ void SubtitlesGrid::SplitLine(int n,int pos,int mode) {
 //////////////////
 // Commit changes
 // --------------
-// This will save the work .ass and make avisynth refresh it
+// This will save the work .ass and refresh it
 void SubtitlesGrid::CommitChanges(bool force) {
 	if (video->loaded || force) {
 		// Check if it's playing