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

Fix for ambiguities which happen in STL=1 mode under DigitalMars C++.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-24 20:01:55 +00:00
parent 7c11806499
commit 489f6cf713
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/tex2rtf/src/tex2any.cpp
View File

@@ -813,7 +813,7 @@ bool read_a_line(wxChar *buf)
if (checkSyntax)
{
wxString bufStr = buf;
for (int index=0; syntaxTokens[index] != wxEmptyString; index++)
for (int index=0; !syntaxTokens[index].empty(); index++)
{
size_t pos = bufStr.find(syntaxTokens[index]);
if (pos != wxString::npos && pos != 0)

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

@@ -398,7 +398,7 @@ bool MyApp::OnInit()
*/
wxString path = TexPathList.FindValidPath(MacroFile);
if (path != _T(""))
if (!path.empty())
ReadCustomMacros((wxChar *)path.c_str());
#if wxUSE_STATUSBAR
@@ -434,7 +434,7 @@ bool MyApp::OnInit()
*/
wxString path = TexPathList.FindValidPath(MacroFile);
if (path != _T(""))
if (!path.empty())
ReadCustomMacros((wxChar*)path.c_str());
Go();
@@ -743,7 +743,7 @@ void MyFrame::OnLoadMacros(wxCommandEvent& WXUNUSED(event))
{
textWindow->Clear();
wxString s = wxFileSelector(_T("Choose custom macro file"), wxPathOnly(MacroFile), wxFileNameFromPath(MacroFile), _T("ini"), _T("*.ini"));
if (s != _T("") && wxFileExists(s))
if (!s.empty() && wxFileExists(s))
{
MacroFile = copystring(s);
ReadCustomMacros((wxChar *)s.c_str());
@@ -862,7 +862,7 @@ void ChooseInputFile(bool force)
if (force || !InputFile)
{
wxString s = wxFileSelector(_T("Choose LaTeX input file"), wxPathOnly(InputFile), wxFileNameFromPath(InputFile), _T("tex"), _T("*.tex"));
if (s != _T(""))
if (!s.empty())
{
// Different file, so clear index entries.
ClearKeyWordTable();
@@ -916,7 +916,7 @@ void ChooseOutputFile(bool force)
{
wxString s = wxFileSelector(_T("Choose output file"), path, wxFileNameFromPath(OutputFile),
extensionBuf, wildBuf);
if (s != _T(""))
if (!s.empty())
OutputFile = copystring(s);
}
}
@@ -971,7 +971,7 @@ bool Go(void)
if (!bulletFile)
{
wxString s = TexPathList.FindValidPath(_T("bullet.bmp"));
if (s != _T(""))
if (!s.empty())
{
wxString str = wxFileNameFromPath(s);
bulletFile = copystring(str);