From a6d309447acf232da48dc66102322d55ccff911a Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:43:14 +0100
Subject: [PATCH] Fix unreachable-code-return and unreachable-code-break
 warning

---
 src/common/intl.cpp         | 1 -
 src/osx/cocoa/dataview.mm   | 1 -
 src/osx/cocoa/settings.mm   | 6 ++----
 src/osx/core/evtloop_cf.cpp | 2 --
 src/osx/uiaction_osx.cpp    | 3 ---
 src/unix/uiactionx11.cpp    | 4 ++--
 6 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 066e056847..44c4df22a8 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1799,7 +1799,6 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
                 format.Replace("%y","%Y");
                 return format;
             }
-            break;
 
         default:
             wxFAIL_MSG( "Unknown locale info" );
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 335bde7895..2dfffedb5d 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2727,7 +2727,6 @@ wxDataObjectComposite* wxCocoaDataViewControl::GetDnDDataObjects(NSData* dataObj
                     return NULL;
                 }
             }
-            break;
         default:
             return NULL;
     }
diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index 472d40b424..de5f52860c 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -206,16 +206,14 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT :
             {
                 return wxFont(wxOSX_SYSTEM_FONT_SMALL) ;
-            } ;
-            break ;
+            }
         case wxSYS_OEM_FIXED_FONT :
         case wxSYS_ANSI_FIXED_FONT :
         case wxSYS_SYSTEM_FIXED_FONT :
         default :
             {
                 return wxFont(wxOSX_SYSTEM_FONT_FIXED) ;
-            } ;
-            break ;
+            }
 
     }
     return *wxNORMAL_FONT;
diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index a9979b980f..9004763836 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -249,10 +249,8 @@ int wxCFEventLoop::DoDispatchTimeout(unsigned long timeout)
             break;
         case kCFRunLoopRunStopped:
             return 0;
-            break;
         case kCFRunLoopRunTimedOut:
             return -1;
-            break;
         case kCFRunLoopRunHandledSource:
         default:
             break;
diff --git a/src/osx/uiaction_osx.cpp b/src/osx/uiaction_osx.cpp
index 31b7d987ae..5f5929ee2d 100644
--- a/src/osx/uiaction_osx.cpp
+++ b/src/osx/uiaction_osx.cpp
@@ -60,11 +60,9 @@ CGEventType CGEventTypeForMouseDrag(int button)
     {
         case wxMOUSE_BTN_LEFT:
             return kCGEventLeftMouseDragged;
-            break;
             
         case wxMOUSE_BTN_RIGHT:
             return kCGEventRightMouseDragged;
-            break;
             
             // All the other buttons use the constant OtherMouseDown but we still
             // want to check for invalid parameters so assert first
@@ -74,7 +72,6 @@ CGEventType CGEventTypeForMouseDrag(int button)
             
         case wxMOUSE_BTN_MIDDLE:
             return kCGEventOtherMouseDragged;
-            break;
     }
 
 }
diff --git a/src/unix/uiactionx11.cpp b/src/unix/uiactionx11.cpp
index 6bc7df4c39..fcfd677e1e 100644
--- a/src/unix/uiactionx11.cpp
+++ b/src/unix/uiactionx11.cpp
@@ -437,9 +437,9 @@ bool wxUIActionSimulatorX11Impl::MouseMove(long x, long y)
     }
 
     return ret;
-#endif
-
+#else
     return DoX11MouseMove(x, y);
+#endif
 }
 
 bool wxUIActionSimulatorX11Impl::MouseUp(int button)