Suppress various harmless warnings in MinGW build with -Wconversion.
No real changes, simply add casts to make the implicit conversions that g++ warns about when using -Wconversion explicit. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
616ad49187
commit
3d55f45e94
@ -2020,7 +2020,7 @@ wxLongLong wxAMMediaBackend::GetDuration()
|
|||||||
|
|
||||||
case S_OK:
|
case S_OK:
|
||||||
// outDuration is in seconds, we need milliseconds
|
// outDuration is in seconds, we need milliseconds
|
||||||
return outDuration * 1000;
|
return static_cast<wxLongLong>(outDuration * 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -602,7 +602,7 @@ wxSize wxSlider::DoGetBestSize() const
|
|||||||
if ( HasFlag(wxSL_MIN_MAX_LABELS) )
|
if ( HasFlag(wxSL_MIN_MAX_LABELS) )
|
||||||
size.y += labelSize;
|
size.y += labelSize;
|
||||||
if ( HasFlag(wxSL_VALUE_LABEL) )
|
if ( HasFlag(wxSL_VALUE_LABEL) )
|
||||||
size.y += labelSize*2.75;
|
size.y += static_cast<int>(labelSize*2.75);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1125,7 +1125,7 @@ void wxTextCtrl::AppendText(const wxString& text)
|
|||||||
// don't do this if we're frozen, saves some time
|
// don't do this if we're frozen, saves some time
|
||||||
if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 )
|
if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 )
|
||||||
{
|
{
|
||||||
::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, NULL);
|
::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL);
|
||||||
}
|
}
|
||||||
#endif // wxUSE_RICHEDIT
|
#endif // wxUSE_RICHEDIT
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user