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:
@@ -114,16 +114,12 @@ int wxFileDialog::ShowModal()
|
|||||||
parentWindow = wxTheApp->GetTopWindow();
|
parentWindow = wxTheApp->GetTopWindow();
|
||||||
|
|
||||||
wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
|
wxString str = wxGetTextFromUser(m_message, _("File"), m_fileName, parentWindow);
|
||||||
if (str)
|
if (str.empty())
|
||||||
{
|
|
||||||
m_fileName = str;
|
|
||||||
m_fileNames.Add(str);
|
|
||||||
return wxID_OK;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return wxID_CANCEL;
|
return wxID_CANCEL;
|
||||||
}
|
|
||||||
|
m_fileName = str;
|
||||||
|
m_fileNames.Add(str);
|
||||||
|
return wxID_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFileDialog::GetFilenames(wxArrayString& files) const
|
void wxFileDialog::GetFilenames(wxArrayString& files) const
|
||||||
|
@@ -4870,8 +4870,8 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f
|
|||||||
wxFFileInputStream stream(filename);
|
wxFFileInputStream stream(filename);
|
||||||
if (stream.Ok())
|
if (stream.Ok())
|
||||||
return LoadFile(buffer, stream);
|
return LoadFile(buffer, stream);
|
||||||
else
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
|
bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
|
||||||
@@ -4879,8 +4879,8 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f
|
|||||||
wxFFileOutputStream stream(filename);
|
wxFFileOutputStream stream(filename);
|
||||||
if (stream.Ok())
|
if (stream.Ok())
|
||||||
return SaveFile(buffer, stream);
|
return SaveFile(buffer, stream);
|
||||||
else
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif // wxUSE_STREAMS
|
#endif // wxUSE_STREAMS
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user