Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More use of wxFALLTHROUGH

Browse Source
This commit is contained in:
Paul Cornett
2017-11-02 08:56:29 -07:00
parent c2513d8a4e
commit d76e627341
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/settings.cpp
View File

@@ -354,7 +354,7 @@ static void bg(GtkStyleContext* sc, wxColour& color, int state = GTK_STATE_FLAG_
{ {
case CAIRO_FORMAT_ARGB32: case CAIRO_FORMAT_ARGB32:
a = guchar(pixel >> 24); a = guchar(pixel >> 24);
// fallthrough wxFALLTHROUGH;
case CAIRO_FORMAT_RGB24: case CAIRO_FORMAT_RGB24:
r = guchar(pixel >> 16); r = guchar(pixel >> 16);
g = guchar(pixel >> 8); g = guchar(pixel >> 8);
@@ -451,7 +451,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
break; break;
} }
#endif #endif
// fall through wxFALLTHROUGH;
case wxSYS_COLOUR_3DLIGHT: case wxSYS_COLOUR_3DLIGHT:
case wxSYS_COLOUR_ACTIVEBORDER: case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE: case wxSYS_COLOUR_BTNFACE:
@@ -491,7 +491,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
break; break;
} }
#endif #endif
// fall through wxFALLTHROUGH;
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
sc = ButtonLabelContext(path); sc = ButtonLabelContext(path);
fg(sc, color); fg(sc, color);
@@ -505,7 +505,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
break; break;
} }
#endif #endif
// fall through wxFALLTHROUGH;
case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_GRAYTEXT:
sc = StyleContext(path, GTK_TYPE_LABEL, "label"); sc = StyleContext(path, GTK_TYPE_LABEL, "label");
fg(sc, color, GTK_STATE_FLAG_INSENSITIVE); fg(sc, color, GTK_STATE_FLAG_INSENSITIVE);

1
tests/datetime/datetimetest.cpp
View File

@@ -800,6 +800,7 @@ void DateTimeTestCase::TestTimeFormat()
dt2.SetYear(dt.GetYear()); dt2.SetYear(dt.GetYear());
} }
// fall through and compare everything // fall through and compare everything
wxFALLTHROUGH;
case CompareBoth: case CompareBoth:
CPPUNIT_ASSERT_EQUAL( dt, dt2 ); CPPUNIT_ASSERT_EQUAL( dt, dt2 );