mirror of https://github.com/odrling/Aegisub
parent
8a7fc29c5d
commit
f64d5341ce
|
@ -47,7 +47,7 @@
|
||||||
///////////////
|
///////////////
|
||||||
// Constructor
|
// Constructor
|
||||||
BrowseButton::BrowseButton(wxWindow *parent,int id,wxString text,BrowseType _type,wxPoint position,wxSize size)
|
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;
|
type = _type;
|
||||||
ctrl[0] = NULL;
|
ctrl[0] = NULL;
|
||||||
|
|
|
@ -33,8 +33,6 @@
|
||||||
// Contact: mailto:zeratul@cellosoft.com
|
// Contact: mailto:zeratul@cellosoft.com
|
||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
///////////
|
///////////
|
||||||
// Headers
|
// Headers
|
||||||
#include <wx/intl.h>
|
#include <wx/intl.h>
|
||||||
|
|
|
@ -110,7 +110,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) {
|
||||||
CloseHandle(ifile);
|
CloseHandle(ifile);
|
||||||
#else
|
#else
|
||||||
ifstream ifile;
|
ifstream ifile;
|
||||||
ifile.open(wxFNCONV(_filename).c_str());
|
ifile.open(wxFNCONV(_filename));
|
||||||
if (!ifile.is_open()) {
|
if (!ifile.is_open()) {
|
||||||
return _T("unknown");
|
return _T("unknown");
|
||||||
}
|
}
|
||||||
|
@ -279,7 +279,7 @@ void TextFileReader::Open() {
|
||||||
throw _T("Failed opening file for reading.");
|
throw _T("Failed opening file for reading.");
|
||||||
}
|
}
|
||||||
#else
|
#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()) {
|
if (!file.is_open()) {
|
||||||
throw _T("Failed opening file for reading.");
|
throw _T("Failed opening file for reading.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue