diff --git a/aegisub/browse_button.cpp b/aegisub/browse_button.cpp index 3989606c2..b2c8d502d 100644 --- a/aegisub/browse_button.cpp +++ b/aegisub/browse_button.cpp @@ -47,7 +47,7 @@ /////////////// // Constructor BrowseButton::BrowseButton(wxWindow *parent,int id,wxString text,BrowseType _type,wxPoint position,wxSize size) -: wxButton (parent,id,text == _T("") ? _("Browse...") : text,position,size) +: wxButton (parent,id,text == wxString(_T("")) ? wxString(_("Browse...")) : text,position,size) { type = _type; ctrl[0] = NULL; diff --git a/aegisub/dialog_spellchecker.cpp b/aegisub/dialog_spellchecker.cpp index 16fa3279f..60ced470e 100644 --- a/aegisub/dialog_spellchecker.cpp +++ b/aegisub/dialog_spellchecker.cpp @@ -33,8 +33,6 @@ // Contact: mailto:zeratul@cellosoft.com // -#pragma once - /////////// // Headers #include diff --git a/aegisub/text_file_reader.cpp b/aegisub/text_file_reader.cpp index 82d6e2d8c..f1cd7e2aa 100644 --- a/aegisub/text_file_reader.cpp +++ b/aegisub/text_file_reader.cpp @@ -110,7 +110,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) { CloseHandle(ifile); #else ifstream ifile; - ifile.open(wxFNCONV(_filename).c_str()); + ifile.open(wxFNCONV(_filename)); if (!ifile.is_open()) { return _T("unknown"); } @@ -279,7 +279,7 @@ void TextFileReader::Open() { throw _T("Failed opening file for reading."); } #else - file.open(wxFNCONV(filename).c_str(),std::ios::in | std::ios::binary); + file.open(wxFNCONV(filename),std::ios::in | std::ios::binary); if (!file.is_open()) { throw _T("Failed opening file for reading."); }