Engine: removed excessive header guidialoginternaldefs.h

adventuregamestudio · Oct 16, 2023 · 55c81e9 · 55c81e9
1 parent 5ec52ba
commit 55c81e9
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 60 deletions.
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -350,7 +350,6 @@ target_sources(engine
     gui/guidialog.cpp
     gui/guidialog.h
     gui/guidialogdefines.h
-    gui/guidialoginternaldefs.h
     gui/mycontrols.h
     gui/mylabel.cpp
     gui/mylabel.h

diff --git a/Engine/gui/cscidialog.h b/Engine/gui/cscidialog.h
@@ -18,7 +18,7 @@
 #ifndef __AGS_EE_GUI__CSCIDIALOG_H
 #define __AGS_EE_GUI__CSCIDIALOG_H
 
-#include "gui/guidialoginternaldefs.h"
+#include "gui/guidialogdefines.h"
 
 int  CSCIGetVersion();
 int  CSCIDrawWindow(int xx, int yy, int wid, int hit);

diff --git a/Engine/gui/guidialogdefines.h b/Engine/gui/guidialogdefines.h
@@ -12,7 +12,7 @@
 //
 //=============================================================================
 //
-//
+// Constants for built-in GUI dialogs.
 //
 //=============================================================================
 #ifndef __AGS_EE_GUI__GUIDIALOGDEFINES_H
@@ -32,6 +32,7 @@
 #define MSG_QUITDIALOG   995    // "Do you want to quit?"
 
 #include "ac/gamesetup.h"
+#define TEXT_HT usetup.textheight
 
 /*#define COL251 26
 #define COL252 28

diff --git a/Engine/gui/guidialoginternaldefs.h b/Engine/gui/guidialoginternaldefs.h
diff --git a/Engine/gui/mylabel.cpp b/Engine/gui/mylabel.cpp
@@ -11,15 +11,13 @@
 // http://www.opensource.org/licenses/artistic-license-2.0.php
 //
 //=============================================================================
-
+#include "gui/mylabel.h"
 #include <string.h>
 #include "ac/display.h"
 #include "ac/gamesetup.h"
 #include "ac/string.h"
 #include "font/fonts.h"
-#include "gui/guidefines.h"
-#include "gui/mylabel.h"
-#include "gui/guidialoginternaldefs.h"
+#include "gui/guidialogdefines.h"
 
 using namespace Common;
 

diff --git a/Engine/gui/mylistbox.cpp b/Engine/gui/mylistbox.cpp
@@ -11,17 +11,17 @@
 // http://www.opensource.org/licenses/artistic-license-2.0.php
 //
 //=============================================================================
+#include "gui/mylistbox.h"
 #include <string.h>
 #include "ac/common.h"
 #include "ac/gamesetup.h"
 #include "ac/keycode.h"
 #include "font/fonts.h"
 #include "gfx/bitmap.h"
 #include "gui/guidialog.h"
-#include "gui/guidialoginternaldefs.h"
-#include "gui/mylistbox.h"
+#include "gui/guidialogdefines.h"
 
-using AGS::Common::Bitmap;
+using namespace AGS::Common;
 
 extern int numcurso, hotx, hoty;
 

diff --git a/Engine/gui/mypushbutton.cpp b/Engine/gui/mypushbutton.cpp
@@ -11,19 +11,19 @@
 // http://www.opensource.org/licenses/artistic-license-2.0.php
 //
 //=============================================================================
+#include "gui/mypushbutton.h"
 #include <string.h>
 #include "ac/common.h"
 #include "ac/sys_events.h"
+#include "ac/timer.h"
 #include "font/fonts.h"
-#include "gui/mypushbutton.h"
+#include "gfx/bitmap.h"
 #include "gui/guidialog.h"
-#include "gui/guidialoginternaldefs.h"
+#include "gui/guidialogdefines.h"
 #include "main/game_run.h"
-#include "gfx/bitmap.h"
 #include "platform/base/agsplatformdriver.h"
-#include "ac/timer.h"
 
-using AGS::Common::Bitmap;
+using namespace AGS::Common;
 
 extern int windowbackgroundcolor, pushbuttondarkcolor;
 extern int pushbuttonlightcolor;

diff --git a/Engine/gui/mytextbox.cpp b/Engine/gui/mytextbox.cpp
@@ -11,15 +11,15 @@
 // http://www.opensource.org/licenses/artistic-license-2.0.php
 //
 //=============================================================================
+#include "gui/mytextbox.h"
 #include <stdio.h>
 #include <string.h>
 #include "ac/keycode.h"
 #include "font/fonts.h"
-#include "gui/mytextbox.h"
-#include "gui/guidialoginternaldefs.h"
 #include "gfx/bitmap.h"
+#include "gui/guidialogdefines.h"
 
-using AGS::Common::Bitmap;
+using namespace AGS::Common;
 
 extern int windowbackgroundcolor;
 extern int cbuttfont;

diff --git a/Engine/gui/newcontrol.cpp b/Engine/gui/newcontrol.cpp
@@ -11,10 +11,9 @@
 // http://www.opensource.org/licenses/artistic-license-2.0.php
 //
 //=============================================================================
-
 #include "gui/newcontrol.h"
 #include "gui/guidialog.h"
-#include "gui/guidialoginternaldefs.h"
+#include "gui/guidialogdefines.h"
 
 extern int topwindowhandle;
 

diff --git a/OSX/xcode/AGSKit/AGSKit.xcodeproj/project.pbxproj b/OSX/xcode/AGSKit/AGSKit.xcodeproj/project.pbxproj
@@ -823,7 +823,6 @@
 		526F27D51D3B5CC300EF4E1F /* guidialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 526F25581D3B5CC300EF4E1F /* guidialog.cpp */; };
 		526F27D61D3B5CC300EF4E1F /* guidialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 526F25591D3B5CC300EF4E1F /* guidialog.h */; };
 		526F27D71D3B5CC300EF4E1F /* guidialogdefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 526F255A1D3B5CC300EF4E1F /* guidialogdefines.h */; };
-		526F27D81D3B5CC300EF4E1F /* guidialoginternaldefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 526F255B1D3B5CC300EF4E1F /* guidialoginternaldefs.h */; };
 		526F27D91D3B5CC300EF4E1F /* mycontrols.h in Headers */ = {isa = PBXBuildFile; fileRef = 526F255C1D3B5CC300EF4E1F /* mycontrols.h */; };
 		526F27DA1D3B5CC300EF4E1F /* mylabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 526F255D1D3B5CC300EF4E1F /* mylabel.cpp */; };
 		526F27DB1D3B5CC300EF4E1F /* mylabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 526F255E1D3B5CC300EF4E1F /* mylabel.h */; };
@@ -1776,7 +1775,6 @@
 		526F25581D3B5CC300EF4E1F /* guidialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guidialog.cpp; sourceTree = "<group>"; };
 		526F25591D3B5CC300EF4E1F /* guidialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialog.h; sourceTree = "<group>"; };
 		526F255A1D3B5CC300EF4E1F /* guidialogdefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialogdefines.h; sourceTree = "<group>"; };
-		526F255B1D3B5CC300EF4E1F /* guidialoginternaldefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialoginternaldefs.h; sourceTree = "<group>"; };
 		526F255C1D3B5CC300EF4E1F /* mycontrols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mycontrols.h; sourceTree = "<group>"; };
 		526F255D1D3B5CC300EF4E1F /* mylabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mylabel.cpp; sourceTree = "<group>"; };
 		526F255E1D3B5CC300EF4E1F /* mylabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mylabel.h; sourceTree = "<group>"; };
@@ -3253,7 +3251,6 @@
 				526F25581D3B5CC300EF4E1F /* guidialog.cpp */,
 				526F25591D3B5CC300EF4E1F /* guidialog.h */,
 				526F255A1D3B5CC300EF4E1F /* guidialogdefines.h */,
-				526F255B1D3B5CC300EF4E1F /* guidialoginternaldefs.h */,
 				526F255C1D3B5CC300EF4E1F /* mycontrols.h */,
 				526F255D1D3B5CC300EF4E1F /* mylabel.cpp */,
 				526F255E1D3B5CC300EF4E1F /* mylabel.h */,
@@ -3909,7 +3906,6 @@
 				526F22EC1D3B5C4900EF4E1F /* guislider.h in Headers */,
 				526F22EF1D3B5C4900EF4E1F /* aastr.h in Headers */,
 				205229A028E8EBA900589E91 /* debugmanager.h in Headers */,
-				526F27D81D3B5CC300EF4E1F /* guidialoginternaldefs.h in Headers */,
 				526F27DF1D3B5CC300EF4E1F /* mypushbutton.h in Headers */,
 				20E67DB328F1BDE000B95C00 /* system.h in Headers */,
 				526F23131D3B5C4900EF4E1F /* vorbisenc.h in Headers */,

diff --git a/Solutions/Engine.App/Engine.App.vcxproj b/Solutions/Engine.App/Engine.App.vcxproj
@@ -875,7 +875,6 @@
     <ClInclude Include="..\..\Engine\gui\gui.h" />
     <ClInclude Include="..\..\Engine\gui\guidialog.h" />
     <ClInclude Include="..\..\Engine\gui\guidialogdefines.h" />
-    <ClInclude Include="..\..\Engine\gui\guidialoginternaldefs.h" />
     <ClInclude Include="..\..\Engine\gui\mycontrols.h" />
     <ClInclude Include="..\..\Engine\gui\mylabel.h" />
     <ClInclude Include="..\..\Engine\gui\mylistbox.h" />

diff --git a/Solutions/Engine.App/Engine.App.vcxproj.filters b/Solutions/Engine.App/Engine.App.vcxproj.filters
@@ -1364,9 +1364,6 @@
     <ClInclude Include="..\..\Engine\gui\guidialogdefines.h">
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Engine\gui\guidialoginternaldefs.h">
-      <Filter>Header Files\gui</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Engine\gui\mycontrols.h">
       <Filter>Header Files\gui</Filter>
     </ClInclude>

diff --git a/iOS/xcode/ags/ags.xcodeproj/project.pbxproj b/iOS/xcode/ags/ags.xcodeproj/project.pbxproj
@@ -889,7 +889,6 @@
 		526F1E801D3B513400EF4E1F /* guidialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guidialog.cpp; sourceTree = "<group>"; };
 		526F1E811D3B513400EF4E1F /* guidialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialog.h; sourceTree = "<group>"; };
 		526F1E821D3B513400EF4E1F /* guidialogdefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialogdefines.h; sourceTree = "<group>"; };
-		526F1E831D3B513400EF4E1F /* guidialoginternaldefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guidialoginternaldefs.h; sourceTree = "<group>"; };
 		526F1E841D3B513400EF4E1F /* mycontrols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mycontrols.h; sourceTree = "<group>"; };
 		526F1E851D3B513400EF4E1F /* mylabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mylabel.cpp; sourceTree = "<group>"; };
 		526F1E861D3B513400EF4E1F /* mylabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mylabel.h; sourceTree = "<group>"; };
@@ -1922,7 +1921,6 @@
 				526F1E801D3B513400EF4E1F /* guidialog.cpp */,
 				526F1E811D3B513400EF4E1F /* guidialog.h */,
 				526F1E821D3B513400EF4E1F /* guidialogdefines.h */,
-				526F1E831D3B513400EF4E1F /* guidialoginternaldefs.h */,
 				526F1E841D3B513400EF4E1F /* mycontrols.h */,
 				526F1E851D3B513400EF4E1F /* mylabel.cpp */,
 				526F1E861D3B513400EF4E1F /* mylabel.h */,