From 767d070330f3fb669495b2e3481f0c8abfcd1300 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 7 Jul 2012 10:31:56 +0000 Subject: - one more crash fix; - cache functionality fixed; - strange type 'boolean' removed - all header files included into project git-svn-id: http://svn.miranda-ng.org/main/trunk@811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/modern_cluiframes.cpp | 108 ++++++++++++++--------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'plugins/Clist_modern/modern_cluiframes.cpp') diff --git a/plugins/Clist_modern/modern_cluiframes.cpp b/plugins/Clist_modern/modern_cluiframes.cpp index 782ffcff16..2df4d35889 100644 --- a/plugins/Clist_modern/modern_cluiframes.cpp +++ b/plugins/Clist_modern/modern_cluiframes.cpp @@ -100,7 +100,7 @@ static int backgroundBmpUse; static COLORREF bkColour; static COLORREF SelBkColour; static BOOL bkUseWinColours; -boolean AlignCOLLIconToLeft; //will hide frame icon +BYTE AlignCOLLIconToLeft; //will hide frame icon COLORREF sttGetColor(char * module, char * color, COLORREF defColor); //for old multiwindow #define MPCF_CONTEXTFRAMEMENU 3 @@ -123,7 +123,7 @@ int CLUIFrames_OnMoving( HWND hwnd, RECT * r) g_CluiData.mutexPreventDockMoving = 0; for (i=0;i < g_nFramesCount;i++) { - if (!g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != NULL && g_pfwFrames[i].OwnerWindow != (HWND)-2) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != NULL && g_pfwFrames[i].OwnerWindow != (HWND)-2) { int x; int y; @@ -153,14 +153,14 @@ int SetAlpha(BYTE Alpha) for (i=0;i < g_nFramesCount;i++) { - if (!g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != NULL && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != NULL && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) { HWND hwnd = g_pfwFrames[i].OwnerWindow; if (g_proc_SetLayeredWindowAttributesNew) { long l; l = GetWindowLongPtr(hwnd,GWL_EXSTYLE); - if (!(l&WS_EX_LAYERED)) + if ( !(l&WS_EX_LAYERED)) { HWND parent = NULL; if (g_CluiData.fOnDesktop) @@ -189,7 +189,7 @@ int CLUIFrames_RepaintSubContainers() { int i; for (i=0;i < g_nFramesCount;i++) - if (!g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) { RedrawWindow(g_pfwFrames[i].hWnd,NULL,NULL,RDW_ALLCHILDREN|RDW_UPDATENOW|RDW_INVALIDATE|RDW_FRAME); }; @@ -221,7 +221,7 @@ int CLUIFrames_SetParentForContainers( HWND parent ) else g_CluiData.fOnDesktop = 0; for (i=0;i < g_nFramesCount;i++) { - if (!g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2 && g_pfwFrames[i].visible && !g_pfwFrames[i].needhide ) { HWND hwnd = g_pfwFrames[i].OwnerWindow; SetParent(hwnd,parent); @@ -235,7 +235,7 @@ int CLUIFrames_OnShowHide( HWND hwnd, int mode ) int i; int prevFrameCount; for (i=0;i < g_nFramesCount;i++) { - if (!g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].OwnerWindow != (HWND)0 && g_pfwFrames[i].OwnerWindow != (HWND)-2) { { //Try to avoid crash on exit due to unlock. @@ -308,7 +308,7 @@ int QueueAllFramesUpdating(BYTE queue) int i; for (i=0;i < g_nFramesCount;i++) { - if (!g_CluiData.fLayered) + if ( !g_CluiData.fLayered) { if (queue) InvalidateRect(g_pfwFrames[i].hWnd,NULL,FALSE); @@ -684,7 +684,7 @@ static int DBLoadFrameSettingsAtPos(int pos,int Frameid) _itoa(pos,sadd,10); //DBWriteContactSettingString(0,CLUIFrameModule,strcat("Name",sadd),Frames[Frameid].name); - //boolean + //bool g_pfwFrames[Frameid].collapsed = db_get_b(0,CLUIFrameModule,AS(buf,"Collapse",sadd),g_pfwFrames[Frameid].collapsed); g_pfwFrames[Frameid].Locked = db_get_b(0,CLUIFrameModule,AS(buf,"Locked",sadd),g_pfwFrames[Frameid].Locked); @@ -716,7 +716,7 @@ static int DBStoreFrameSettingsAtPos(int pos,int Frameid) _itoa(pos,sadd,10); db_set_ws(0,CLUIFrameModule,AS(buf,"Name",sadd),g_pfwFrames[Frameid].Name); - //boolean + //bool db_set_b(0,CLUIFrameModule,AS(buf,"Collapse",sadd),(BYTE)btoint(g_pfwFrames[Frameid].collapsed)); db_set_b(0,CLUIFrameModule,AS(buf,"Locked",sadd),(BYTE)btoint(g_pfwFrames[Frameid].Locked)); db_set_b(0,CLUIFrameModule,AS(buf,"Visible",sadd),(BYTE)btoint(g_pfwFrames[Frameid].visible)); @@ -1159,16 +1159,16 @@ static INT_PTR _us_DoGetFrameOptions(WPARAM wParam,LPARAM lParam) case FO_FLAGS: retval = 0; if (g_pfwFrames[pos].visible) retval |= F_VISIBLE; - if (!g_pfwFrames[pos].collapsed) retval |= F_UNCOLLAPSED; + if ( !g_pfwFrames[pos].collapsed) retval |= F_UNCOLLAPSED; if (g_pfwFrames[pos].Locked) retval |= F_LOCKED; if (g_pfwFrames[pos].TitleBar.ShowTitleBar) retval |= F_SHOWTB; if (g_pfwFrames[pos].TitleBar.ShowTitleBarTip) retval |= F_SHOWTBTIP; - if (!g_CluiData.fLayered) + if ( !g_CluiData.fLayered) { - if (!(GetWindowLongPtr(g_pfwFrames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval |= F_NOBORDER; + if ( !(GetWindowLongPtr(g_pfwFrames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval |= F_NOBORDER; } else - if (!g_pfwFrames[pos].UseBorder) retval |= F_NOBORDER; + if ( !g_pfwFrames[pos].UseBorder) retval |= F_NOBORDER; break; @@ -1371,7 +1371,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) int oldHeight = g_pfwFrames[pos].height; retval = g_pfwFrames[pos].height; g_pfwFrames[pos].height = lParam; - if (!CLUIFramesFitInSize()) g_pfwFrames[pos].height = retval; + if ( !CLUIFramesFitInSize()) g_pfwFrames[pos].height = retval; retval = g_pfwFrames[pos].height; if (g_pfwFrames[pos].height != oldHeight) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); @@ -1380,7 +1380,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) { retval = g_pfwFrames[pos].HeightWhenCollapsed; g_pfwFrames[pos].HeightWhenCollapsed = lParam; - if (!CLUIFramesFitInSize()) g_pfwFrames[pos].HeightWhenCollapsed = retval; + if ( !CLUIFramesFitInSize()) g_pfwFrames[pos].HeightWhenCollapsed = retval; retval = g_pfwFrames[pos].HeightWhenCollapsed; } @@ -1399,7 +1399,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) } case FO_ALIGN: - if (!(lParam&alTop || lParam&alBottom || lParam&alClient)) + if ( !(lParam&alTop || lParam&alBottom || lParam&alClient)) { TRACE("Wrong align option \r\n"); return (-1); @@ -1487,7 +1487,7 @@ static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam) } if (g_pfwFrames[pos].floating){CLUIFrameResizeFloatingFrame(pos);}; - if (!g_pfwFrames[pos].floating) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + if ( !g_pfwFrames[pos].floating) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); } return 0; } @@ -1644,7 +1644,7 @@ static int _us_DoSetFrameBorder(WPARAM wParam,LPARAM lParam) RECT rc; int FrameId,oldflags; HWND hw; - boolean flt; + int flt; if (_fCluiFramesModuleNotStarted) return -1; @@ -1695,7 +1695,7 @@ static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam) { RECT rc; if (CallService(MS_CLIST_DOCKINGISDOCKED,0,0)) {return 0;}; - if (!g_CluiData.fDocked && g_CluiData.fAutoSize) {return 0;}; + if ( !g_CluiData.fDocked && g_CluiData.fAutoSize) {return 0;}; GetWindowRect(pcli->hwndContactList,&rc); if (g_pfwFrames[FrameId].collapsed == TRUE) { @@ -1735,10 +1735,10 @@ static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam) g_pfwFrames[FrameId].collapsed = TRUE; } - if (!g_pfwFrames[FrameId].floating) + if ( !g_pfwFrames[FrameId].floating) { - if (!CLUIFramesFitInSize()) { + if ( !CLUIFramesFitInSize()) { //cant collapse,we can resize only for height < alclient frame height int alfrm = CLUIFramesGetalClientFrame(); @@ -1768,7 +1768,7 @@ static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam) if (g_pfwFrames[FrameId].collapsed == FALSE) { - if (!g_pfwFrames[FrameId].floating) + if ( !g_pfwFrames[FrameId].floating) { } else @@ -1783,7 +1783,7 @@ static int _us_DoCollapseFrame(WPARAM wParam,LPARAM lParam) };//floating test //CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); - if (!g_pfwFrames[FrameId].floating) + if ( !g_pfwFrames[FrameId].floating) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); } @@ -1890,7 +1890,7 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam) if (pcli->hwndContactList == 0) return -1; if (_fCluiFramesModuleNotStarted) return -1; if (clfrm->cbSize != sizeof(CLISTFrame)) return -1; - if (!(_hTitleBarFont)) _hTitleBarFont = CLUILoadTitleBarFont(); + if ( !(_hTitleBarFont)) _hTitleBarFont = CLUILoadTitleBarFont(); g_pfwFrames = (FRAMEWND*)realloc(g_pfwFrames,sizeof(FRAMEWND)*(g_nFramesCount+1)); @@ -2209,7 +2209,7 @@ static BOOL CLUIFramesFitInSize(void) sumheight += (g_pfwFrames[i].height)+(g_nTitleBarHeight*btoint(g_pfwFrames[i].TitleBar.ShowTitleBar))+2/*+btoint(Frames[i].UseBorder)*2*/; if (sumheight>_nContactListHeight-tbh-2) { - if (!g_CluiData.fDocked && g_CluiData.fAutoSize) + if ( !g_CluiData.fDocked && g_CluiData.fAutoSize) { return TRUE; //Can be required to enlarge } @@ -2319,7 +2319,7 @@ static int CLUIFramesResizeFrames(const RECT newsize) for (i=0;i < g_nFramesCount;i++) { - if (!g_pfwFrames[i].floating) + if ( !g_pfwFrames[i].floating) { g_pfwFrames[i].needhide = FALSE; g_pfwFrames[i].wndSize.left = newsize.left; @@ -2543,7 +2543,7 @@ int SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode) int dy; dx = 0;//rcNewWindowRect.left-rcOldWindowRect.left; dy = 0;//_window_rect.top-rcOldWindowRect.top; - if (!g_pfwFrames[i].floating) + if ( !g_pfwFrames[i].floating) { if (g_pfwFrames[i].visible && !g_pfwFrames[i].needhide && !IsWindowVisible(g_pfwFrames[i].hWnd)) { @@ -2552,7 +2552,7 @@ int SizeFramesByWindowRect(RECT *r, HDWP * PosBatch, int mode) } if (g_pfwFrames[i].OwnerWindow && (INT_PTR)(g_pfwFrames[i].OwnerWindow) != -2 ) { - if (!(mode&2)) + if ( !(mode&2)) { HWND hwnd; hwnd = GetParent(g_pfwFrames[i].OwnerWindow); @@ -2620,9 +2620,9 @@ int CheckFramesPos(RECT *wr) int dy; dx = 0;//rcNewWindowRect.left-rcOldWindowRect.left; dy = 0;//_window_rect.top-rcOldWindowRect.top; - if (!g_pfwFrames[i].floating && g_pfwFrames[i].visible) + if ( !g_pfwFrames[i].floating && g_pfwFrames[i].visible) { - if (!(g_pfwFrames[i].OwnerWindow && (INT_PTR)(g_pfwFrames[i].OwnerWindow) != -2)) + if ( !(g_pfwFrames[i].OwnerWindow && (INT_PTR)(g_pfwFrames[i].OwnerWindow) != -2)) { RECT r; GetWindowRect(g_pfwFrames[i].hWnd,&r); @@ -2764,7 +2764,7 @@ int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam) if (g_CluiData.fDisableSkinEngine) { if (db_get_b(NULL,"FrameTitleBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if (!DBGetContactSettingString(NULL,"FrameTitleBar","BkBitmap",&dbv)) { + if ( !DBGetContactSettingString(NULL,"FrameTitleBar","BkBitmap",&dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP,0,(LPARAM)dbv.pszVal); db_free(&dbv); } @@ -2901,7 +2901,7 @@ void DrawBackGround(HWND hwnd,HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColou DeleteDC(hdcMem); paintst.fErase = FALSE; //DeleteObject(hFont); - if (!mhdc) + if ( !mhdc) { EndPaint(hwnd,&paintst); } @@ -2954,7 +2954,7 @@ int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid) { if (g_CluiData.fDisableSkinEngine) { - if (!hBmpBackground && bkUseWinColours && xpt_IsThemed(_hFrameTitleTheme)) + if ( !hBmpBackground && bkUseWinColours && xpt_IsThemed(_hFrameTitleTheme)) { int state = CS_ACTIVE; // if (GetForegroundWindow() != pcli->hwndContactList) state = CS_INACTIVE; @@ -2964,7 +2964,7 @@ int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid) else DrawBackGround(g_pfwFrames[pos].TitleBar.hwnd,hdcMem, hBmpBackground, bkColour, backgroundBmpUse); } - else if (!g_CluiData.fLayered) + else if ( !g_CluiData.fLayered) { ske_BltBackImage(g_pfwFrames[pos].TitleBar.hwnd,hdcMem,&rc); } @@ -2977,7 +2977,7 @@ int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid) SetTextColor(hdcMem,SelBkColour); { RECT textrc = rc; - if (!AlignCOLLIconToLeft) + if ( !AlignCOLLIconToLeft) { if (g_pfwFrames[pos].TitleBar.hicon != NULL) @@ -3001,7 +3001,7 @@ int DrawTitleBar(HDC hdcMem2,RECT * rect,int Frameid) ske_TextOut(hdcMem,textrc.left,textrc.top,g_pfwFrames[pos].TitleBar.tbname,lstrlen(g_pfwFrames[pos].TitleBar.tbname)); } - if (!AlignCOLLIconToLeft) + if ( !AlignCOLLIconToLeft) { mod_DrawIconEx_helper(hdcMem,g_pfwFrames[pos].TitleBar.wndSize.right-GetSystemMetrics(SM_CXSMICON)-2,rc.top+((g_nTitleBarHeight>>1)-(GetSystemMetrics(SM_CXSMICON)>>1)),g_pfwFrames[pos].collapsed?LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN):LoadSkinnedIcon(SKINICON_OTHER_GROUPSHUT),GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),0,NULL,DI_NORMAL); } @@ -3050,7 +3050,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam switch(msg) { case WM_CREATE: - if (!_hFrameTitleTheme) + if ( !_hFrameTitleTheme) _hFrameTitleTheme = xpt_AddThemeHandle(hwnd,L"WINDOW"); SendMessage(hwnd,WM_SETFONT,(WPARAM)_hTitleBarFont,0); return FALSE; @@ -3234,7 +3234,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam ); oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,g_pfwFrames[pos].id),(LPARAM)0); - if (!(oldflags&F_SHOWTBTIP)) + if ( !(oldflags&F_SHOWTBTIP)) { oldflags |= F_SHOWTBTIP; //CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,Frames[pos].id),(LPARAM)oldflags); @@ -3305,7 +3305,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam //IntersectRect( &rcOverlap, &rcwnd, &rcMiranda ) - if (!IntersectRect( &rcOverlap, &rcwnd, &rcMiranda )) + if ( !IntersectRect( &rcOverlap, &rcwnd, &rcMiranda )) { GetCursorPos(&curpt); GetWindowRect( g_pfwFrames[pos].hWnd, &rcwnd ); @@ -3376,7 +3376,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam nLeft += (short)dX; nTop += (short)dY; - if (!(wParam&MK_CONTROL)) + if ( !(wParam&MK_CONTROL)) { PositionThumb( &g_pfwFrames[pos], nLeft, nTop ); }else @@ -3443,7 +3443,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam if (newh>0) { prevold = g_pfwFrames[Framemod].height; g_pfwFrames[Framemod].height = newh; - if (!CLUIFramesFitInSize()) { g_pfwFrames[Framemod].height = prevold; return TRUE;} + if ( !CLUIFramesFitInSize()) { g_pfwFrames[Framemod].height = prevold; return TRUE;} g_pfwFrames[Framemod].height = newh; if (newh>3) g_pfwFrames[Framemod].collapsed = TRUE; @@ -3466,7 +3466,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam //if (lParam&PRF_CLIENT) { GetClientRect(hwnd,&rect); - if (!g_CluiData.fLayered) + if ( !g_CluiData.fLayered) { ske_BltBackImage(hwnd,(HDC)wParam,&rect); } @@ -3503,7 +3503,7 @@ static int CLUIFrameResizeFloatingFrame(int framepos) int width,height; RECT rect; - if (!g_pfwFrames[framepos].floating){return(0);}; + if ( !g_pfwFrames[framepos].floating){return(0);}; if (g_pfwFrames[framepos].ContainerWnd == 0){return(0);}; GetClientRect(g_pfwFrames[framepos].ContainerWnd,&rect); @@ -3695,7 +3695,7 @@ static LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wP framepos = id2pos(Frameid); if (framepos < 0 || framepos >= g_nFramesCount){break;}; - if (!g_pfwFrames[framepos].minmaxenabled){break;}; + if ( !g_pfwFrames[framepos].minmaxenabled){break;}; if (g_pfwFrames[framepos].ContainerWnd == 0){break;}; if (g_pfwFrames[framepos].Locked) @@ -3892,7 +3892,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam) SetParent(g_pfwFrames[pos].TitleBar.hwnd,pcli->hwndContactList); SetWindowLongPtr(g_pfwFrames[pos].OwnerWindow,GWLP_USERDATA,g_pfwFrames[pos].id); g_pfwFrames[pos].floating = FALSE; - if (!(lParam&2)) + if ( !(lParam&2)) { DestroyWindow(g_pfwFrames[pos].ContainerWnd); g_pfwFrames[pos].ContainerWnd = 0; @@ -3922,7 +3922,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam) GetWindowRect(g_pfwFrames[pos].hWnd,&rectw); GetWindowRect(g_pfwFrames[pos].TitleBar.hwnd,&recttb); - if (!g_pfwFrames[pos].TitleBar.ShowTitleBar){ + if ( !g_pfwFrames[pos].TitleBar.ShowTitleBar){ recttb.top = recttb.bottom = recttb.left = recttb.right = 0; }; @@ -4003,7 +4003,7 @@ int CLUIFrameOnModulesUnload(WPARAM wParam,LPARAM lParam) { // //if (MirandaExiting()) return 0; - if (!_hmiVisible) return 0; + if ( !_hmiVisible) return 0; CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiVisible, 1 ); CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiTBVisible, 1 ); CallService( MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, ( LPARAM )_hmiLock, 1 ); @@ -4087,10 +4087,10 @@ int LoadCLUIFramesModule(void) InitFramesMenus(); - ModernHookEvent(ME_SYSTEM_MODULESLOADED,CLUIFrameOnModulesLoad); - ModernHookEvent(ME_CLIST_PREBUILDFRAMEMENU,CLUIFramesModifyContextMenuForFrame); - ModernHookEvent(ME_CLIST_PREBUILDMAINMENU,CLUIFrameOnMainMenuBuild); - ModernHookEvent(ME_SYSTEM_PRESHUTDOWN, CLUIFrameOnModulesUnload); + HookEvent(ME_SYSTEM_MODULESLOADED,CLUIFrameOnModulesLoad); + HookEvent(ME_CLIST_PREBUILDFRAMEMENU,CLUIFramesModifyContextMenuForFrame); + HookEvent(ME_CLIST_PREBUILDMAINMENU,CLUIFrameOnMainMenuBuild); + HookEvent(ME_SYSTEM_PRESHUTDOWN, CLUIFrameOnModulesUnload); CreateCluiFramesServices(); @@ -4162,11 +4162,11 @@ int UnLoadCLUIFramesModule(void) static int _us_DoSetFramePaintProc(WPARAM wParam, LPARAM lParam) { - if (!wParam) return 0; + if ( !wParam) return 0; { // LOOK REQUIRED OR SYNC CALL NEEDED FRAMEWND *frm = FindFrameByItsHWND((HWND)wParam); - if (!frm) return 0; + if ( !frm) return 0; if (lParam) frm->PaintCallbackProc = (tPaintCallbackProc)lParam; else -- cgit v1.2.3