diff options
Diffstat (limited to 'plugins/Clist_mw')
| -rw-r--r-- | plugins/Clist_mw/CLUIFrames/cluiframes.cpp | 16 | ||||
| -rw-r--r-- | plugins/Clist_mw/init.cpp | 11 |
2 files changed, 12 insertions, 15 deletions
diff --git a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp index df70ff4d02..26a8a0cb63 100644 --- a/plugins/Clist_mw/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp @@ -69,7 +69,7 @@ static int sortfunc(const void *a,const void *b) }
-// == == == == == ==
+//============
#define CLUIFRAMESSETALIGN "CLUIFramesSetAlign"
#define CLUIFRAMESSETALIGNALTOP "CLUIFramesSetAlignalTop"
@@ -626,14 +626,12 @@ int CLUIFramesGetalClientFrame(void) return i;
}
- //pluginLink
return -1;
}
HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGENMENU (*pfnAdd )( CLISTMENUITEM* ))
{
CLISTMENUITEM mi;
- //TMO_MenuItem tmi;
HANDLE menuid;
int framepos = id2pos(frameid);
@@ -1279,7 +1277,7 @@ INT_PTR CLUIFramesSetUnSetBorder(WPARAM wParam,LPARAM lParam) ulockfrm();
return -1;
}
-
+
boolean flt = oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,wParam),0);
if (oldflags & F_NOBORDER)
oldflags &= (~F_NOBORDER);
@@ -1376,7 +1374,7 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam,LPARAM lParam) sumheight += (Frames[i].height)+(TitleBarH*btoint(Frames[i].TitleBar.ShowTitleBar))+2;
return FALSE;
}
-
+
if (sumheight>ContactListHeight-0-2)
Frames[FrameId].height = (ContactListHeight-0-2)-sumheight;
}
@@ -1624,7 +1622,7 @@ INT_PTR CLUIFramesAddFrame(WPARAM wParam,LPARAM lParam) Frames[nFramescount].oldstyles = GetWindowLongPtr(Frames[nFramescount].hWnd,GWL_STYLE);
Frames[nFramescount].TitleBar.oldstyles = GetWindowLongPtr(Frames[nFramescount].TitleBar.hwnd,GWL_STYLE);
- //Frames[nFramescount].FloatingPos.x =
+ //Frames[nFramescount].FloatingPos.x =
retval = Frames[nFramescount].id;
Frames[nFramescount].order = nFramescount+1;
@@ -2044,7 +2042,7 @@ void DrawBackGroundTTB(HWND hwnd,HDC mhdc) hOldBmp = (HBITMAP)SelectObject(hdcMem,hBmpOsb);
oFont = (HFONT)SelectObject(hdcMem,hFont);
SetBkMode(hdcMem,TRANSPARENT);
- {
+ {
HBRUSH hBrush = CreateSolidBrush(bkColour);
HBRUSH hoBrush = (HBRUSH)SelectObject(hdcMem,hBrush);
FillRect(hdcMem,rcPaint,hBrush);
@@ -2268,7 +2266,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA lockfrm();
if (framepos == -1){ulockfrm();break;}
hmenu = CreatePopupMenu();
-
+
AppendMenu(hmenu,MF_STRING|MF_DISABLED|MF_GRAYED,15,Frames[framepos].name);
AppendMenu(hmenu,MF_SEPARATOR,16,_T(""));
@@ -2351,7 +2349,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA POINT pt,pt2;
RECT wndr;
int pos;
-
+
char TBcapt[255];
lockfrm();
diff --git a/plugins/Clist_mw/init.cpp b/plugins/Clist_mw/init.cpp index 8664014c83..41197e501e 100644 --- a/plugins/Clist_mw/init.cpp +++ b/plugins/Clist_mw/init.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h"
HINSTANCE g_hInst = 0;
-PLUGINLINK * pluginLink;
CLIST_INTERFACE* pcli = NULL;
int hLangpack;
@@ -159,16 +158,16 @@ static ClcCacheEntryBase* fnCreateCacheItem( HANDLE hContact ) return (ClcCacheEntryBase*)p;
}
-extern "C" int __declspec(dllexport) CListInitialise(PLUGINLINK * link)
+extern "C" int __declspec(dllexport) CListInitialise()
{
int rc = 0;
- pluginLink = link;
// get the internal malloc/free()
__try {
OutputDebugStringA("CListInitialise ClistMW\r\n");
- mir_getLP( &pluginInfo );
+ mir_getLP( &pluginInfo );
+
pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)g_hInst);
if ( (INT_PTR)pcli == CALLSERVICE_NOTFOUND ) {
LBL_Error:
@@ -231,11 +230,11 @@ LBL_Error: }
// never called by a newer plugin loader.
-extern "C" int __declspec(dllexport) Load(PLUGINLINK * link)
+extern "C" int __declspec(dllexport) Load(void)
{
OutputDebugStringA("Load ClistMW\r\n");
MessageBoxA(0,"You Running Old Miranda, use >30-10-2004 version!","MultiWindow Clist",0);
- CListInitialise(link);
+ CListInitialise();
return 1;
}
|