]> git.saurik.com Git - wxWidgets.git/commitdiff
Suppress various harmless warnings in MinGW build with -Wconversion.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Jun 2011 15:14:02 +0000 (15:14 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Jun 2011 15:14:02 +0000 (15:14 +0000)
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
src/msw/slider.cpp
src/msw/textctrl.cpp

index 300cb6816dfd3a5ce73421d240ed2c20785f3410..95341cbdffca44567421f3764a99467b380c80a9 100644 (file)
@@ -2020,7 +2020,7 @@ wxLongLong wxAMMediaBackend::GetDuration()
 
         case S_OK:
             // outDuration is in seconds, we need milliseconds
-            return outDuration * 1000;
+            return static_cast<wxLongLong>(outDuration * 1000);
     }
 }
 
index b65a2814f5f220f1d0fce2e1fb6dc8e275d1b022..47035cff96b9f7aac68c5f00469b9ece21c02b3f 100644 (file)
@@ -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<int>(labelSize*2.75);
         }
     }
 
index b4b0cff8f3d921afbdf62d2326b5abfafc026d80..582e3a1bd15fab07d3fadd35351e359bea15c05e 100644 (file)
@@ -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
 }