eVC4 warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/wince/filedlgwce.cpp b/src/msw/wince/filedlgwce.cpp
index e0b6acb5d51bbd4dbd8751786d4f0ddfa98dce09..6d0cfe94cfd48ff2f343bee66ef83c59bda11dad 100644 (file)
--- 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);
         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;
         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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index a42bdfacb342313bd567d82d18c2fdf2c84acabb..2d896e02c611dbacdb44a58c0e5cd8dec19e421b 100644 (file)
--- 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);
     wxFFileInputStream stream(filename);
     if (stream.Ok())
         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);
     if (stream.Ok())
         return SaveFile(buffer, stream);
     wxFFileOutputStream stream(filename);
     if (stream.Ok())
         return SaveFile(buffer, stream);

-    else
-        return false;
+
+    return false;

 }
 #endif // wxUSE_STREAMS
 
 }
 #endif // wxUSE_STREAMS