- MS_CLIST_REMOVECONTEXTFRAMEMENUITEM, MS_CLIST_REMOVESUBGROUPMENUITEM & MS_CLIST_REMOVEGROUPMENUITEM removed;

- minor code cleaning

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

4 files changed, 7 insertions, 49 deletions

diff --git a/include/delphi/m_cluiframes.inc b/include/delphi/m_cluiframes.inc
index 590c131cd9..e3996a88c3 100644
--- a/include/delphi/m_cluiframes.inc
+++ b/include/delphi/m_cluiframes.inc
@@ -219,14 +219,6 @@ const
   MS_CLIST_ADDCONTEXTFRAMEMENUITEM:PAnsiChar = 'CList/AddContextFrameMenuItem';

 

 {

-  remove a item from context frame menu

-  wParam=hMenuItem returned by MS_CLIST_ADDCONTACTMENUITEM

-  lParam=0

-  returns 0 on success, nonzero on failure

-}

-  MS_CLIST_REMOVECONTEXTFRAMEMENUITEM:PAnsiChar = 'CList/RemoveContextFrameMenuItem';

-

-{

   builds the context menu for a frame

   wparam=frameid

   lParam=0

diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc
index 60e47b4241..0e7f495894 100644
--- a/include/delphi/m_genmenu.inc
+++ b/include/delphi/m_genmenu.inc
@@ -71,12 +71,10 @@ plugin may add different menu items with some service.
            ME_CLIST_PREBUILDCONTACTMENU

 

    MainMenu    MS_CLIST_ADDMAINMENUITEM

-             MS_CLIST_REMOVEMAINMENUITEM

              MS_CLIST_MENUBUILDMAIN

              ME_CLIST_PREBUILDMAINMENU

 

    FrameMenu    MS_CLIST_ADDCONTEXTFRAMEMENUITEM

-             MS_CLIST_REMOVECONTEXTFRAMEMENUITEM

              MS_CLIST_MENUBUILDFRAMECONTEXT

              ME_CLIST_PREBUILDFRAMEMENU

 

@@ -90,14 +88,7 @@ plugin may add different menu items with some service.
 const

 {

   SubGroup MENU

-  remove a item from SubGroup menu

-  wParam=hMenuItem returned by MS_CLIST_ADDSubGroupMENUITEM

-  lParam=0

-  returns 0 on success, nonzero on failure

-}

-  MS_CLIST_REMOVESUBGROUPMENUITEM:PAnsiChar = 'CList/RemoveSubGroupMenuItem';

 

-{

   builds the SubGroup menu

   wParam=lParam=0

   returns a HMENU identifying the menu.

@@ -129,14 +120,6 @@ type
 

 const

 {

-  remove a item from Group menu

-  wParam=hMenuItem returned by MS_CLIST_ADDGroupMENUITEM

-  lParam=0

-  returns 0 on success, nonzero on failure

-}

-  MS_CLIST_REMOVEGROUPMENUITEM:PAnsiChar = 'CList/RemoveGroupMenuItem';

-

-{

   builds the Group menu

   wParam=lParam=0

   returns a HMENU identifying the menu.

diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h
index fa82cc4a8b..ec308ee9d2 100644
--- a/include/m_cluiframes.h
+++ b/include/m_cluiframes.h
@@ -237,13 +237,6 @@ __forceinline HGENMENU Menu_AddContextFrameMenuItem(CLISTMENUITEM *mi)
 }

 

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

-//remove a item from context frame menu

-//wParam=hMenuItem returned by MS_CLIST_ADDCONTACTMENUITEM

-//lParam=0

-//returns 0 on success, nonzero on failure

-#define MS_CLIST_REMOVECONTEXTFRAMEMENUITEM			"CList/RemoveContextFrameMenuItem"

-

-//////////////////////////////////////////////////////////////////////////

 //builds the context menu for a frame

 //wparam=frameid

 //lParam=0

diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index 1b126fca59..8d204b64c5 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -99,16 +99,12 @@ plugin may add different menu items with some service.
 // SubGroup MENU

 

 // Group MENU

-typedef struct{

-int wParam;

-int lParam;

-}GroupMenuParam,*lpGroupMenuParam;

-

-//remove a item from SubGroup menu

-//wParam=hMenuItem returned by MS_CLIST_ADDSubGroupMENUITEM

-//lParam=0

-//returns 0 on success, nonzero on failure

-#define MS_CLIST_REMOVESUBGROUPMENUITEM					"CList/RemoveSubGroupMenuItem"

+typedef struct

+{

+	int wParam;

+	int lParam;

+}

+GroupMenuParam,*lpGroupMenuParam;

 

 //builds the SubGroup menu

 //wParam=lParam=0

@@ -128,11 +124,7 @@ __forceinline HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, CLISTMENUI
 //wParam=lParam=0

 #define ME_CLIST_PREBUILDSUBGROUPMENU						"CList/PreBuildSubGroupMenu"

 

-//remove a item from Group menu

-//wParam=hMenuItem returned by MS_CLIST_ADDGROUPMENUITEM

-//lParam=0

-//returns 0 on success, nonzero on failure

-#define MS_CLIST_REMOVEGROUPMENUITEM					"CList/RemoveGroupMenuItem"

+// Group MENU

 

 //builds the Group menu

 //wParam=lParam=0

@@ -152,8 +144,6 @@ __forceinline HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, CLISTMENUITEM
 //wParam=lParam=0

 #define ME_CLIST_PREBUILDGROUPMENU						"CList/PreBuildGroupMenu"

 

-// Group MENU

-

 // TRAY MENU

 

 //builds the tray menu