merge with trunk

4 files changed, 9 insertions, 91 deletions

diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas
index 66cefac276..6237eaaa56 100644
--- a/include/delphi/m_api.pas
+++ b/include/delphi/m_api.pas
@@ -142,13 +142,19 @@ type
 

 type

   PCMPlugin = ^CMPlugin;

-  CMPlugin = record

+  CMPlugin = packed record

     vft        : pointer;  // virtual function table

+

     m_hInst    : THANDLE;

     m_szModule : PAnsiChar;

     m_pInfo    : PPLUGININFOEX;

     m_hLogger  : THANDLE;

-    m_hLang    : int;

+

+    blabla1    : pointer;  // emulator of icon's list

+    blabla2    : integer;

+    blabla3    : integer;

+    blabla4    : integer;

+    blabla5    : pointer;

   end;

 

 //----- Fork enchancement -----

@@ -219,7 +225,6 @@ var
   {$include m_history.inc}

   {$include m_hotkeys.inc}

   {$include m_icolib.inc}

-  {$include m_iconheader.inc}

   {$include m_ignore.inc}

   {$include m_imgsrvc.inc}

   {$include m_json.inc}

@@ -253,6 +258,7 @@ implementation
 initialization

   g_plugin.m_hInst := hInstance;

   g_plugin.m_pInfo := @PluginInfo;

+  g_plugin.blabla4 := 10;

   RegisterPlugin(g_plugin);

 

 finalization

diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc
index 1b1d95c378..d240073501 100644
--- a/include/delphi/m_helpers.inc
+++ b/include/delphi/m_helpers.inc
@@ -57,9 +57,6 @@ function TopToolbar_AddButton(pButton:PTTBButton):THANDLE;
 

 function Options_Open(group,page,tab:PWideChar):int_ptr;

 

-procedure MIcoTab_AddItem (hwnd:HWND; lptzName:PAnsiChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);

-procedure MIcoTab_AddItemW(hwnd:HWND; lptzName:PWideChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);

-

 {$ELSE}

 

 function _Srmm_AddButton(bbdi:pBBButton; pPlugin:Pointer) : integer; stdcall; 

@@ -335,34 +332,6 @@ begin
 	result:=_Options_Open(group,page,tab,@g_plugin);

 end;

 

-procedure MIcoTab_AddItem(hwnd:HWND; lptzName:PAnsiChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);

-var

-  mit:tMIcoTab;

-begin

-  if bSharedIcon then

-    mit.flag := MITCF_SHAREDICON

-	else

-    mit.flag := 0;

-  mit.hIcon    := hIcon;

-  mit.szName.a := lptzName;

-  mit.data     := data;

-  SendMessage(hwnd, ITCM_ADDITEM, WPARAM(@mit), 0);

-end;

-

-procedure MIcoTab_AddItemW(hwnd:HWND; lptzName:PWideChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);

-var

-  mit:tMIcoTab;

-begin

-  if bSharedIcon then

-    mit.flag := MITCF_SHAREDICON or MITCF_UNICODE

-	else

-    mit.flag := MITCF_UNICODE;

-  mit.hIcon    := hIcon;

-  mit.szName.w := lptzName;

-  mit.data     := data;

-  SendMessage(hwnd, ITCM_ADDITEM, WPARAM(@mit), 0);

-end;

-

 procedure Srmm_AddButton(bbdi:pBBButton);

 begin

    _Srmm_AddButton(bbdi,@g_plugin);

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

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

-

-Copyright 2007 Artem Shpynov

-Copyright 2000-2007 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_ICONHEADER}

-{$DEFINE M_ICONHEADER}

-

-const

-  MIRANDAICOTABCLASS = 'MirandaIcoTabClass';

-

-  MITCF_SHAREDICON = $01;

-  MITCF_UNICODE    = $02;

-

-  ITCM_FIRST = (WM_USER+1024);

-  ITCM_LAST  = (ITCM_FIRST+64);

-

-  ITCM_SETBACKGROUND = (ITCM_FIRST+1); //LPARAM is HBITMAP

-  ITCM_ADDITEM       = (ITCM_FIRST+2); //LPARAM is pointer to MIcoTab

-  ITCM_SETSEL        = (ITCM_FIRST+3); //WPARAM is new selected index

-  ITCM_GETSEL        = (ITCM_FIRST+4); //result is selected item index

-  ITCM_GETITEMDATA   = (ITCM_FIRST+5); //WPARAM is item index, result is custom data

-

-  ITCN_SELCHANGED    = 1;

-  ITCN_SELCHANGEDKBD = 2;

-// structure is used for storing info about single tab

-type

-  TMIcoTab = record

-    hIcon :HICON;

-    szName:TChar;

-    flag  :dword;

-    data  :LPARAM;

-  end;

-

-{$ENDIF}

diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc
index b1cf7e3acc..27c3d8a86e 100644
--- a/include/delphi/m_skin.inc
+++ b/include/delphi/m_skin.inc
@@ -95,9 +95,6 @@ function Skin_LoadIcon(iconId:int; big:byte) : HICON; stdcall;
 function Skin_GetIconHandle(iconId:int) : THANDLE; stdcall;

                  external AppDLL name 'Skin_GetIconHandle';

 

-function Skin_GetIconName(iconId:int) : PAnsiChar; stdcall;

-                 external AppDLL name 'Skin_GetIconName';

-

 // status mode icons. NOTE: These are deprecated in favour of LoadSkinnedProtoIcon()

 const

   SKINICON_STATUS_OFFLINE    = 0;