diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj index 944b57a6..09fba364 100644 --- a/projects/kiwano/kiwano.vcxproj +++ b/projects/kiwano/kiwano.vcxproj @@ -13,6 +13,7 @@ + @@ -121,6 +122,7 @@ + diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters index 83497999..469121fb 100644 --- a/projects/kiwano/kiwano.vcxproj.filters +++ b/projects/kiwano/kiwano.vcxproj.filters @@ -318,6 +318,9 @@ 2d + + core + @@ -527,5 +530,8 @@ 2d + + core + \ No newline at end of file diff --git a/src/kiwano/2d/Actor.cpp b/src/kiwano/2d/Actor.cpp index 41dbde9d..61334163 100644 --- a/src/kiwano/2d/Actor.cpp +++ b/src/kiwano/2d/Actor.cpp @@ -41,7 +41,7 @@ void Actor::SetDefaultAnchor(float anchor_x, float anchor_y) ActorPtr Actor::Create() { - ActorPtr ptr = new (std::nothrow) Actor; + ActorPtr ptr = memory::New(); return ptr; } @@ -246,7 +246,7 @@ bool Actor::HandleEvent(Event* evt) { hover_ = true; - MouseHoverEventPtr hover = new MouseHoverEvent; + MouseHoverEventPtr hover = memory::New(); hover->pos = mouse_evt->pos; HandleEvent(hover.Get()); } @@ -255,7 +255,7 @@ bool Actor::HandleEvent(Event* evt) hover_ = false; pressed_ = false; - MouseOutEventPtr out = new MouseOutEvent; + MouseOutEventPtr out = memory::New(); out->pos = mouse_evt->pos; HandleEvent(out.Get()); } @@ -272,7 +272,7 @@ bool Actor::HandleEvent(Event* evt) auto mouse_up_evt = dynamic_cast(evt); - MouseClickEventPtr click = new MouseClickEvent; + MouseClickEventPtr click = memory::New(); click->pos = mouse_up_evt->pos; click->button = mouse_up_evt->button; HandleEvent(click.Get()); diff --git a/src/kiwano/2d/Button.cpp b/src/kiwano/2d/Button.cpp index 47149022..127d132d 100644 --- a/src/kiwano/2d/Button.cpp +++ b/src/kiwano/2d/Button.cpp @@ -33,7 +33,7 @@ ButtonPtr Button::Create(const Callback& click) ButtonPtr Button::Create(const Callback& click, const Callback& pressed, const Callback& mouse_over, const Callback& mouse_out) { - ButtonPtr ptr = new (std::nothrow) Button; + ButtonPtr ptr = memory::New