1 files changed, 8 insertions, 9 deletions

diff --git a/Stars45/FormWindow.cpp b/Stars45/FormWindow.cpp
index bfc4558..e58042d 100644
--- a/Stars45/FormWindow.cpp
+++ b/Stars45/FormWindow.cpp
@@ -11,7 +11,6 @@
     Form Window class
 */
 
-#include "MemDebug.h"
 #include "FormWindow.h"
 #include "Screen.h"
 #include "DataLoader.h"
@@ -86,7 +85,7 @@ FormWindow::CreateButton(const char* btn_text, int ax, int ay, int aw, int ah, D
     if (pid)
     parent = FindControl(pid);
 
-    button = new(__FILE__,__LINE__) Button(parent, ax, ay, aw, ah, aid);
+    button = new Button(parent, ax, ay, aw, ah, aid);
 
     if (button) {
         button->SetForm(this);
@@ -110,7 +109,7 @@ FormWindow::CreateImageBox(const char* lbl_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    image = new(__FILE__,__LINE__) ImageBox(parent, ax, ay, aw, ah, aid);
+    image = new ImageBox(parent, ax, ay, aw, ah, aid);
 
     if (image) {
         image->SetForm(this);
@@ -134,7 +133,7 @@ FormWindow::CreateLabel(const char* label_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    label = new(__FILE__,__LINE__) ActiveWindow(screen, ax, ay, aw, ah, aid, astyle, parent);
+    label = new ActiveWindow(screen, ax, ay, aw, ah, aid, astyle, parent);
 
     if (label) {
         label->SetForm(this);
@@ -158,7 +157,7 @@ FormWindow::CreateListBox(const char* lbl_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    list = new(__FILE__,__LINE__) ListBox(parent, ax, ay, aw, ah, aid);
+    list = new ListBox(parent, ax, ay, aw, ah, aid);
 
     if (list) {
         list->SetForm(this);
@@ -181,7 +180,7 @@ FormWindow::CreateComboBox(const char* lbl_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    combo = new(__FILE__,__LINE__) ComboBox(parent, ax, ay, aw, ah, aid);
+    combo = new ComboBox(parent, ax, ay, aw, ah, aid);
 
     if (combo) {
         combo->SetForm(this);
@@ -205,7 +204,7 @@ FormWindow::CreateEditBox(const char* lbl_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    edit = new(__FILE__,__LINE__) EditBox(parent, ax, ay, aw, ah, aid);
+    edit = new EditBox(parent, ax, ay, aw, ah, aid);
 
     if (edit) {
         edit->SetForm(this);
@@ -229,7 +228,7 @@ FormWindow::CreateRichTextBox(const char* label_text, int ax, int ay, int aw, in
     if (pid)
     parent = FindControl(pid);
 
-    rtb = new(__FILE__,__LINE__) RichTextBox(parent, ax, ay, aw, ah, aid, astyle);
+    rtb = new RichTextBox(parent, ax, ay, aw, ah, aid, astyle);
 
     if (rtb) {
         rtb->SetForm(this);
@@ -253,7 +252,7 @@ FormWindow::CreateSlider(const char* label_text, int ax, int ay, int aw, int ah,
     if (pid)
     parent = FindControl(pid);
 
-    slider = new(__FILE__,__LINE__) Slider(parent, ax, ay, aw, ah, aid);
+    slider = new Slider(parent, ax, ay, aw, ah, aid);
 
     if (slider) {
         slider->SetForm(this);