From 407cd603b267e86750f873d865840740b508b243 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Mon, 23 Oct 2006 22:17:27 +0000 Subject: [PATCH] Minor Linux fixes (thanks Azzy) Originally committed to SVN as r539. --- core/Makefile.am | 1 - core/ass_file.cpp | 2 +- core/video_display.cpp | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile.am b/core/Makefile.am index c5c521136..5e9ecd7e2 100644 --- a/core/Makefile.am +++ b/core/Makefile.am @@ -34,7 +34,6 @@ aegisub_SOURCES = about.cpp \ audio_provider_lavc.cpp \ audio_provider_ram.cpp \ audio_provider_stream.cpp \ - auto4_base.cpp \ automation.cpp \ automation_filter.cpp \ automation_gui.cpp \ diff --git a/core/ass_file.cpp b/core/ass_file.cpp index 7caccd9cf..33d152f7f 100644 --- a/core/ass_file.cpp +++ b/core/ass_file.cpp @@ -80,7 +80,7 @@ void AssFile::Load (const wxString _filename,const wxString charset) { #ifdef WIN32 file = _tfopen(_filename.c_str(), _T("r")); #else - file = fopen(_filrname.mb_str(wxConvFileName), "r"); + file = fopen(_filename.mb_str(*wxConvFileName), "r"); #endif if (!file) { throw _T("Unable to open file \"") + _filename + _T("\". Check if it exists and if you have permissions to read it."); diff --git a/core/video_display.cpp b/core/video_display.cpp index aa08bf0ea..8806cadb7 100644 --- a/core/video_display.cpp +++ b/core/video_display.cpp @@ -138,6 +138,7 @@ void VideoDisplay::UpdateSize() { h = provider->GetHeight(); // Set the size for this control + SetSizeHints(w,h,w,h); SetClientSize(w,h); int _w,_h; GetSize(&_w,&_h);