Warning fixes after recent commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 2a64cb87c15ecc754f493be01101485be1eb7bfe..86156519cb75c063704af0501ce01916045d178c 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        automtn.cpp
+// Name:        src/msw/ole/automtn.cpp

 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:


@@ -597,8 +597,8 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
         oleVariant.vt = VT_DATE;
         
         long dosDateTime = date.GetAsDOS();
         oleVariant.vt = VT_DATE;
         
         long dosDateTime = date.GetAsDOS();

-        short dosDate = (dosDateTime & 0xFFFF0000) >> 16;
-        short dosTime = dosDateTime & 0xFFFF;
+        short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
+        short dosTime = short(dosDateTime & 0xFFFF);

         
         DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
     }
         
         DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
     }


@@ -930,4 +930,3 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
 #endif
 
 #endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 #endif
 
 #endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)

-

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c7ecb7bce4ba48f38142c0a52ecec5f4e6a2a0b4..6bd5ca66fb1aff3c86f2a1dc5db625256ee8f7e1 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1090,7 +1090,7 @@ void wxWindowMSW::DissociateHandle()
 
 
 bool wxCheckWindowWndProc(WXHWND hWnd,
 
 
 bool wxCheckWindowWndProc(WXHWND hWnd,

-                          WXFARPROC WXUNUSED_IN_WINCE(wndProc))
+                          WXFARPROC WXUNUSED(wndProc))

 {
 // TODO: This list of window class names should be factored out so they can be
 // managed in one place and then accessed from here and other places, such as
 {
 // TODO: This list of window class names should be factored out so they can be
 // managed in one place and then accessed from here and other places, such as