diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp index e0b6acb5d5..6d0cfe94cf 100644 --- a/src/msw/wince/filedlgwce.cpp +++ b/src/msw/wince/filedlgwce.cpp @@ -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 diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index a42bdfacb3..2d896e02c6 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -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