Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forward port from 2.6 branch to avoid wxSTD usage crashes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-16 13:06:39 +00:00
parent 7487919e55
commit 9c9691ba24
4 changed files with 361 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -402,7 +402,7 @@ bool MyApp::OnInit()
wxString path = TexPathList.FindValidPath(MacroFile);
if (!path.empty())
ReadCustomMacros((wxChar *)path.c_str());
ReadCustomMacros(path);
#if wxUSE_STATUSBAR
wxString inStr(_T("In "));
@@ -444,7 +444,7 @@ bool MyApp::OnInit()
wxString path = TexPathList.FindValidPath(MacroFile);
if (!path.empty())
ReadCustomMacros((wxChar*)path.c_str());
ReadCustomMacros(path);
Go();
if (runTwice)
@@ -758,7 +758,7 @@ void MyFrame::OnLoadMacros(wxCommandEvent& WXUNUSED(event))
if (!s.empty() && wxFileExists(s))
{
MacroFile = copystring(s);
ReadCustomMacros((wxChar *)s.c_str());
ReadCustomMacros(s);
ShowCustomMacros();
}
#endif // wxUSE_FILEDLG