From e003c663fd3bfcf2414eb34a2b7c5d8e8544a6d3 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 6 Apr 2014 19:27:31 +0000 Subject: [PATCH] avoid warning about unreachable code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/preferencescmn.cpp | 9 ++++++--- src/unix/mediactrl.cpp | 5 +---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/preferencescmn.cpp b/src/common/preferencescmn.cpp index 9649494332..cf9c5153ee 100644 --- a/src/common/preferencescmn.cpp +++ b/src/common/preferencescmn.cpp @@ -33,14 +33,17 @@ wxString wxStockPreferencesPage::GetName() const { + wxString name; switch ( m_kind ) { case Kind_General: - return _("General"); + name = _("General"); + break; case Kind_Advanced: - return _("Advanced"); + name = _("Advanced"); + break; } - return wxString(); // silence compiler warning + return name; } wxPreferencesEditor::wxPreferencesEditor(const wxString& title) diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 04e56382cc..f221692044 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -1470,10 +1470,7 @@ bool wxGStreamerMediaBackend::SetPosition(wxLongLong where) # endif // GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10 - { - m_llPausedPos = where; - return true; - } + m_llPausedPos = where; return true; #endif //== 0.8.0 }