From 07305820850440efbbada52232b3b2e46cc11a35 Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 10 Nov 2017 16:52:10 +1100 Subject: [PATCH] [Project64] Clean up some warnings in List Control --- .../WTLControls/ClistCtrl/ListCtrl.h | 18 +++++++++--------- .../WTLControls/ClistCtrl/ListEdit.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListCtrl.h b/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListCtrl.h index be8ce9469..57f6f1a6d 100644 --- a/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListCtrl.h +++ b/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListCtrl.h @@ -2579,7 +2579,7 @@ public: return TRUE; } - void OnTimer( UINT nIDEvent ) + void OnTimer(UINT_PTR nIDEvent ) { switch ( nIDEvent ) { @@ -3158,16 +3158,16 @@ public: TRIVERTEX triVertext[ 2 ] = { rcRect.left, rcRect.top, - GetRValue( rgbTop ) << 8, - GetGValue( rgbTop ) << 8, - GetBValue( rgbTop ) << 8, - 0x0000, + (COLOR16)(GetRValue( rgbTop ) << 8), + (COLOR16)(GetGValue( rgbTop ) << 8), + (COLOR16)(GetBValue( rgbTop ) << 8), + (COLOR16)(0x0000), rcRect.right, rcRect.bottom, - GetRValue( rgbBottom ) << 8, - GetGValue( rgbBottom ) << 8, - GetBValue( rgbBottom ) << 8, - 0x0000 + (COLOR16)(GetRValue( rgbBottom ) << 8), + (COLOR16)(GetGValue( rgbBottom ) << 8), + (COLOR16)(GetBValue( rgbBottom ) << 8), + (COLOR16)(0x0000) }; dcPaint.GradientFill( triVertext, 2, &grdRect, 1, GRADIENT_FILL_RECT_V ); diff --git a/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListEdit.h b/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListEdit.h index 863e1b725..501d8eb16 100644 --- a/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListEdit.h +++ b/Source/Project64/UserInterface/WTLControls/ClistCtrl/ListEdit.h @@ -171,13 +171,13 @@ public: break; case _T( '.' ): if ( !( m_nFlags & ITEM_FLAGS_EDIT_FLOAT ) ) return FALSE; - nDecimalIndex = nCharIndex; + nDecimalIndex = (int)nCharIndex; nDecimalPoint++; break; default: if ( !_istdigit( nCharValue ) ) return FALSE; if ( nDigitIndex < 0 ) - nDigitIndex = nCharIndex; + nDigitIndex = (int)nCharIndex; break; }