From 3d55f45e94a243fef267d466f249fbb18835ecdc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 Jun 2011 15:14:02 +0000 Subject: [PATCH] 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 --- src/msw/mediactrl_am.cpp | 2 +- src/msw/slider.cpp | 2 +- src/msw/textctrl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 300cb6816d..95341cbdff 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -2020,7 +2020,7 @@ wxLongLong wxAMMediaBackend::GetDuration() case S_OK: // outDuration is in seconds, we need milliseconds - return outDuration * 1000; + return static_cast(outDuration * 1000); } } diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index b65a2814f5..47035cff96 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -602,7 +602,7 @@ wxSize wxSlider::DoGetBestSize() const if ( HasFlag(wxSL_MIN_MAX_LABELS) ) size.y += labelSize; if ( HasFlag(wxSL_VALUE_LABEL) ) - size.y += labelSize*2.75; + size.y += static_cast(labelSize*2.75); } } diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index b4b0cff8f3..582e3a1bd1 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1125,7 +1125,7 @@ void wxTextCtrl::AppendText(const wxString& text) // don't do this if we're frozen, saves some time if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 ) { - ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, NULL); + ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL); } #endif // wxUSE_RICHEDIT } -- 2.45.2