From 522018d6360091cbd9f35b03363c8d783cf4cc73 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Fri, 17 Nov 2017 13:30:17 -0330 Subject: [PATCH] More header file reorg/optimization. --- src/cheat/CheatCodeDialog.cxx | 1 + src/common/FBSurfaceSDL2.hxx | 1 + src/common/PNGLibrary.cxx | 1 + src/common/tv_filters/AtariNTSC.hxx | 2 ++ src/debugger/gui/AudioWidget.cxx | 2 +- src/debugger/gui/CartRamWidget.cxx | 1 + src/debugger/gui/ControllerWidget.hxx | 1 + src/debugger/gui/CpuWidget.cxx | 1 + src/debugger/gui/DataGridOpsWidget.cxx | 1 + src/debugger/gui/DataGridWidget.cxx | 2 ++ src/debugger/gui/DelayQueueWidget.cxx | 2 ++ src/debugger/gui/PromptWidget.cxx | 3 ++- src/debugger/gui/RamWidget.cxx | 1 + src/debugger/gui/RomListSettings.cxx | 2 ++ src/debugger/gui/RomListWidget.cxx | 2 ++ src/debugger/gui/RomWidget.cxx | 1 + src/debugger/gui/TiaInfoWidget.cxx | 2 +- src/debugger/gui/TiaOutputWidget.cxx | 1 + src/debugger/gui/TiaWidget.cxx | 1 + src/debugger/gui/TiaZoomWidget.cxx | 1 + src/debugger/gui/ToggleBitWidget.cxx | 3 ++- src/debugger/gui/TogglePixelWidget.cxx | 4 ++-- src/emucore/AtariVox.hxx | 1 - src/emucore/Console.cxx | 1 + src/emucore/Driving.hxx | 1 - src/emucore/EventHandler.cxx | 1 + src/emucore/EventJoyHandler.cxx | 1 - src/emucore/FBSurface.cxx | 2 ++ src/emucore/FBSurface.hxx | 21 ++++++--------------- src/emucore/FrameBuffer.cxx | 5 +++++ src/emucore/FrameBuffer.hxx | 6 +++--- src/emucore/FrameBufferConstants.hxx | 13 +++++++++++++ src/emucore/OSystem.cxx | 1 + src/emucore/TIASurface.cxx | 4 +--- src/gui/AboutDialog.cxx | 2 +- src/gui/AboutDialog.hxx | 1 + src/gui/AudioDialog.cxx | 1 + src/gui/BrowserDialog.cxx | 5 +---- src/gui/CheckListWidget.cxx | 3 ++- src/gui/ColorWidget.cxx | 5 ++--- src/gui/ComboDialog.cxx | 6 +----- src/gui/CommandDialog.cxx | 2 +- src/gui/ConfigPathDialog.cxx | 3 +-- src/gui/ContextMenu.cxx | 2 ++ src/gui/Dialog.cxx | 2 ++ src/gui/DialogContainer.cxx | 1 + src/gui/EditTextWidget.cxx | 6 ++---- src/gui/EditableWidget.cxx | 2 ++ src/gui/EventMappingWidget.cxx | 1 + src/gui/GameInfoDialog.cxx | 1 + src/gui/GlobalPropsDialog.cxx | 4 ++-- src/gui/HelpDialog.cxx | 4 +--- src/gui/InputDialog.cxx | 4 +--- src/gui/InputTextDialog.cxx | 5 +++-- src/gui/JoystickDialog.cxx | 2 +- src/gui/LauncherDialog.cxx | 7 ++----- src/gui/LauncherDialog.hxx | 3 +-- src/gui/LauncherFilterDialog.cxx | 7 +------ src/gui/LoggerDialog.cxx | 5 ++--- src/gui/MessageBox.cxx | 2 +- src/gui/OptionsDialog.cxx | 6 ++++++ src/gui/OptionsDialog.hxx | 2 +- src/gui/PopUpWidget.cxx | 4 ++-- src/gui/ProgressDialog.cxx | 5 +++-- src/gui/RomAuditDialog.cxx | 2 +- src/gui/RomInfoWidget.cxx | 3 +++ src/gui/ScrollBarWidget.cxx | 2 +- src/gui/SnapshotDialog.cxx | 3 +-- src/gui/StringListWidget.cxx | 2 ++ src/gui/TabWidget.cxx | 5 ++--- src/gui/UIDialog.cxx | 10 ++++++---- src/gui/VideoDialog.cxx | 6 ++---- src/gui/VideoDialog.hxx | 1 + src/gui/Widget.cxx | 5 +---- src/gui/Widget.hxx | 14 ++++++-------- 75 files changed, 138 insertions(+), 111 deletions(-) diff --git a/src/cheat/CheatCodeDialog.cxx b/src/cheat/CheatCodeDialog.cxx index 03fe7282a..f4651597d 100644 --- a/src/cheat/CheatCodeDialog.cxx +++ b/src/cheat/CheatCodeDialog.cxx @@ -22,6 +22,7 @@ #include "CheckListWidget.hxx" #include "DialogContainer.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "InputTextDialog.hxx" #include "OSystem.hxx" #include "Props.hxx" diff --git a/src/common/FBSurfaceSDL2.hxx b/src/common/FBSurfaceSDL2.hxx index 79a1eceef..1471d06eb 100644 --- a/src/common/FBSurfaceSDL2.hxx +++ b/src/common/FBSurfaceSDL2.hxx @@ -19,6 +19,7 @@ #define FBSURFACE_SDL2_HXX #include "bspf.hxx" +#include "FBSurface.hxx" #include "FrameBufferSDL2.hxx" /** diff --git a/src/common/PNGLibrary.cxx b/src/common/PNGLibrary.cxx index ab7298712..45fccbddb 100644 --- a/src/common/PNGLibrary.cxx +++ b/src/common/PNGLibrary.cxx @@ -19,6 +19,7 @@ #include "bspf.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Props.hxx" #include "PNGLibrary.hxx" diff --git a/src/common/tv_filters/AtariNTSC.hxx b/src/common/tv_filters/AtariNTSC.hxx index 9941548b6..2b3c3a7fb 100644 --- a/src/common/tv_filters/AtariNTSC.hxx +++ b/src/common/tv_filters/AtariNTSC.hxx @@ -41,6 +41,8 @@ #define ATARI_NTSC_HXX #include +#include + #include "bspf.hxx" class AtariNTSC diff --git a/src/debugger/gui/AudioWidget.cxx b/src/debugger/gui/AudioWidget.cxx index 3fc2a53ec..f50ccb8ba 100644 --- a/src/debugger/gui/AudioWidget.cxx +++ b/src/debugger/gui/AudioWidget.cxx @@ -16,8 +16,8 @@ //============================================================================ #include "DataGridWidget.hxx" -#include "FrameBuffer.hxx" #include "GuiObject.hxx" +#include "Font.hxx" #include "OSystem.hxx" #include "Debugger.hxx" #include "TIADebug.hxx" diff --git a/src/debugger/gui/CartRamWidget.cxx b/src/debugger/gui/CartRamWidget.cxx index 9ac4a6ad5..de113c6ec 100644 --- a/src/debugger/gui/CartRamWidget.cxx +++ b/src/debugger/gui/CartRamWidget.cxx @@ -21,6 +21,7 @@ #include "CartDebug.hxx" #include "StringParser.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "StringListWidget.hxx" #include "CartDebugWidget.hxx" #include "CartRamWidget.hxx" diff --git a/src/debugger/gui/ControllerWidget.hxx b/src/debugger/gui/ControllerWidget.hxx index 5cace2997..82f529547 100644 --- a/src/debugger/gui/ControllerWidget.hxx +++ b/src/debugger/gui/ControllerWidget.hxx @@ -21,6 +21,7 @@ class GuiObject; class ButtonWidget; +#include "Font.hxx" #include "Widget.hxx" #include "Console.hxx" #include "Command.hxx" diff --git a/src/debugger/gui/CpuWidget.cxx b/src/debugger/gui/CpuWidget.cxx index dba3b9ab7..bf4afe45e 100644 --- a/src/debugger/gui/CpuWidget.cxx +++ b/src/debugger/gui/CpuWidget.cxx @@ -23,6 +23,7 @@ #include "CartDebug.hxx" #include "CpuDebug.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "DataGridWidget.hxx" #include "EditTextWidget.hxx" #include "ToggleBitWidget.hxx" diff --git a/src/debugger/gui/DataGridOpsWidget.cxx b/src/debugger/gui/DataGridOpsWidget.cxx index cef605679..bbadb90de 100644 --- a/src/debugger/gui/DataGridOpsWidget.cxx +++ b/src/debugger/gui/DataGridOpsWidget.cxx @@ -15,6 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "Font.hxx" #include "DataGridOpsWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/DataGridWidget.cxx b/src/debugger/gui/DataGridWidget.cxx index 568fea2a8..2e9c575d0 100644 --- a/src/debugger/gui/DataGridWidget.cxx +++ b/src/debugger/gui/DataGridWidget.cxx @@ -18,8 +18,10 @@ #include "OSystem.hxx" #include "Widget.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "Debugger.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "DataGridWidget.hxx" #include "DataGridOpsWidget.hxx" #include "RamWidget.hxx" diff --git a/src/debugger/gui/DelayQueueWidget.cxx b/src/debugger/gui/DelayQueueWidget.cxx index 658434548..22f944f27 100644 --- a/src/debugger/gui/DelayQueueWidget.cxx +++ b/src/debugger/gui/DelayQueueWidget.cxx @@ -22,6 +22,8 @@ #include "Debugger.hxx" #include "CartDebug.hxx" #include "TIADebug.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "Base.hxx" #include "TIA.hxx" diff --git a/src/debugger/gui/PromptWidget.cxx b/src/debugger/gui/PromptWidget.cxx index c63220db7..7b2c76bab 100644 --- a/src/debugger/gui/PromptWidget.cxx +++ b/src/debugger/gui/PromptWidget.cxx @@ -16,7 +16,8 @@ //============================================================================ #include "ScrollBarWidget.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "EventHandler.hxx" #include "Version.hxx" #include "Debugger.hxx" diff --git a/src/debugger/gui/RamWidget.cxx b/src/debugger/gui/RamWidget.cxx index 1e26cfbed..497dfde41 100644 --- a/src/debugger/gui/RamWidget.cxx +++ b/src/debugger/gui/RamWidget.cxx @@ -22,6 +22,7 @@ #include "OSystem.hxx" #include "Debugger.hxx" #include "CartDebug.hxx" +#include "Font.hxx" #include "Widget.hxx" #include "RamWidget.hxx" diff --git a/src/debugger/gui/RomListSettings.cxx b/src/debugger/gui/RomListSettings.cxx index ef86e18f2..7a5805252 100644 --- a/src/debugger/gui/RomListSettings.cxx +++ b/src/debugger/gui/RomListSettings.cxx @@ -18,6 +18,8 @@ #include "OSystem.hxx" #include "Settings.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "Dialog.hxx" #include "DialogContainer.hxx" #include "RomListWidget.hxx" diff --git a/src/debugger/gui/RomListWidget.cxx b/src/debugger/gui/RomListWidget.cxx index 9dd525d19..5694eebca 100644 --- a/src/debugger/gui/RomListWidget.cxx +++ b/src/debugger/gui/RomListWidget.cxx @@ -20,6 +20,8 @@ #include "DiStella.hxx" #include "PackedBitArray.hxx" #include "Widget.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "ScrollBarWidget.hxx" #include "RomListSettings.hxx" #include "RomListWidget.hxx" diff --git a/src/debugger/gui/RomWidget.cxx b/src/debugger/gui/RomWidget.cxx index db8b7a3db..c9ca3f6f0 100644 --- a/src/debugger/gui/RomWidget.cxx +++ b/src/debugger/gui/RomWidget.cxx @@ -21,6 +21,7 @@ #include "DiStella.hxx" #include "CpuDebug.hxx" #include "GuiObject.hxx" +#include "Font.hxx" #include "DataGridWidget.hxx" #include "EditTextWidget.hxx" #include "PopUpWidget.hxx" diff --git a/src/debugger/gui/TiaInfoWidget.cxx b/src/debugger/gui/TiaInfoWidget.cxx index f42d5abd8..227dba58a 100644 --- a/src/debugger/gui/TiaInfoWidget.cxx +++ b/src/debugger/gui/TiaInfoWidget.cxx @@ -16,8 +16,8 @@ //============================================================================ #include "Base.hxx" +#include "Font.hxx" #include "OSystem.hxx" -#include "FrameBuffer.hxx" #include "Debugger.hxx" #include "TIADebug.hxx" #include "Widget.hxx" diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx index 5dd34cd21..5a216c827 100644 --- a/src/debugger/gui/TiaOutputWidget.cxx +++ b/src/debugger/gui/TiaOutputWidget.cxx @@ -19,6 +19,7 @@ #include "OSystem.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Widget.hxx" #include "GuiObject.hxx" #include "ContextMenu.hxx" diff --git a/src/debugger/gui/TiaWidget.cxx b/src/debugger/gui/TiaWidget.cxx index ef7749b50..6cb098f05 100644 --- a/src/debugger/gui/TiaWidget.cxx +++ b/src/debugger/gui/TiaWidget.cxx @@ -19,6 +19,7 @@ #include "DataGridWidget.hxx" #include "EditTextWidget.hxx" #include "FrameBuffer.hxx" +#include "Font.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" #include "Debugger.hxx" diff --git a/src/debugger/gui/TiaZoomWidget.cxx b/src/debugger/gui/TiaZoomWidget.cxx index f3a53344e..4c9b93534 100644 --- a/src/debugger/gui/TiaZoomWidget.cxx +++ b/src/debugger/gui/TiaZoomWidget.cxx @@ -19,6 +19,7 @@ #include "Console.hxx" #include "TIA.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Widget.hxx" #include "GuiObject.hxx" #include "ContextMenu.hxx" diff --git a/src/debugger/gui/ToggleBitWidget.cxx b/src/debugger/gui/ToggleBitWidget.cxx index 489fecd38..ef0c5c089 100644 --- a/src/debugger/gui/ToggleBitWidget.cxx +++ b/src/debugger/gui/ToggleBitWidget.cxx @@ -19,7 +19,8 @@ #include "Widget.hxx" #include "Dialog.hxx" #include "Debugger.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "ToggleBitWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/debugger/gui/TogglePixelWidget.cxx b/src/debugger/gui/TogglePixelWidget.cxx index a8baba42d..0beda25da 100644 --- a/src/debugger/gui/TogglePixelWidget.cxx +++ b/src/debugger/gui/TogglePixelWidget.cxx @@ -17,9 +17,9 @@ #include "OSystem.hxx" #include "Widget.hxx" -#include "Dialog.hxx" +#include "Font.hxx" #include "Debugger.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "TogglePixelWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/emucore/AtariVox.hxx b/src/emucore/AtariVox.hxx index ee93c2bee..16bf22cd7 100644 --- a/src/emucore/AtariVox.hxx +++ b/src/emucore/AtariVox.hxx @@ -22,7 +22,6 @@ class SerialPort; #include "Control.hxx" #include "SaveKey.hxx" -#include "MT24LC256.hxx" /** Richard Hutchinson's AtariVox "controller": A speech synthesizer and diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 75ff524f7..7bc504b24 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -47,6 +47,7 @@ #include "AtariMouse.hxx" #include "TrakBall.hxx" #include "FrameBuffer.hxx" +#include "TIASurface.hxx" #include "OSystem.hxx" #include "Menu.hxx" #include "CommandMenu.hxx" diff --git a/src/emucore/Driving.hxx b/src/emucore/Driving.hxx index cf763427b..b7ba37d4c 100644 --- a/src/emucore/Driving.hxx +++ b/src/emucore/Driving.hxx @@ -18,7 +18,6 @@ #ifndef DRIVING_HXX #define DRIVING_HXX -#include "bspf.hxx" #include "Control.hxx" #include "Event.hxx" diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index a3ffdfd5e..155b668fc 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -26,6 +26,7 @@ #include "DialogContainer.hxx" #include "Event.hxx" #include "FrameBuffer.hxx" +#include "TIASurface.hxx" #include "FSNode.hxx" #include "Launcher.hxx" #include "Menu.hxx" diff --git a/src/emucore/EventJoyHandler.cxx b/src/emucore/EventJoyHandler.cxx index 439cd1f58..61f3b6a25 100644 --- a/src/emucore/EventJoyHandler.cxx +++ b/src/emucore/EventJoyHandler.cxx @@ -15,7 +15,6 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include #include #include "OSystem.hxx" diff --git a/src/emucore/FBSurface.cxx b/src/emucore/FBSurface.cxx index 057c89663..e39e82ea7 100644 --- a/src/emucore/FBSurface.cxx +++ b/src/emucore/FBSurface.cxx @@ -15,6 +15,8 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "Font.hxx" +#include "Rect.hxx" #include "FrameBuffer.hxx" #include "FBSurface.hxx" diff --git a/src/emucore/FBSurface.hxx b/src/emucore/FBSurface.hxx index f67e00eea..c470d8487 100644 --- a/src/emucore/FBSurface.hxx +++ b/src/emucore/FBSurface.hxx @@ -21,9 +21,13 @@ class FrameBuffer; class TIASurface; +namespace GUI { + class Font; + struct Rect; +} + +#include "FrameBufferConstants.hxx" #include "bspf.hxx" -#include "Font.hxx" -#include "Rect.hxx" /** This class is basically a thin wrapper around the video toolkit 'surface' @@ -35,19 +39,6 @@ class TIASurface; @author Stephen Anthony */ - -// Text alignment modes for drawString() -enum TextAlignment { - kTextAlignLeft, - kTextAlignCenter, - kTextAlignRight -}; -// Line types for drawing rectangular frames -enum FrameStyle { - kSolidLine, - kDashLine -}; - class FBSurface { public: diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index fe5cebdeb..5f460b316 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -51,6 +51,11 @@ FrameBuffer::FrameBuffer(OSystem& osystem) myMsg.enabled = myStatsMsg.enabled = false; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +FrameBuffer::~FrameBuffer() +{ +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool FrameBuffer::initialize() { diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx index 74f490d06..20c129de7 100644 --- a/src/emucore/FrameBuffer.hxx +++ b/src/emucore/FrameBuffer.hxx @@ -23,6 +23,8 @@ class OSystem; class Console; class Settings; +class FBSurface; +class TIASurface; namespace GUI { class Font; @@ -31,8 +33,6 @@ namespace GUI { #include "EventHandler.hxx" #include "Rect.hxx" #include "Variant.hxx" -#include "FBSurface.hxx" -#include "TIASurface.hxx" #include "TIAConstants.hxx" #include "FrameBufferConstants.hxx" #include "bspf.hxx" @@ -92,7 +92,7 @@ class FrameBuffer Creates a new Frame Buffer */ FrameBuffer(OSystem& osystem); - virtual ~FrameBuffer() = default; + virtual ~FrameBuffer(); /** Initialize the framebuffer object (set up the underlying hardware) diff --git a/src/emucore/FrameBufferConstants.hxx b/src/emucore/FrameBufferConstants.hxx index b3ef735cc..0269c3e5e 100644 --- a/src/emucore/FrameBufferConstants.hxx +++ b/src/emucore/FrameBufferConstants.hxx @@ -69,4 +69,17 @@ enum { kNumColors }; +// Text alignment modes for drawString() +enum TextAlignment { + kTextAlignLeft, + kTextAlignCenter, + kTextAlignRight +}; + +// Line types for drawing rectangular frames +enum FrameStyle { + kSolidLine, + kDashLine +}; + #endif // FRAMEBUFFER_CONSTANTS_HXX diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 159663f7f..b1f7abe6e 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -40,6 +40,7 @@ #include "Cart.hxx" #include "CartDetector.hxx" #include "FrameBuffer.hxx" +#include "TIASurface.hxx" #include "Settings.hxx" #include "PropsSet.hxx" #include "EventHandler.hxx" diff --git a/src/emucore/TIASurface.cxx b/src/emucore/TIASurface.cxx index e3c14c9e5..4d5de4f24 100644 --- a/src/emucore/TIASurface.cxx +++ b/src/emucore/TIASurface.cxx @@ -16,15 +16,13 @@ //============================================================================ #include -#include -#include #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Settings.hxx" #include "OSystem.hxx" #include "Console.hxx" #include "TIA.hxx" - #include "TIASurface.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/AboutDialog.cxx b/src/gui/AboutDialog.cxx index e404c2c47..6d56f1652 100644 --- a/src/gui/AboutDialog.cxx +++ b/src/gui/AboutDialog.cxx @@ -19,7 +19,7 @@ #include "OSystem.hxx" #include "Version.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "AboutDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/AboutDialog.hxx b/src/gui/AboutDialog.hxx index b85be273b..6a464efcd 100644 --- a/src/gui/AboutDialog.hxx +++ b/src/gui/AboutDialog.hxx @@ -24,6 +24,7 @@ class CommandSender; class ButtonWidget; class StaticTextWidget; +#include "Dialog.hxx" class AboutDialog : public Dialog { diff --git a/src/gui/AudioDialog.cxx b/src/gui/AudioDialog.cxx index 7091fba10..5b10363eb 100644 --- a/src/gui/AudioDialog.cxx +++ b/src/gui/AudioDialog.cxx @@ -22,6 +22,7 @@ #include "Console.hxx" #include "Control.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "Menu.hxx" #include "OSystem.hxx" #include "PopUpWidget.hxx" diff --git a/src/gui/BrowserDialog.cxx b/src/gui/BrowserDialog.cxx index b43565285..011da2361 100644 --- a/src/gui/BrowserDialog.cxx +++ b/src/gui/BrowserDialog.cxx @@ -16,16 +16,14 @@ //============================================================================ #include "bspf.hxx" - #include "Dialog.hxx" -#include "DialogContainer.hxx" #include "FSNode.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" #include "EditTextWidget.hxx" #include "FileListWidget.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "BrowserDialog.hxx" /* We want to use this as a general directory selector at some point... possible uses @@ -33,7 +31,6 @@ * - to select the place where save games are stored * - others??? */ - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font, int max_w, int max_h) diff --git a/src/gui/CheckListWidget.cxx b/src/gui/CheckListWidget.cxx index 982f8a825..4ccc04b8a 100644 --- a/src/gui/CheckListWidget.cxx +++ b/src/gui/CheckListWidget.cxx @@ -15,8 +15,9 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "Dialog.hxx" +#include "FBSurface.hxx" #include "CheckListWidget.hxx" -#include "Widget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CheckListWidget::CheckListWidget(GuiObject* boss, const GUI::Font& font, diff --git a/src/gui/ColorWidget.cxx b/src/gui/ColorWidget.cxx index e5af16815..0c36b131f 100644 --- a/src/gui/ColorWidget.cxx +++ b/src/gui/ColorWidget.cxx @@ -16,12 +16,11 @@ //============================================================================ #include "bspf.hxx" - #include "Command.hxx" -#include "FrameBuffer.hxx" +#include "Dialog.hxx" +#include "FBSurface.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" - #include "ColorWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx index b706d3a8e..0e1b2cee5 100644 --- a/src/gui/ComboDialog.cxx +++ b/src/gui/ComboDialog.cxx @@ -15,19 +15,15 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" - #include "Control.hxx" #include "Dialog.hxx" -#include "DialogContainer.hxx" #include "EventHandler.hxx" #include "OSystem.hxx" #include "EditTextWidget.hxx" #include "PopUpWidget.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "ComboDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/CommandDialog.cxx b/src/gui/CommandDialog.cxx index 17e224d44..898a362bc 100644 --- a/src/gui/CommandDialog.cxx +++ b/src/gui/CommandDialog.cxx @@ -18,8 +18,8 @@ #include "Console.hxx" #include "TIA.hxx" #include "Switches.hxx" -#include "DialogContainer.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "EventHandler.hxx" #include "OSystem.hxx" #include "Widget.hxx" diff --git a/src/gui/ConfigPathDialog.cxx b/src/gui/ConfigPathDialog.cxx index fed8f177e..d282d38db 100644 --- a/src/gui/ConfigPathDialog.cxx +++ b/src/gui/ConfigPathDialog.cxx @@ -16,14 +16,13 @@ //============================================================================ #include "bspf.hxx" - #include "BrowserDialog.hxx" #include "EditTextWidget.hxx" #include "FSNode.hxx" +#include "Font.hxx" #include "LauncherDialog.hxx" #include "PopUpWidget.hxx" #include "Settings.hxx" - #include "ConfigPathDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/ContextMenu.cxx b/src/gui/ContextMenu.cxx index 97491891c..e71f60e4a 100644 --- a/src/gui/ContextMenu.cxx +++ b/src/gui/ContextMenu.cxx @@ -17,6 +17,8 @@ #include "OSystem.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "Dialog.hxx" #include "DialogContainer.hxx" #include "ScrollBarWidget.hxx" diff --git a/src/gui/Dialog.cxx b/src/gui/Dialog.cxx index 22447c37e..30f2241d9 100644 --- a/src/gui/Dialog.cxx +++ b/src/gui/Dialog.cxx @@ -20,6 +20,8 @@ #include "OSystem.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "Menu.hxx" #include "Dialog.hxx" #include "Widget.hxx" diff --git a/src/gui/DialogContainer.cxx b/src/gui/DialogContainer.cxx index 7e7fc93a3..8c5415cc2 100644 --- a/src/gui/DialogContainer.cxx +++ b/src/gui/DialogContainer.cxx @@ -20,6 +20,7 @@ #include "Stack.hxx" #include "EventHandler.hxx" #include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Joystick.hxx" #include "bspf.hxx" #include "DialogContainer.hxx" diff --git a/src/gui/EditTextWidget.cxx b/src/gui/EditTextWidget.cxx index 4fac16ba0..625df0c2d 100644 --- a/src/gui/EditTextWidget.cxx +++ b/src/gui/EditTextWidget.cxx @@ -15,14 +15,12 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "OSystem.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "EditTextWidget.hxx" - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EditTextWidget::EditTextWidget(GuiObject* boss, const GUI::Font& font, int x, int y, int w, int h, const string& text) diff --git a/src/gui/EditableWidget.cxx b/src/gui/EditableWidget.cxx index de2550655..e6d192f04 100644 --- a/src/gui/EditableWidget.cxx +++ b/src/gui/EditableWidget.cxx @@ -16,6 +16,8 @@ //============================================================================ #include "Dialog.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "EditableWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/EventMappingWidget.cxx b/src/gui/EventMappingWidget.cxx index 1010150d6..a16ab557c 100644 --- a/src/gui/EventMappingWidget.cxx +++ b/src/gui/EventMappingWidget.cxx @@ -25,6 +25,7 @@ #include "EditTextWidget.hxx" #include "StringListWidget.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "ComboDialog.hxx" #include "Variant.hxx" #include "EventMappingWidget.hxx" diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx index f102aa10a..d29e7ccdd 100644 --- a/src/gui/GameInfoDialog.cxx +++ b/src/gui/GameInfoDialog.cxx @@ -29,6 +29,7 @@ #include "TabWidget.hxx" #include "TIAConstants.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "GameInfoDialog.hxx" diff --git a/src/gui/GlobalPropsDialog.cxx b/src/gui/GlobalPropsDialog.cxx index 9b8ceb91f..697cc3aa1 100644 --- a/src/gui/GlobalPropsDialog.cxx +++ b/src/gui/GlobalPropsDialog.cxx @@ -16,16 +16,16 @@ //============================================================================ #include "bspf.hxx" - #include "BSType.hxx" #include "Control.hxx" #include "Dialog.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" #include "PopUpWidget.hxx" #include "Settings.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "LauncherDialog.hxx" - #include "GlobalPropsDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/HelpDialog.cxx b/src/gui/HelpDialog.cxx index a5fa8affa..f5ae859f2 100644 --- a/src/gui/HelpDialog.cxx +++ b/src/gui/HelpDialog.cxx @@ -16,11 +16,9 @@ //============================================================================ #include "bspf.hxx" - #include "Dialog.hxx" -#include "OSystem.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "HelpDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/InputDialog.cxx b/src/gui/InputDialog.cxx index b78e9ba61..c87a4d012 100644 --- a/src/gui/InputDialog.cxx +++ b/src/gui/InputDialog.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "bspf.hxx" - #include "OSystem.hxx" #include "Console.hxx" #include "Joystick.hxx" @@ -30,10 +29,9 @@ #include "PopUpWidget.hxx" #include "TabWidget.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "InputDialog.hxx" - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font, int max_w, int max_h) diff --git a/src/gui/InputTextDialog.cxx b/src/gui/InputTextDialog.cxx index ab4f801cc..93fec098a 100644 --- a/src/gui/InputTextDialog.cxx +++ b/src/gui/InputTextDialog.cxx @@ -16,14 +16,15 @@ //============================================================================ #include "bspf.hxx" - #include "Dialog.hxx" #include "DialogContainer.hxx" #include "EditTextWidget.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "Widget.hxx" - #include "InputTextDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/JoystickDialog.cxx b/src/gui/JoystickDialog.cxx index 0094bbcea..c5fc387b1 100644 --- a/src/gui/JoystickDialog.cxx +++ b/src/gui/JoystickDialog.cxx @@ -17,10 +17,10 @@ #include "OSystem.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "EditTextWidget.hxx" #include "StringListWidget.hxx" #include "Variant.hxx" - #include "JoystickDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index 078a9af78..b5bd8776f 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -15,10 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" - #include "BrowserDialog.hxx" #include "ContextMenu.hxx" #include "DialogContainer.hxx" @@ -32,16 +29,16 @@ #include "LauncherFilterDialog.hxx" #include "MessageBox.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" #include "Props.hxx" #include "PropsSet.hxx" #include "RomInfoWidget.hxx" #include "Settings.hxx" #include "StringListWidget.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "LauncherDialog.hxx" - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent, int x, int y, int w, int h) diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx index 379bee155..a12cd819e 100644 --- a/src/gui/LauncherDialog.hxx +++ b/src/gui/LauncherDialog.hxx @@ -18,8 +18,6 @@ #ifndef LAUNCHER_DIALOG_HXX #define LAUNCHER_DIALOG_HXX -#include "bspf.hxx" - class ButtonWidget; class CommandSender; class ContextMenu; @@ -36,6 +34,7 @@ class RomInfoWidget; class StaticTextWidget; class StringListWidget; +#include "bspf.hxx" #include "Dialog.hxx" #include "FSNode.hxx" #include "Stack.hxx" diff --git a/src/gui/LauncherFilterDialog.cxx b/src/gui/LauncherFilterDialog.cxx index 4cc4ed209..0c801eb25 100644 --- a/src/gui/LauncherFilterDialog.cxx +++ b/src/gui/LauncherFilterDialog.cxx @@ -15,19 +15,14 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include -#include - #include "bspf.hxx" - -#include "Control.hxx" #include "Dialog.hxx" #include "OSystem.hxx" #include "PopUpWidget.hxx" #include "Settings.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "LauncherDialog.hxx" - #include "LauncherFilterDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/LoggerDialog.cxx b/src/gui/LoggerDialog.cxx index 1e35db96a..cc61f053f 100644 --- a/src/gui/LoggerDialog.cxx +++ b/src/gui/LoggerDialog.cxx @@ -16,18 +16,17 @@ //============================================================================ #include "bspf.hxx" - #include "Dialog.hxx" -#include "DialogContainer.hxx" #include "FSNode.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" #include "Settings.hxx" #include "PopUpWidget.hxx" #include "StringListWidget.hxx" #include "StringParser.hxx" #include "Widget.hxx" - +#include "Font.hxx" #include "LoggerDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/MessageBox.cxx b/src/gui/MessageBox.cxx index 7a820e5ac..eddb23eba 100644 --- a/src/gui/MessageBox.cxx +++ b/src/gui/MessageBox.cxx @@ -19,8 +19,8 @@ #include "OSystem.hxx" #include "Version.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "StringParser.hxx" - #include "MessageBox.hxx" namespace GUI { diff --git a/src/gui/OptionsDialog.cxx b/src/gui/OptionsDialog.cxx index 804dec121..833b990bd 100644 --- a/src/gui/OptionsDialog.cxx +++ b/src/gui/OptionsDialog.cxx @@ -19,6 +19,7 @@ #include "Dialog.hxx" #include "DialogContainer.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "Control.hxx" #include "VideoDialog.hxx" #include "AudioDialog.hxx" @@ -149,6 +150,11 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent, } } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +OptionsDialog::~OptionsDialog() +{ +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void OptionsDialog::loadConfig() { diff --git a/src/gui/OptionsDialog.hxx b/src/gui/OptionsDialog.hxx index f732bfce0..217ed1a69 100644 --- a/src/gui/OptionsDialog.hxx +++ b/src/gui/OptionsDialog.hxx @@ -47,7 +47,7 @@ class OptionsDialog : public Dialog public: OptionsDialog(OSystem& osystem, DialogContainer& parent, GuiObject* boss, int max_w, int max_h, bool global); - virtual ~OptionsDialog() = default; + virtual ~OptionsDialog(); private: void loadConfig() override; diff --git a/src/gui/PopUpWidget.cxx b/src/gui/PopUpWidget.cxx index 8e5e22362..ecb7328c7 100644 --- a/src/gui/PopUpWidget.cxx +++ b/src/gui/PopUpWidget.cxx @@ -16,11 +16,11 @@ //============================================================================ #include "bspf.hxx" - #include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "ContextMenu.hxx" #include "DialogContainer.hxx" - #include "PopUpWidget.hxx" // Little up/down arrow diff --git a/src/gui/ProgressDialog.cxx b/src/gui/ProgressDialog.cxx index bf5195cb7..2decae8d0 100644 --- a/src/gui/ProgressDialog.cxx +++ b/src/gui/ProgressDialog.cxx @@ -15,14 +15,15 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ +#include "bspf.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" #include "Widget.hxx" #include "Dialog.hxx" +#include "Font.hxx" #include "DialogContainer.hxx" #include "ProgressDialog.hxx" -#include "bspf.hxx" - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ProgressDialog::ProgressDialog(GuiObject* boss, const GUI::Font& font, const string& message) diff --git a/src/gui/RomAuditDialog.cxx b/src/gui/RomAuditDialog.cxx index bbf834c3e..1cb84ea87 100644 --- a/src/gui/RomAuditDialog.cxx +++ b/src/gui/RomAuditDialog.cxx @@ -16,7 +16,6 @@ //============================================================================ #include "bspf.hxx" - #include "Launcher.hxx" #include "LauncherFilterDialog.hxx" #include "BrowserDialog.hxx" @@ -24,6 +23,7 @@ #include "EditTextWidget.hxx" #include "ProgressDialog.hxx" #include "FSNode.hxx" +#include "Font.hxx" #include "MessageBox.hxx" #include "MD5.hxx" #include "Props.hxx" diff --git a/src/gui/RomInfoWidget.cxx b/src/gui/RomInfoWidget.cxx index ed43a753c..a49adb043 100644 --- a/src/gui/RomInfoWidget.cxx +++ b/src/gui/RomInfoWidget.cxx @@ -16,6 +16,9 @@ //============================================================================ #include "FrameBuffer.hxx" +#include "Dialog.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "OSystem.hxx" #include "Settings.hxx" #include "Props.hxx" diff --git a/src/gui/ScrollBarWidget.cxx b/src/gui/ScrollBarWidget.cxx index 8911a8dca..b00a47124 100644 --- a/src/gui/ScrollBarWidget.cxx +++ b/src/gui/ScrollBarWidget.cxx @@ -17,7 +17,7 @@ #include "OSystem.hxx" #include "Dialog.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "ScrollBarWidget.hxx" #include "bspf.hxx" diff --git a/src/gui/SnapshotDialog.cxx b/src/gui/SnapshotDialog.cxx index ba65f1369..509fade72 100644 --- a/src/gui/SnapshotDialog.cxx +++ b/src/gui/SnapshotDialog.cxx @@ -16,14 +16,13 @@ //============================================================================ #include "bspf.hxx" - #include "BrowserDialog.hxx" #include "EditTextWidget.hxx" #include "FSNode.hxx" +#include "Font.hxx" #include "LauncherDialog.hxx" #include "PopUpWidget.hxx" #include "Settings.hxx" - #include "SnapshotDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/StringListWidget.cxx b/src/gui/StringListWidget.cxx index a01c18551..ef3b3d4f9 100644 --- a/src/gui/StringListWidget.cxx +++ b/src/gui/StringListWidget.cxx @@ -16,6 +16,8 @@ //============================================================================ #include "bspf.hxx" +#include "Dialog.hxx" +#include "FBSurface.hxx" #include "Settings.hxx" #include "ScrollBarWidget.hxx" #include "StringListWidget.hxx" diff --git a/src/gui/TabWidget.cxx b/src/gui/TabWidget.cxx index b4c19a045..bba18c49c 100644 --- a/src/gui/TabWidget.cxx +++ b/src/gui/TabWidget.cxx @@ -16,13 +16,12 @@ //============================================================================ #include "bspf.hxx" - #include "Dialog.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" +#include "Font.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" #include "Widget.hxx" - #include "TabWidget.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx index 66395223b..9776f8d6e 100644 --- a/src/gui/UIDialog.cxx +++ b/src/gui/UIDialog.cxx @@ -15,19 +15,21 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" - #include "Dialog.hxx" #include "OSystem.hxx" +#include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "ListWidget.hxx" #include "PopUpWidget.hxx" #include "ScrollBarWidget.hxx" #include "Settings.hxx" #include "TabWidget.hxx" #include "Widget.hxx" - +#include "Font.hxx" +#ifdef DEBUGGER_SUPPORT + #include "DebuggerDialog.hxx" +#endif #include "UIDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index fbd6521ae..17b9147dc 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -15,10 +15,7 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include - #include "bspf.hxx" - #include "Control.hxx" #include "Dialog.hxx" #include "Menu.hxx" @@ -30,9 +27,10 @@ #include "TIA.hxx" #include "Settings.hxx" #include "Widget.hxx" +#include "Font.hxx" #include "TabWidget.hxx" #include "NTSCFilter.hxx" - +#include "TIASurface.hxx" #include "VideoDialog.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/VideoDialog.hxx b/src/gui/VideoDialog.hxx index 71222d82b..b6cd4fa24 100644 --- a/src/gui/VideoDialog.hxx +++ b/src/gui/VideoDialog.hxx @@ -29,6 +29,7 @@ class TabWidget; class OSystem; #include "Dialog.hxx" +#include "NTSCFilter.hxx" #include "bspf.hxx" class VideoDialog : public Dialog diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index b6ee78ae5..82ff2fe8f 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -19,13 +19,10 @@ //============================================================================ #include "bspf.hxx" - #include "Command.hxx" -#include "DialogContainer.hxx" #include "Dialog.hxx" -#include "EditableWidget.hxx" #include "Font.hxx" -#include "FrameBuffer.hxx" +#include "FBSurface.hxx" #include "GuiObject.hxx" #include "OSystem.hxx" diff --git a/src/gui/Widget.hxx b/src/gui/Widget.hxx index a657f2a81..18bcb2a7e 100644 --- a/src/gui/Widget.hxx +++ b/src/gui/Widget.hxx @@ -18,22 +18,20 @@ // Copyright (C) 2002-2004 The ScummVM project //============================================================================ -#include "Dialog.hxx" - #ifndef WIDGET_HXX #define WIDGET_HXX +class Dialog; + +namespace GUI { + class Font; +} + #include #include "bspf.hxx" - #include "Event.hxx" -#include "Font.hxx" -#include "FrameBuffer.hxx" #include "GuiObject.hxx" -#include "OSystem.hxx" -#include "Rect.hxx" -#include "StellaKeys.hxx" enum { WIDGET_ENABLED = 1 << 0,