From a12e588079700d55a0b788fea2df7727c2e41f52 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 27 Mar 2022 17:42:26 +0200 Subject: Removed MemDebug from FoundationEx --- Stars45/ActiveWindow.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Stars45/ActiveWindow.cpp') diff --git a/Stars45/ActiveWindow.cpp b/Stars45/ActiveWindow.cpp index f65a3c3..4c99ef8 100644 --- a/Stars45/ActiveWindow.cpp +++ b/Stars45/ActiveWindow.cpp @@ -12,7 +12,6 @@ */ #include -#include "MemDebug.h" #include "ActiveWindow.h" #include "EventDispatch.h" #include "Color.h" @@ -180,7 +179,7 @@ const std::vector& weight_x, const std::vector& weight_y) { if (!layout) - layout = new(__FILE__,__LINE__) Layout; + layout = new Layout; if (layout) layout->SetConstraints(min_x, min_y, weight_x, weight_y); @@ -193,7 +192,7 @@ const std::vector& weight_x, const std::vector& weight_y) { if (!layout) - layout = new(__FILE__,__LINE__) Layout; + layout = new Layout; if (layout) layout->SetConstraints(min_x, min_y, weight_x, weight_y); @@ -208,7 +207,7 @@ float* weight_x, float* weight_y) { if (!layout) - layout = new(__FILE__,__LINE__) Layout; + layout = new Layout; if (layout) layout->SetConstraints(nrows, ncols, min_x, min_y, weight_x, weight_y); @@ -340,7 +339,7 @@ ActiveWindow::CalcGrid() tex_w = (float) texture->Width(); tex_h = (float) texture->Height(); - vset = new(__FILE__,__LINE__) VertexSet(nverts); + vset = new VertexSet(nverts); int v = 0; @@ -365,10 +364,10 @@ ActiveWindow::CalcGrid() } } - mtl = new(__FILE__,__LINE__) Material; + mtl = new Material; mtl->tex_diffuse = texture; - polys = new(__FILE__,__LINE__) Poly[npolys]; + polys = new Poly[npolys]; Poly* p = polys; @@ -602,7 +601,7 @@ ActiveWindow::SetText(const char* t) int len = strlen(t); if (len > 0) { - char* buf = new(__FILE__,__LINE__) char[2*len]; + char* buf = new char[2*len]; if (buf != 0) { const char* src = t; @@ -647,7 +646,7 @@ ActiveWindow::SetText(const Text& t) int len = t.length(); if (len > 0 && t.contains('\\')) { - char* buf = new(__FILE__,__LINE__) char[2*len]; + char* buf = new char[2*len]; if (buf != 0) { const char* src = t; @@ -777,7 +776,7 @@ ActiveWindow::DrawText(const char* txt, int count, Rect& txt_rect, DWORD flags) void ActiveWindow::RegisterClient(int eid, ActiveWindow* client, PFVAWE callback) { - AWMap* map = new(__FILE__,__LINE__) AWMap(eid, client, callback); + AWMap* map = new AWMap(eid, client, callback); if (map != 0) clients.append(map); -- cgit v1.1