More reorganize all the things

Author: MaximDude

Editor/GUIEditorApp.cpp

@@ -10,7 +10,7 @@
 #include "GUI.h"
 #include "allegro.h"
 #include "GUIEditorApp.h"
-#include "DDTError.h"
+#include "RTEError.h"
 
 #include "GUI.h"
 #include "AllegroScreen.h"
@@ -98,7 +98,7 @@ bool GUIEditorApp::Initialize(void)
     BITMAP *tempBitmap;
     PALETTE newPalette;
     //if (!(tempBitmap = load_bitmap("Palette.bmp", NULL)))// newPalette)))
-      //  DDTAbort("Failed to load palette from bitmap with following path:\n\nBase.rte/palette.bmp");
+      //  RTEAbort("Failed to load palette from bitmap with following path:\n\nBase.rte/palette.bmp");
 
     PALETTE ccpal;
     get_palette(ccpal);
@@ -811,7 +811,7 @@ void GUIEditorApp::DrawSelectedControl(GUIControl *Control)
     }
 
 
-    RECT Rect;
+    GUIRect Rect;
     SetRect(&Rect, X-6, Y-6, X+Width+6, Y+Height+6);
     g_Screen->GetBitmap()->SetClipRect(&Rect);
 

GUILibrary/Source/GUI.h

@@ -18,20 +18,19 @@ struct GUIRect { long left; long top; long right; long bottom; };
 void SetRect(GUIRect *pRect, int left, int top, int right, int bottom);
 #pragma endregion
 
-#include "RTETools.h"
+//#include "RTETools.h"
 
-#include "GUI/Interface.h"
-#include "GUI/GUIProperties.h"
-#include "GUI/GUIInput.h"
-#include "GUI/GUIFont.h"
-#include "GUI/GUISkin.h"
-#include "GUI/GUIPanel.h"
-#include "GUI/GUIManager.h"
-#include "GUI/GUIUtil.h"
-#include "GUI/GUIControl.h"
-#include "GUI/GUIEvent.h"
-#include "GUI/GUIControlFactory.h"
-#include "GUI/GUIControlManager.h"
-#include "GUI/GUISound.h"
+#include "Interface.h"
+#include "GUIProperties.h"
+#include "GUIInput.h"
+#include "GUIFont.h"
+#include "GUISkin.h"
+#include "GUIPanel.h"
+#include "GUIManager.h"
+#include "GUIUtil.h"
+#include "GUIControl.h"
+#include "GUIEvent.h"
+#include "GUIControlFactory.h"
+#include "GUIControlManager.h"
 
 #endif

GUILibrary/Source/GUIListPanel.h

@@ -15,7 +15,7 @@
 // Inclusions of header files
 
 #include "GUIScrollPanel.h"
-#include "GUI/Interface.h"
+#include "Interface.h"
 
 
 namespace RTE