From ed8a5414636b994115cb8716cf1f77a429f86c1a Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 17 Oct 2017 09:21:45 -0700
Subject: [PATCH] Use wxFALLTHROUGH

---
 samples/widgets/listbox.cpp   | 1 +
 samples/widgets/textctrl.cpp  | 1 +
 src/gtk/mnemonics.cpp         | 4 ++--
 src/gtk/toplevel.cpp          | 1 +
 src/richtext/richtextctrl.cpp | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index aec1629942..22da0c9b4e 100644
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -432,6 +432,7 @@ void ListboxWidgetsPage::CreateLbox()
     {
         default:
             wxFAIL_MSG( wxT("unexpected radio box selection") );
+            wxFALLTHROUGH;
 
         case LboxSel_Single:    flags |= wxLB_SINGLE; break;
         case LboxSel_Extended:  flags |= wxLB_EXTENDED; break;
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 7c1d6f331c..dad4d87c2b 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -698,6 +698,7 @@ void TextWidgetsPage::CreateText()
     {
         default:
             wxFAIL_MSG( wxT("unexpected wrap style radio box selection") );
+            wxFALLTHROUGH;
 
         case WrapStyle_None:
             flags |= wxTE_DONTWRAP; // same as wxHSCROLL
diff --git a/src/gtk/mnemonics.cpp b/src/gtk/mnemonics.cpp
index 5fc9e66860..3f99009b61 100644
--- a/src/gtk/mnemonics.cpp
+++ b/src/gtk/mnemonics.cpp
@@ -120,7 +120,7 @@ static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
                             labelGTK += wxT("_-");
                             break;
                         }
-                        //else: fall through
+                        wxFALLTHROUGH;
 
                     default:
                         if ( flag != MNEMONICS_REMOVE )
@@ -137,7 +137,7 @@ static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
                     labelGTK += wxT("__");
                     break;
                 }
-                //else: fall through
+                wxFALLTHROUGH;
 
             default:
                 labelGTK += ch;
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 4b37b60b62..ed436bcb3b 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -155,6 +155,7 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
         default:
             g_source_remove( win->m_urgency_hint );
             // no break, fallthrough to remove hint too
+            wxFALLTHROUGH;
         case -1:
             gtk_window_set_urgency_hint(GTK_WINDOW(widget), false);
             win->m_urgency_hint = -2;
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index e1b176fc7a..2c93417aee 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -872,6 +872,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
 
                 case wxDragError:
                     wxLogError(wxT("An error occurred during drag and drop operation"));
+                    wxFALLTHROUGH;
                 case wxDragNone:
                 case wxDragCancel:
                     Refresh(); // This is needed in wxMSW, otherwise resetting the position doesn't 'take'