sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Jérôme Leclercq 2021-11-30 12:42:19 +01:00
parent 461a06ab8c
commit 2d236afe0f
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Widgets/TextAreaWidget.hpp
View File

@ -65,6 +65,7 @@ namespace Nz
void HandleIndentation(bool add) override; void HandleIndentation(bool add) override;
void HandleSelectionIndentation(bool add) override; void HandleSelectionIndentation(bool add) override;
void HandleWordCursorMove(bool left) override; void HandleWordCursorMove(bool left) override;
void HandleWordSelection(const Vector2ui& position) override;
void PasteFromClipboard(const Vector2ui& targetPosition) override; void PasteFromClipboard(const Vector2ui& targetPosition) override;

1
src/Nazara/Widgets/AbstractTextAreaWidget.cpp
View File

@ -323,6 +323,7 @@ namespace Nz
} }
case Keyboard::VKey::Return: case Keyboard::VKey::Return:
case Keyboard::VKey::NumpadReturn:
{ {
bool ignoreDefaultAction = false; bool ignoreDefaultAction = false;
OnTextAreaKeyReturn(this, &ignoreDefaultAction); OnTextAreaKeyReturn(this, &ignoreDefaultAction);

2
xmake.lua
View File

@ -151,7 +151,7 @@ if is_plat("windows") then
set_runtimes(is_mode("debug") and "MDd" or "MD") set_runtimes(is_mode("debug") and "MDd" or "MD")
add_defines("_CRT_SECURE_NO_WARNINGS") add_defines("_CRT_SECURE_NO_WARNINGS")
add_cxxflags("/bigobj", "/permissive-", "/Zc:__cplusplus", "/Zc:referenceBinding", "/Zc:throwingNew") add_cxxflags("/bigobj", "/permissive-", "/Zc:__cplusplus", "/Zc:externConstexpr", "/Zc:inline", "/Zc:lambda", "/Zc:preprocessor", "/Zc:referenceBinding", "/Zc:strictStrings", "/Zc:throwingNew")
add_cxflags("/w44062") -- Enable warning: switch case not handled add_cxflags("/w44062") -- Enable warning: switch case not handled
add_cxflags("/wd4251") -- Disable warning: class needs to have dll-interface to be used by clients of class blah blah blah add_cxflags("/wd4251") -- Disable warning: class needs to have dll-interface to be used by clients of class blah blah blah
elseif is_plat("mingw") then elseif is_plat("mingw") then