From 249e8c91baebfb375f45c177dc5fc1bf590b1dc8 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Sat, 9 Sep 2006 11:41:24 +0000 Subject: [PATCH] Dmitry Philippov: GCC 4 compiling fixes for PackMgr and tests/wm_paint svn path=/trunk/; revision=23985 --- rosapps/packmgr/gui/main.c | 8 +++----- rosapps/tests/wm_paint/wm_paint.c | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rosapps/packmgr/gui/main.c b/rosapps/packmgr/gui/main.c index 002ee93924b..6398ca30117 100644 --- a/rosapps/packmgr/gui/main.c +++ b/rosapps/packmgr/gui/main.c @@ -200,9 +200,7 @@ int SetIcon (int id, int icon) item.iSelectedImage = icon; item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; - TreeView_SetItem(hTree, &item); - - return 1; + return (int)TreeView_SetItem(hTree, &item); } // Set the Icons @@ -320,9 +318,9 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if(item != NULL) { - // mark the one as seleacted + // mark the one as selected SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); - TreeView_EnsureVisible (hTree, item); + (BOOL)TreeView_EnsureVisible (hTree, item); } // create the context menu diff --git a/rosapps/tests/wm_paint/wm_paint.c b/rosapps/tests/wm_paint/wm_paint.c index a488206fd83..24f00aa5b9c 100644 --- a/rosapps/tests/wm_paint/wm_paint.c +++ b/rosapps/tests/wm_paint/wm_paint.c @@ -90,10 +90,10 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, RUpdate.right, RUpdate.bottom); // fill the client area with the background brush - //HBRUSH HBrush = - //reinterpret_cast + /*HBRUSH HBrush = + reinterpret_cast (HBRUSH)(GetClassLong(HWnd, GCL_HBRBACKGROUND) - ); + );*/ FillRect(Hdc, &RClient, NULL); // render the persistent text