More header fixes (this time in 'src/gui').

src/debugger/gui/CartDebugWidget.cxx

@@ -19,6 +19,7 @@
 #include "RomWidget.hxx"
 #include "EditTextWidget.hxx"
 #include "StringListWidget.hxx"
+#include "ScrollBarWidget.hxx"
 #include "StringParser.hxx"
 #include "CartDebugWidget.hxx"
 

src/debugger/gui/CartRamWidget.cxx

@@ -23,6 +23,7 @@
 #include "Widget.hxx"
 #include "Font.hxx"
 #include "StringListWidget.hxx"
+#include "ScrollBarWidget.hxx"
 #include "CartDebugWidget.hxx"
 #include "CartRamWidget.hxx"
 

src/emucore/EventHandler.hxx

@@ -27,41 +27,12 @@ class DialogContainer;
 class EventMappingWidget;
 
 #include "Event.hxx"
+#include "EventHandlerConstants.hxx"
 #include "Control.hxx"
 #include "StellaKeys.hxx"
 #include "Variant.hxx"
 #include "bspf.hxx"
 
-enum MouseButton {
-  EVENT_LBUTTONDOWN,
-  EVENT_LBUTTONUP,
-  EVENT_RBUTTONDOWN,
-  EVENT_RBUTTONUP,
-  EVENT_WHEELDOWN,
-  EVENT_WHEELUP
-};
-
-enum JoyHat {
-  EVENT_HATUP     = 0,  // make sure these are set correctly,
-  EVENT_HATDOWN   = 1,  // since they'll be used as array indices
-  EVENT_HATLEFT   = 2,
-  EVENT_HATRIGHT  = 3,
-  EVENT_HATCENTER = 4
-};
-enum JoyHatMask {
-  EVENT_HATUP_M     = 1<<0,
-  EVENT_HATDOWN_M   = 1<<1,
-  EVENT_HATLEFT_M   = 1<<2,
-  EVENT_HATRIGHT_M  = 1<<3,
-  EVENT_HATCENTER_M = 1<<4
-};
-
-enum EventMode {
-  kEmulationMode = 0,  // make sure these are set correctly,
-  kMenuMode      = 1,  // since they'll be used as array indices
-  kNumModes      = 2
-};
-
 /**
   This class takes care of event remapping and dispatching for the
   Stella core, as well as keeping track of the current 'mode'.

src/emucore/EventHandlerConstants.hxx

@@ -0,0 +1,54 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll
+//  SS  SS   tt           ll   ll
+//  SS     tttttt  eeee   ll   ll   aaaa
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
+// and the Stella Team
+//
+// See the file "License.txt" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//============================================================================
+
+// FIXME - perhaps add to namespace or something
+
+#ifndef EVENTHANDLER_CONSTANTS_HXX
+#define EVENTHANDLER_CONSTANTS_HXX
+
+enum MouseButton {
+  EVENT_LBUTTONDOWN,
+  EVENT_LBUTTONUP,
+  EVENT_RBUTTONDOWN,
+  EVENT_RBUTTONUP,
+  EVENT_WHEELDOWN,
+  EVENT_WHEELUP
+};
+
+enum JoyHat {
+  EVENT_HATUP     = 0,  // make sure these are set correctly,
+  EVENT_HATDOWN   = 1,  // since they'll be used as array indices
+  EVENT_HATLEFT   = 2,
+  EVENT_HATRIGHT  = 3,
+  EVENT_HATCENTER = 4
+};
+
+enum JoyHatMask {
+  EVENT_HATUP_M     = 1<<0,
+  EVENT_HATDOWN_M   = 1<<1,
+  EVENT_HATLEFT_M   = 1<<2,
+  EVENT_HATRIGHT_M  = 1<<3,
+  EVENT_HATCENTER_M = 1<<4
+};
+
+enum EventMode {
+  kEmulationMode = 0,  // make sure these are set correctly,
+  kMenuMode      = 1,  // since they'll be used as array indices
+  kNumModes      = 2
+};
+
+#endif // EVENTHANDLER_CONSTANTS_HXX

src/gui/BrowserDialog.hxx

@@ -23,10 +23,10 @@ class ButtonWidget;
 class EditTextWidget;
 class FileListWidget;
 class StaticTextWidget;
+class FilesystemNode;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
-#include "FSNode.hxx"
 #include "bspf.hxx"
 
 class BrowserDialog : public Dialog, public CommandSender

src/gui/CheckListWidget.cxx

@@ -17,6 +17,7 @@
 
 #include "Dialog.hxx"
 #include "FBSurface.hxx"
+#include "ScrollBarWidget.hxx"
 #include "CheckListWidget.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

src/gui/ConfigPathDialog.hxx

@@ -21,6 +21,7 @@
 class OSystem;
 class GuiObject;
 class DialogContainer;
+class BrowserDialog;
 class CheckboxWidget;
 class PopUpWidget;
 class EditTextWidget;
@@ -29,7 +30,6 @@ class StaticTextWidget;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
-#include "BrowserDialog.hxx"
 
 class ConfigPathDialog : public Dialog, public CommandSender
 {

src/gui/Dialog.hxx

@@ -25,13 +25,12 @@ class FBSurface;
 class OSystem;
 class DialogContainer;
 class TabWidget;
+class CommandSender;
 
-#include "Command.hxx"
 #include "Stack.hxx"
 #include "Widget.hxx"
 #include "GuiObject.hxx"
 #include "StellaKeys.hxx"
-
 #include "bspf.hxx"
 
 /**

src/gui/DialogContainer.hxx

@@ -20,12 +20,13 @@
 
 class Dialog;
 class OSystem;
+class EventHandler;
 
-#include "EventHandler.hxx"
+#include "EventHandlerConstants.hxx"
+#include "StellaKeys.hxx"
 #include "Stack.hxx"
 #include "bspf.hxx"
 
-
 /**
   The base class for groups of dialog boxes.  Each dialog box has a
   parent.  In most cases, the parent is itself a dialog box, but in the

src/gui/FileListWidget.hxx

@@ -18,7 +18,8 @@
 #ifndef FILE_LIST_WIDGET_HXX
 #define FILE_LIST_WIDGET_HXX
 
-#include "Command.hxx"
+class CommandSender;
+
 #include "FSNode.hxx"
 #include "GameList.hxx"
 #include "StringListWidget.hxx"

src/gui/GuiObject.hxx

@@ -24,6 +24,7 @@
 class Dialog;
 class DialogContainer;
 class Widget;
+class OSystem;
 
 #include "Command.hxx"
 #include "OSystem.hxx"

src/gui/InputDialog.cxx

@@ -26,10 +26,12 @@
 #include "Settings.hxx"
 #include "EventMappingWidget.hxx"
 #include "EditTextWidget.hxx"
+#include "JoystickDialog.hxx"
 #include "PopUpWidget.hxx"
 #include "TabWidget.hxx"
 #include "Widget.hxx"
 #include "Font.hxx"
+#include "MessageBox.hxx"
 #include "InputDialog.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -95,6 +97,11 @@ InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
   addBGroupToFocusList(wid);
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+InputDialog::~InputDialog()
+{
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void InputDialog::addDevicePortTab(const GUI::Font& font)
 {

src/gui/InputDialog.hxx

@@ -24,13 +24,15 @@ class TabWidget;
 class EventMappingWidget;
 class CheckboxWidget;
 class EditTextWidget;
+class JoystickDialog;
 class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
+namespace GUI {
+  class MessageBox;
+}
 
 #include "Dialog.hxx"
-#include "JoystickDialog.hxx"
-#include "MessageBox.hxx"
 #include "bspf.hxx"
 
 class InputDialog : public Dialog
@@ -38,7 +40,7 @@ class InputDialog : public Dialog
   public:
     InputDialog(OSystem& osystem, DialogContainer& parent,
                 const GUI::Font& font, int max_w, int max_h);
-    virtual ~InputDialog() = default;
+    virtual ~InputDialog();
 
   private:
     void handleKeyDown(StellaKey key, StellaMod mod) override;

src/gui/JoystickDialog.hxx

@@ -18,14 +18,13 @@
 #ifndef JOYSTICK_DIALOG_HXX
 #define JOYSTICK_DIALOG_HXX
 
+class CommandSender;
 class GuiObject;
 class ButtonWidget;
 class EditTextWidgetWidget;
 class StringListWidget;
 
 #include "Dialog.hxx"
-#include "Command.hxx"
-#include "DialogContainer.hxx"
 
 /**
  * Show a listing of joysticks currently stored in the eventhandler database,

src/gui/Launcher.hxx

@@ -22,8 +22,8 @@ class Properties;
 class OSystem;
 class FilesystemNode;
 
+#include "FrameBufferConstants.hxx"
 #include "DialogContainer.hxx"
-#include "FrameBuffer.hxx"
 
 /**
   The base dialog for the ROM launcher in Stella.

src/gui/LauncherDialog.hxx

@@ -33,12 +33,14 @@ class EditTextWidget;
 class RomInfoWidget;
 class StaticTextWidget;
 class StringListWidget;
+namespace GUI {
+  class MessageBox;
+}
 
 #include "bspf.hxx"
 #include "Dialog.hxx"
 #include "FSNode.hxx"
 #include "Stack.hxx"
-#include "MessageBox.hxx"
 
 class LauncherDialog : public Dialog
 {

src/gui/LauncherFilterDialog.cxx

@@ -18,6 +18,7 @@
 #include "bspf.hxx"
 #include "Dialog.hxx"
 #include "OSystem.hxx"
+#include "FSNode.hxx"
 #include "PopUpWidget.hxx"
 #include "Settings.hxx"
 #include "Widget.hxx"

src/gui/LauncherFilterDialog.hxx

@@ -20,14 +20,14 @@
 
 class CommandSender;
 class DialogContainer;
+class FilesystemNode;
 class CheckboxWidget;
 class PopUpWidget;
 class OSystem;
 
-#include "Dialog.hxx"
-#include "FSNode.hxx"
-#include "Settings.hxx"
 #include "bspf.hxx"
+#include "Dialog.hxx"
+#include "Settings.hxx"
 
 class LauncherFilterDialog : public Dialog, public CommandSender
 {

src/gui/ListWidget.cxx

@@ -153,6 +153,12 @@ void ListWidget::scrollTo(int item)
   }
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+int ListWidget::getWidth() const
+{
+  return _w + kScrollBarWidth;
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void ListWidget::recalc()
 {

src/gui/ListWidget.hxx

@@ -19,12 +19,11 @@
 #define LIST_WIDGET_HXX
 
 class GuiObject;
+class ScrollBarWidget;
 
-#include "Widget.hxx"
+#include "Rect.hxx"
 #include "Command.hxx"
 #include "EditableWidget.hxx"
-#include "ScrollBarWidget.hxx"
-#include "Rect.hxx"
 
 /** ListWidget */
 class ListWidget : public EditableWidget
@@ -61,7 +60,7 @@ class ListWidget : public EditableWidget
     void scrollTo(int item);
 
     // Account for the extra width of embedded scrollbar
-    int getWidth() const override { return _w + kScrollBarWidth; }
+    int getWidth() const override;
 
     static void setQuickSelectDelay(uInt64 time) { _QUICK_SELECT_DELAY = time; }
 

src/gui/LoggerDialog.hxx

@@ -26,7 +26,6 @@ class StringListWidget;
 #include "Dialog.hxx"
 #include "bspf.hxx"
 
-
 class LoggerDialog : public Dialog
 {
   public:

src/gui/MessageBox.hxx

@@ -23,7 +23,6 @@ class StaticTextWidget;
 
 #include "Dialog.hxx"
 #include "Command.hxx"
-#include "DialogContainer.hxx"
 
 namespace GUI {
 

src/gui/OptionsDialog.cxx

@@ -16,6 +16,7 @@
 //============================================================================
 
 #include "OSystem.hxx"
+#include "FrameBuffer.hxx"
 #include "Dialog.hxx"
 #include "DialogContainer.hxx"
 #include "Widget.hxx"

src/gui/RomAuditDialog.cxx

@@ -25,6 +25,7 @@
 #include "FSNode.hxx"
 #include "Font.hxx"
 #include "MessageBox.hxx"
+#include "FrameBuffer.hxx"
 #include "MD5.hxx"
 #include "Props.hxx"
 #include "PropsSet.hxx"