R.I.P m_clui.h, you helped us alot

git-svn-id: http://svn.miranda-ng.org/main/trunk@16767 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 35 insertions, 177 deletions

diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas
index 21c05d1ed9..f51f6e2ddd 100644
--- a/include/delphi/m_api.pas
+++ b/include/delphi/m_api.pas
@@ -197,7 +197,6 @@ var
   {$include m_chat.inc}

   {$include m_clc.inc}

   {$include m_clistint.inc}

-  {$include m_clui.inc}

   {$include m_cluiframes.inc}

   {$include m_contacts.inc}

   {$include m_crypto.inc}

diff --git a/include/delphi/m_clui.inc b/include/delphi/m_clui.inc
deleted file mode 100644
index bb7bd26f7b..0000000000
--- a/include/delphi/m_clui.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-{

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2000-2003 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-}

-

-{$IFNDEF M_CLUI}

-{$DEFINE M_CLUI}

-

-{<</

-    this header was created for use for v0.1.1.0, most of it's UI related

-    stuff and you probably don't need to call it, see m_clist.inc instead.

-    -- There are some functions that were implemented in v0.1.2.0 though

-/>>}

-

-const

-  {

-    wParam : Handle to a group

-    lParam : 1 or 0

-    Affect : A new group was created, add it to the list, see notes

-    Notes  : lParam is set to 1 or 0 if the user just created

-             the group or not.

-             -

-             this is also called when the contact list is being rebuilt,

-             new groups are always created with the name 'New group'

-  }

-  MS_CLUI_GROUPADDED:PAnsiChar = 'CLUI/GroupCreated';

-

-  {

-    wParam : 0

-    lParam : 0

-    Affect : Start a rebuild of the contact list, see notes

-    Returns: 0 on success, [non zero] on failure

-    Notes  : this is the cue to clear the existing content of the list

-             expect to get a series of :

-

-             clui/groupadded

-             clui/contactadded

-             clui/resortlist

-  }

-  MS_CLUI_LISTBEGINREBUILD:PAnsiChar = 'CLUI/ListBeginRebuild';

-

-  {

-    wParam : 0

-    lParam : 0

-    Affect : End a rebuild of the contact list, see notes

-    Returns: 0 on success, [non zero] on error

-    Notes  : if you dissplayed an hourglass in beginbuild, set it back

-             here, you do not need to explicitly sort the list

-  }

-  MS_CLUI_LISTENDREBUILD:PAnsiChar = 'CLUI/ListEndRebuild';

-

-  {

-    wParam : TMCONTACT

-    lParam : MAKELPARAM(screenX, screenY)

-    Affect : A contact is being dragged outside the main window

-    Return : return [non zero] to show the drag cursor as "accepting" the drag

-             or zero to show the circle/slash 'not allowed'

-    Version: v0.1.2.0+

-  }

-  ME_CLUI_CONTACTDRAGGING:PAnsiChar = 'CLUI/ContactDragging';

-

-  {

-    wParam : TMCONTACT

-    lParam : MAKELPARAM(screenX, screenY)

-    Affect : a contact has just been dropped outside the main window, see notes

-    Notes  : return non zero to stop other hooks processing this event.

-    Version: v0.1.2.0+

-  }

-  ME_CLUI_CONTACTDROPPED:PAnsiChar = 'CLUI/ContactDropped';

-

-  {

-    wParam : TMCONTACT

-    lParam : 0

-    Affect : A contact that *was* being dragged outside the main window

-             has gone back to the main window

-    Return : always return 0

-    Version: v0.1.2.1+

-  }

-  ME_CLUI_CONTACTDRAGSTOP:PAnsiChar = 'CLUI/ContactDragStop';

-

-  // return TRUE if Clist Module Support Metacontacts

-  ME_CLUI_METASUPPORT:PAnsiChar = 'CLUI/MetaContactSupport';

-

-{$ENDIF}

diff --git a/include/m_clist.h b/include/m_clist.h
index b5ae118ca6..972485651e 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -354,6 +354,13 @@ EXTERN_C MIR_APP_DLL(MGROUP) Clist_GroupExists(LPCTSTR ptszGroupName);
 EXTERN_C MIR_APP_DLL(MGROUP) Clist_GroupCreate(MGROUP hParent, const TCHAR *ptszGroupName);

 

 /////////////////////////////////////////////////////////////////////////////////////////

+// a new group was created. Add it to the list

+// this is also called when the contact list is being rebuilt

+// new groups are always created with the name "New Group"

+

+EXTERN_C MIR_APP_DLL(void) Clist_GroupAdded(MGROUP hGroup);

+

+/////////////////////////////////////////////////////////////////////////////////////////

 // deletes a group and calls CLUI to display the change

 // returns 0 on success, nonzero on failure

 

@@ -411,6 +418,11 @@ EXTERN_C MIR_APP_DLL(int) Clist_GroupMoveBefore(MGROUP hGroup, MGROUP hGroupBefo
 EXTERN_C MIR_APP_DLL(HMENU) Clist_GroupBuildMenu(void);

 

 /////////////////////////////////////////////////////////////////////////////////////////

+// end a rebuild of the contact list

+

+EXTERN_C MIR_APP_DLL(void) Clist_EndRebuild(void);

+

+/////////////////////////////////////////////////////////////////////////////////////////

 // changes the 'hide offline contacts' flag and call CLUI

 // wParam = newValue

 // lParam = 0

@@ -452,6 +464,29 @@ EXTERN_C MIR_APP_DLL(HMENU) Clist_GroupBuildMenu(void);
 #define MS_CLIST_CONTACTSCOMPARE      "CList/ContactsCompare"

 

 /////////////////////////////////////////////////////////////////////////////////////////

+// DRAG-N-DROP SUPPORT

+/////////////////////////////////////////////////////////////////////////////////////////

+// a contact is being dragged outside the main window

+// wParam = (MCONTACT)hContact

+// lParam = MAKELPARAM(screenX, screenY)

+// return nonzero to make the cursor a 'can drop here', or zero for 'no'

+#define ME_CLUI_CONTACTDRAGGING     "CLUI/ContactDragging"

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// a contact has just been dropped outside the main window

+// wParam = (MCONTACT)hContact

+// lParam = MAKELPARAM(screenX, screenY)

+// return nonzero if your hook processed this, so no other hooks get it

+#define ME_CLUI_CONTACTDROPPED      "CLUI/ContactDropped"

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// a contact that was being dragged outside the main window has gone back in to the main window.

+// wParam = (MCONTACT)hContact

+// lParam = 0

+// always returns zero

+#define ME_CLUI_CONTACTDRAGSTOP     "CLUI/ContactDragStop"

+

+/////////////////////////////////////////////////////////////////////////////////////////

 // wParam = 0 (not used)

 // lParam = (LPARAM) &MIRANDASYSTRAYNOTIFY

 //

diff --git a/include/m_clui.h b/include/m_clui.h
deleted file mode 100644
index abf2d48a78..0000000000
--- a/include/m_clui.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (ñ) 2012-16 Miranda NG project (http://miranda-ng.org)

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef M_CLUI_H__

-#define M_CLUI_H__ 1

-

-//a new group was created. Add it to the list

-//wParam = (WPARAM)(HANDLE)hGroup

-//lParam = newGroup

-//returns 0 on success, nonzero on failure

-//newGroup is set to 1 if the user just created the group, and 0 otherwise

-//this is also called when the contact list is being rebuilt

-//new groups are always created with the name "New Group"

-#define MS_CLUI_GROUPADDED  "CLUI/GroupCreated"

-

-//start a rebuild of the contact list

-//wParam = lParam = 0

-//returns 0 on success, nonzero on failure

-//this is the cue to clear the existing contents of the list

-//expect to get a series of clui/groupadded calls followed by a series of

-//clui/contactadded calls, then a clui/resortlist

-#define MS_CLUI_LISTBEGINREBUILD  "CLUI/ListBeginRebuild"

-

-//end a rebuild of the contact list

-//wParam = lParam = 0

-//returns 0 on success, nonzero on failure

-//if you displayed an hourglass in beginrebuild, set it back here

-//you do not need to explicitly sort the list

-#define MS_CLUI_LISTENDREBUILD  "CLUI/ListEndRebuild"

-

-//a contact is being dragged outside the main window     v0.1.2.0+

-//wParam = (MCONTACT)hContact

-//lParam = MAKELPARAM(screenX, screenY)

-//return nonzero to make the cursor a 'can drop here', or zero for 'no'

-#define ME_CLUI_CONTACTDRAGGING     "CLUI/ContactDragging"

-

-//a contact has just been dropped outside the main window   v0.1.2.0+

-//wParam = (MCONTACT)hContact

-//lParam = MAKELPARAM(screenX, screenY)

-//return nonzero if your hook processed this, so no other hooks get it

-#define ME_CLUI_CONTACTDROPPED      "CLUI/ContactDropped"

-

-//a contact that was being dragged outside the main window has gone back in to

-//the main window.                                          v0.1.2.1+

-//wParam = (MCONTACT)hContact

-//lParam = 0

-//return zero

-#define ME_CLUI_CONTACTDRAGSTOP     "CLUI/ContactDragStop"

-

-// return TRUE if Clist Module Support Metacontacts

-#define MS_CLUI_METASUPPORT         "CLUI/MetaContactSupport"

-

-

-#endif // M_CLUI_H__