From 42496ef6d371aa53640989f9a4f8172bd9613143 Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Mon, 15 Oct 2018 13:54:59 +0300 Subject: [PATCH] xrGame: fix dependency of CUIDialogWndEx under Linux --- src/xrGame/ui/UIDialogWnd.h | 4 ++-- src/xrGame/ui/UIScriptWnd_script.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xrGame/ui/UIDialogWnd.h b/src/xrGame/ui/UIDialogWnd.h index af1681cfaaf..1a0ae68be11 100644 --- a/src/xrGame/ui/UIDialogWnd.h +++ b/src/xrGame/ui/UIDialogWnd.h @@ -21,8 +21,8 @@ class CUIDialogWnd : public CUIWindow virtual bool OnKeyboardAction(int dik, EUIMessages keyboard_action); virtual bool OnKeyboardHold(int dik); - CDialogHolder* GetHolder() { return m_pParentHolder; }; - void SetHolder(CDialogHolder* h) { m_pParentHolder = h; }; + CDialogHolder* GetHolder() { return m_pParentHolder; } + void SetHolder(CDialogHolder* h) { m_pParentHolder = h; } virtual bool StopAnyMove() { return true; } virtual bool NeedCursor() const { return true; } virtual bool NeedCenterCursor() const { return true; } diff --git a/src/xrGame/ui/UIScriptWnd_script.cpp b/src/xrGame/ui/UIScriptWnd_script.cpp index 8e576577b0b..d42fbe9389c 100644 --- a/src/xrGame/ui/UIScriptWnd_script.cpp +++ b/src/xrGame/ui/UIScriptWnd_script.cpp @@ -11,7 +11,7 @@ using namespace luabind; extern export_class& script_register_ui_window1(export_class&); extern export_class& script_register_ui_window2(export_class&); -SCRIPT_EXPORT(CUIDialogWndEx, (), { +SCRIPT_EXPORT(CUIDialogWndEx, (CUIDialogWnd, IFactoryObject), { export_class instance("CUIScriptWnd"); module(luaState)[script_register_ui_window2(script_register_ui_window1(instance)).def("Load", &BaseType::Load)];