Skip to content

Commit 3040929

Browse files
committed
Fix wasm compiling warnigs and errors
1 parent bf5e970 commit 3040929

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

core/2d/Label.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ void Label::updateContent()
17391739
_debugDrawNode->clear();
17401740
Vec2 vertices[4] = {Vec2::ZERO, Vec2(_contentSize.width, 0.0f), Vec2(_contentSize.width, _contentSize.height),
17411741
Vec2(0.0f, _contentSize.height)};
1742-
_debugDrawNode->drawPoly(vertices, 4, true, Color32::WHITE);
1742+
_debugDrawNode->drawPoly(vertices, 4, true, Color::WHITE);
17431743
#endif
17441744
}
17451745

core/ui/UIEditBox/UIEditBoxImpl-wasm.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ extern "C" {
4242
EMSCRIPTEN_KEEPALIVE
4343
void getInputOver(char* dataPtr, int dataLength)
4444
{
45-
AXLOGD("text {} ", dataPtr);
45+
std::string_view text{ dataPtr, static_cast<size_t>(dataLength) };
46+
AXLOGD("text {} ", text);
4647
if (_activeEditBox)
4748
{
4849
if (_activeEditBox->isEditingMode())
49-
_activeEditBox->editBoxEditingDidEnd(std::string_view{(char*)dataPtr},
50+
_activeEditBox->editBoxEditingDidEnd(text,
5051
EditBoxDelegate::EditBoxEndAction::RETURN);
5152
_activeEditBox = nullptr;
5253
}
@@ -57,10 +58,11 @@ EMSCRIPTEN_KEEPALIVE
5758

5859
void getInputChange(char* dataPtr, int dataLength)
5960
{
60-
AXLOGD("text {} ", dataPtr);
61+
std::string_view text{ dataPtr, static_cast<size_t>(dataLength) };
62+
AXLOGD("text {} ", text);
6163
if (_activeEditBox && _activeEditBox->isEditingMode())
6264
{
63-
_activeEditBox->editBoxEditingChanged(std::string_view{(char*)dataPtr});
65+
_activeEditBox->editBoxEditingChanged(text);
6466
}
6567
free(dataPtr);
6668
}

core/ui/UIWebView/UIWebViewImpl-win32.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
# include "platform/FileUtils.h"
3535
# include "platform/GLView.h"
3636
# include "ui/UIHelper.h"
37-
# include "rapidjson/document.h"
38-
# include "rapidjson/stringbuffer.h"
39-
# include "rapidjson/writer.h"
4037
# include "base/Utils.h"
4138

4239
# define WIN32_LEAN_AND_MEAN

0 commit comments

Comments
 (0)