Warning fixes after recent commits.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: automtn.cpp
|
// Name: src/msw/ole/automtn.cpp
|
||||||
// Purpose: OLE automation utilities
|
// Purpose: OLE automation utilities
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -597,8 +597,8 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
|
|||||||
oleVariant.vt = VT_DATE;
|
oleVariant.vt = VT_DATE;
|
||||||
|
|
||||||
long dosDateTime = date.GetAsDOS();
|
long dosDateTime = date.GetAsDOS();
|
||||||
short dosDate = (dosDateTime & 0xFFFF0000) >> 16;
|
short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
|
||||||
short dosTime = dosDateTime & 0xFFFF;
|
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
|
||||||
|
|
||||||
#endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
|
#endif // wxUSE_OLE && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
|
||||||
|
|
||||||
|
@@ -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
|
// 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
|
// managed in one place and then accessed from here and other places, such as
|
||||||
|
Reference in New Issue
Block a user