eVC4 warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-11-06 21:42:01 +00:00
parent 41e155b43e
commit caae22fb66
2 changed files with 9 additions and 13 deletions

View File

@@ -114,16 +114,12 @@ int wxFileDialog::ShowModal()
parentWindow = wxTheApp->GetTopWindow();
wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
if (str)
{
m_fileName = str;
m_fileNames.Add(str);
return wxID_OK;
}
else
{
if (str.empty())
return wxID_CANCEL;
}
m_fileName = str;
m_fileNames.Add(str);
return wxID_OK;
}
void wxFileDialog::GetFilenames(wxArrayString& files) const

View File

@@ -4870,8 +4870,8 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f
wxFFileInputStream stream(filename);
if (stream.Ok())
return LoadFile(buffer, stream);
else
return false;
return false;
}
bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
@@ -4879,8 +4879,8 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f
wxFFileOutputStream stream(filename);
if (stream.Ok())
return SaveFile(buffer, stream);
else
return false;
return false;
}
#endif // wxUSE_STREAMS