From e1a951460fef9eecef8944a7e5fce4e51bb9387a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 13 Jun 2012 16:38:06 +0000 Subject: - advanced version processing - another unneeded variable removed; git-svn-id: http://svn.miranda-ng.org/main/trunk@396 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TopToolBar/main.cpp | 22 +++++++++++----------- plugins/TopToolBar/ttbopt.cpp | 2 -- plugins/TopToolBar/version.h | 14 +++++++++++--- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/plugins/TopToolBar/main.cpp b/plugins/TopToolBar/main.cpp index c29cba78cf..38f1805379 100644 --- a/plugins/TopToolBar/main.cpp +++ b/plugins/TopToolBar/main.cpp @@ -8,7 +8,7 @@ PLUGINLINK *pluginLink; MM_INTERFACE mmi; LIST_INTERFACE li; HANDLE hHookTTBModuleLoaded; -int hLangpack; +int hLangpack; LIST arHooks(10), arServices(10); @@ -31,17 +31,17 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) ///////////////////////////////////////////////////////////////////////////////////////// -PLUGININFOEX pluginInfo = +PLUGININFOEX pluginInfo = { - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - __VERSION_DWORD, - __PLUGIN_DESC, - __PLUGIN_AUTHOR, - __PLUGIN_EMAIL, - __PLUGIN_RIGHTS, - "http://www.miranda-im.org/", - UNICODE_AWARE, + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __PLUGIN_DESC, + __PLUGIN_AUTHOR, + __PLUGIN_EMAIL, + __PLUGIN_RIGHTS, + __PLUGIN_AUTHORWEB, + UNICODE_AWARE, 0, //doesn't replace anything built-in MIID_TTB }; diff --git a/plugins/TopToolBar/ttbopt.cpp b/plugins/TopToolBar/ttbopt.cpp index 267f05eb27..bb38550d2a 100644 --- a/plugins/TopToolBar/ttbopt.cpp +++ b/plugins/TopToolBar/ttbopt.cpp @@ -142,7 +142,6 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); if (ctrlid == IDC_LBUTTONSET) { - int curselect; TVITEM tvi; tvi.hItem = TreeView_GetSelection(GetDlgItem(hwndDlg, IDC_BUTTONORDERTREE)); if (tvi.hItem == NULL) @@ -177,7 +176,6 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } if (ctrlid == IDC_DELLBUTTON) { - int curselect; TVITEM tvi; tvi.hItem = TreeView_GetSelection(GetDlgItem(hwndDlg, IDC_BUTTONORDERTREE)); if (tvi.hItem == NULL) diff --git a/plugins/TopToolBar/version.h b/plugins/TopToolBar/version.h index 6873336024..a78ac14187 100644 --- a/plugins/TopToolBar/version.h +++ b/plugins/TopToolBar/version.h @@ -21,15 +21,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 8 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 -#define __FILEVERSION_STRING 0,8,0,1 -#define __VERSION_STRING "0.8.0.1" -#define __VERSION_DWORD 0x00080001 +// other stuff for Version resource +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_STRING_DOTS) #define __PLUGIN_DESC "ToptoolBar adds buttons in top frame for fast access." #define __PLUGIN_LONGDESC __PLUGIN_DESC #define __PLUGIN_AUTHOR "Bethoven" +#define __PLUGIN_AUTHORWEB "http://www.miranda-im.org/" #define __PLUGIN_EMAIL "Bethoven@mailgate.ru" #define __PLUGIN_RIGHTS "© 2003-2008 Bethoven" #define __PLUGIN_FILE "TopToolbar.dll" -- cgit v1.2.3