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

Avoid unsafe casts to enum type

Browse Source
This commit is contained in:
pavel-t
2018-07-12 11:15:10 +03:00
parent 2171076e81
commit 915b5212f8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/statusbr.cpp
View File

@@ -231,12 +231,12 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
// eventually ellipsize the text so that it fits the field width // eventually ellipsize the text so that it fits the field width
wxEllipsizeMode ellmode = (wxEllipsizeMode)-1; wxEllipsizeMode ellmode = wxELLIPSIZE_NONE;
if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START; if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE; else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END; else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
if (ellmode == (wxEllipsizeMode)-1) if (ellmode == wxELLIPSIZE_NONE)
{ {
// if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
// we don't ellipsize the text but just truncate it // we don't ellipsize the text but just truncate it
@@ -267,7 +267,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
// draw the text // draw the text
dc.DrawText(text, xpos, ypos); dc.DrawText(text, xpos, ypos);
if (ellmode == (wxEllipsizeMode)-1) if (ellmode == wxELLIPSIZE_NONE)
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
} }

4
src/msw/statusbar.cpp
View File

@@ -287,12 +287,12 @@ void wxStatusBar::DoUpdateStatusText(int nField)
wxString text = GetStatusText(nField); wxString text = GetStatusText(nField);
// do we need to ellipsize this string? // do we need to ellipsize this string?
wxEllipsizeMode ellmode = (wxEllipsizeMode)-1; wxEllipsizeMode ellmode = wxELLIPSIZE_NONE;
if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START; if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE; else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END; else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
if (ellmode == (wxEllipsizeMode)-1) if (ellmode == wxELLIPSIZE_NONE)
{ {
// if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
// we don't ellipsize the text but just truncate it // we don't ellipsize the text but just truncate it