From 169187e23c242827c106b3266a0697a8d4c8d904 Mon Sep 17 00:00:00 2001
From: Vadim Yegorov <oo.zg.oo@gmail.com>
Date: Sun, 8 May 2016 10:41:51 +0000
Subject: [PATCH] =?UTF-8?q?luamacro:=201.=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B6=D0=BA=D0=B0=20WTYPE=5FCOMBOBOX.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/luamacro/_globalinfo.lua  | 2 +-
 plugins/luamacro/changelog        | 6 +++++-
 plugins/luamacro/luafar/service.c | 1 +
 plugins/luamacro/luamacro.rc      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
index 4d0176ef01..4a00cd9a66 100644
--- a/plugins/luamacro/_globalinfo.lua
+++ b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 1, 0, 0, 569 },
+    Version       = { 1, 0, 0, 570 },
     MinFarVersion = { 3, 0, 0, 4582 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",
diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
index 33da451fcf..039b92e619 100644
--- a/plugins/luamacro/changelog
+++ b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 21.04.2016 23:04:40 +0200 - build 569
+zg 08.05.2016 13:40:15 +0200 - build 570
+
+1. поддержка WTYPE_COMBOBOX.
+
+shmuel 21.04.2016 23:04:40 +0200 - build 569
 
 1. LuaFAR: функция far.PasteFromClipboard теперь возвращает всю строку, полученную от Far,
    а не до первого символа '\0'.
diff --git a/plugins/luamacro/luafar/service.c b/plugins/luamacro/luafar/service.c
index 4c5a072c66..7e351d1ac0 100644
--- a/plugins/luamacro/luafar/service.c
+++ b/plugins/luamacro/luafar/service.c
@@ -4483,6 +4483,7 @@ static int far_AdvControl(lua_State *L)
 			{
 				case WTYPE_DIALOG:
 				case WTYPE_VMENU:
+				case WTYPE_COMBOBOX:
 					NewDialogData(L, Info, CAST(HANDLE, wi.Id), FALSE);
 					lua_setfield(L, -2, "Id");
 					break;
diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc
index bde73f4f44..77d555440c 100644
--- a/plugins/luamacro/luamacro.rc
+++ b/plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 569
+#define PLUGIN_BUILD 570
 #define PLUGIN_DESC "Lua Macros for Far Manager"
 #define PLUGIN_NAME "LuaMacro"
 #define PLUGIN_FILENAME "luamacro.dll"