mirror of https://github.com/stella-emu/stella.git
Header fixes take 4; 'debugger/gui' classes.
Note that this one adds a new file, and I haven't yet updated the Windows and OSX builds (so they won't compile for now).
This commit is contained in:
parent
39f839021e
commit
c2946e58d6
|
@ -32,6 +32,7 @@
|
|||
#include "CartDebug.hxx"
|
||||
#include "CartDebugWidget.hxx"
|
||||
#include "CartRamWidget.hxx"
|
||||
#include "RomWidget.hxx"
|
||||
#include "System.hxx"
|
||||
#include "Base.hxx"
|
||||
using Common::Base;
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
#ifndef AMIGAMOUSE_WIDGET_HXX
|
||||
#define AMIGAMOUSE_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "PointingDeviceWidget.hxx"
|
||||
|
||||
class AmigaMouseWidget : public PointingDeviceWidget
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
#ifndef ATARIMOUSE_WIDGET_HXX
|
||||
#define ATARIMOUSE_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "PointingDeviceWidget.hxx"
|
||||
|
||||
class AtariMouseWidget : public PointingDeviceWidget
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
#ifndef ATARIVOX_WIDGET_HXX
|
||||
#define ATARIVOX_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "FlashWidget.hxx"
|
||||
|
||||
class AtariVoxWidget : public FlashWidget
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "FrameBuffer.hxx"
|
||||
#include "GuiObject.hxx"
|
||||
#include "OSystem.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "TIADebug.hxx"
|
||||
#include "Widget.hxx"
|
||||
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
#include "EventHandler.hxx"
|
||||
#include "BoosterWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#define BOOSTER_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class BoosterWidget : public ControllerWidget
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#define CARTRIDGE2K_WIDGET_HXX
|
||||
|
||||
class Cartridge2K;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
||||
class Cartridge2KWidget : public CartDebugWidget
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
//============================================================================
|
||||
|
||||
#include "Cart3EPlus.hxx"
|
||||
#include "EditTextWidget.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "Cart3EPlusWidget.hxx"
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
class Cartridge3EPlus;
|
||||
class ButtonWidget;
|
||||
class EditTextWidget;
|
||||
class PopUpWidget;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "Cart4KSC.hxx"
|
||||
#include "Cart4KSCWidget.hxx"
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#define CARTRIDGE4KSC_WIDGET_HXX
|
||||
|
||||
class Cartridge4KSC;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
||||
class Cartridge4KSCWidget : public CartDebugWidget
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#define CARTRIDGE4K_WIDGET_HXX
|
||||
|
||||
class Cartridge4K;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
||||
class Cartridge4KWidget : public CartDebugWidget
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartBFSC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartBFSCWidget.hxx"
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
//============================================================================
|
||||
|
||||
#include "CartCM.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "RiotDebug.hxx"
|
||||
#include "DataGridWidget.hxx"
|
||||
#include "EditTextWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartCTY.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartCTYWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartCVPlus.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartCVPlusWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartCV.hxx"
|
||||
#include "CartCVWidget.hxx"
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#define CARTRIDGECV_WIDGET_HXX
|
||||
|
||||
class CartridgeCV;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
||||
class CartridgeCVWidget : public CartDebugWidget
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
//============================================================================
|
||||
|
||||
#include "CartDASH.hxx"
|
||||
#include "EditTextWidget.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartDASHWidget.hxx"
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
class CartridgeDASH;
|
||||
class ButtonWidget;
|
||||
class EditTextWidget;
|
||||
class PopUpWidget;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartDFSC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartDFSCWidget.hxx"
|
||||
|
|
|
@ -0,0 +1,96 @@
|
|||
//============================================================================
|
||||
//
|
||||
// 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.
|
||||
//============================================================================
|
||||
|
||||
#include "Font.hxx"
|
||||
#include "RomWidget.hxx"
|
||||
#include "EditTextWidget.hxx"
|
||||
#include "StringListWidget.hxx"
|
||||
#include "StringParser.hxx"
|
||||
#include "CartDebugWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
CartDebugWidget::CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
|
||||
const GUI::Font& nfont,
|
||||
int x, int y, int w, int h)
|
||||
: Widget(boss, lfont, x, y, w, h),
|
||||
CommandSender(boss),
|
||||
_nfont(nfont),
|
||||
myFontWidth(lfont.getMaxCharWidth()),
|
||||
myFontHeight(lfont.getFontHeight()),
|
||||
myLineHeight(lfont.getLineHeight()),
|
||||
myButtonHeight(myLineHeight + 4),
|
||||
myDesc(nullptr) { }
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
int CartDebugWidget::addBaseInformation(int bytes, const string& manufacturer,
|
||||
const string& desc, const uInt16 maxlines)
|
||||
{
|
||||
const int lwidth = _font.getStringWidth("Manufacturer "),
|
||||
fwidth = _w - lwidth - 20;
|
||||
EditTextWidget* w = nullptr;
|
||||
ostringstream buf;
|
||||
|
||||
int x = 10, y = 10;
|
||||
|
||||
// Add ROM size, manufacturer and bankswitch info
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "ROM Size ", kTextAlignLeft);
|
||||
buf << bytes << " bytes";
|
||||
if(bytes >= 1024)
|
||||
buf << " / " << (bytes/1024) << "KB";
|
||||
|
||||
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, myLineHeight, buf.str());
|
||||
w->setEditable(false);
|
||||
y += myLineHeight + 4;
|
||||
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "Manufacturer ", kTextAlignLeft);
|
||||
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, myLineHeight, manufacturer);
|
||||
w->setEditable(false);
|
||||
y += myLineHeight + 4;
|
||||
|
||||
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth - 4);
|
||||
const StringList& sl = bs.stringList();
|
||||
uInt32 lines = uInt32(sl.size());
|
||||
if(lines < 3) lines = 3;
|
||||
if(lines > maxlines) lines = maxlines;
|
||||
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "Description ", kTextAlignLeft);
|
||||
myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, lines * myLineHeight, false);
|
||||
myDesc->setEditable(false);
|
||||
myDesc->setList(sl);
|
||||
addFocusWidget(myDesc);
|
||||
y += myDesc->getHeight() + 4;
|
||||
|
||||
return y;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void CartDebugWidget::invalidate()
|
||||
{
|
||||
sendCommand(RomWidget::kInvalidateListing, -1, -1);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void CartDebugWidget::loadConfig()
|
||||
{
|
||||
myDesc->setSelected(0);
|
||||
}
|
|
@ -20,93 +20,36 @@
|
|||
|
||||
class GuiObject;
|
||||
class ButtonWidget;
|
||||
class StringListWidget;
|
||||
|
||||
#include "Base.hxx"
|
||||
#include "Font.hxx"
|
||||
namespace GUI {
|
||||
class Font;
|
||||
}
|
||||
|
||||
#include "Base.hxx" // not needed here, but all child classes need it
|
||||
#include "Command.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "RomWidget.hxx"
|
||||
#include "Widget.hxx"
|
||||
#include "EditTextWidget.hxx"
|
||||
#include "StringListWidget.hxx"
|
||||
#include "StringParser.hxx"
|
||||
|
||||
class CartDebugWidget : public Widget, public CommandSender
|
||||
{
|
||||
public:
|
||||
CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
|
||||
const GUI::Font& nfont,
|
||||
int x, int y, int w, int h)
|
||||
: Widget(boss, lfont, x, y, w, h),
|
||||
CommandSender(boss),
|
||||
_nfont(nfont),
|
||||
myFontWidth(lfont.getMaxCharWidth()),
|
||||
myFontHeight(lfont.getFontHeight()),
|
||||
myLineHeight(lfont.getLineHeight()),
|
||||
myButtonHeight(myLineHeight + 4),
|
||||
myDesc(nullptr) { }
|
||||
|
||||
int x, int y, int w, int h);
|
||||
virtual ~CartDebugWidget() = default;
|
||||
|
||||
public:
|
||||
int addBaseInformation(int bytes, const string& manufacturer,
|
||||
const string& desc, const uInt16 maxlines = 10)
|
||||
{
|
||||
const int lwidth = _font.getStringWidth("Manufacturer "),
|
||||
fwidth = _w - lwidth - 20;
|
||||
EditTextWidget* w = nullptr;
|
||||
ostringstream buf;
|
||||
|
||||
int x = 10, y = 10;
|
||||
|
||||
// Add ROM size, manufacturer and bankswitch info
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "ROM Size ", kTextAlignLeft);
|
||||
buf << bytes << " bytes";
|
||||
if(bytes >= 1024)
|
||||
buf << " / " << (bytes/1024) << "KB";
|
||||
|
||||
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, myLineHeight, buf.str());
|
||||
w->setEditable(false);
|
||||
y += myLineHeight + 4;
|
||||
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "Manufacturer ", kTextAlignLeft);
|
||||
w = new EditTextWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, myLineHeight, manufacturer);
|
||||
w->setEditable(false);
|
||||
y += myLineHeight + 4;
|
||||
|
||||
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth - 4);
|
||||
const StringList& sl = bs.stringList();
|
||||
uInt32 lines = uInt32(sl.size());
|
||||
if(lines < 3) lines = 3;
|
||||
if(lines > maxlines) lines = maxlines;
|
||||
|
||||
new StaticTextWidget(_boss, _font, x, y, lwidth,
|
||||
myFontHeight, "Description ", kTextAlignLeft);
|
||||
myDesc = new StringListWidget(_boss, _nfont, x+lwidth, y,
|
||||
fwidth, lines * myLineHeight, false);
|
||||
myDesc->setEditable(false);
|
||||
myDesc->setList(sl);
|
||||
addFocusWidget(myDesc);
|
||||
y += myDesc->getHeight() + 4;
|
||||
|
||||
return y;
|
||||
}
|
||||
const string& desc, const uInt16 maxlines = 10);
|
||||
|
||||
// Inform the ROM Widget that the underlying cart has somehow changed
|
||||
void invalidate()
|
||||
{
|
||||
sendCommand(RomWidget::kInvalidateListing, -1, -1);
|
||||
}
|
||||
void invalidate();
|
||||
|
||||
// Some carts need to save old state in the debugger, so that we can
|
||||
// implement change tracking; most carts probably won't do anything here
|
||||
virtual void saveOldState() { }
|
||||
|
||||
virtual void loadConfig() override { myDesc->setSelected(0); }
|
||||
virtual void loadConfig() override;
|
||||
virtual void handleCommand(CommandSender* sender, int cmd, int data, int id) override { }
|
||||
|
||||
// Query internal state of the cart (usually just bankswitching info)
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartEFSC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartEFSCWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartF4SC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartF4SCWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartF6SC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartF6SCWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartF8SC.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartF8SCWidget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartFA2.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartFA2Widget.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartFA.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartFAWidget.hxx"
|
||||
|
|
|
@ -19,8 +19,10 @@
|
|||
#include "GuiObject.hxx"
|
||||
#include "OSystem.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "StringParser.hxx"
|
||||
#include "Widget.hxx"
|
||||
|
||||
#include "StringListWidget.hxx"
|
||||
#include "CartDebugWidget.hxx"
|
||||
#include "CartRamWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
@ -22,8 +22,8 @@ class GuiObject;
|
|||
class DataGridOpsWidget;
|
||||
class StringListWidget;
|
||||
class InternalRamWidget;
|
||||
class CartDebugWidget;
|
||||
|
||||
#include "CartDebugWidget.hxx"
|
||||
#include "RamWidget.hxx"
|
||||
#include "Widget.hxx"
|
||||
#include "Command.hxx"
|
||||
|
|
|
@ -15,6 +15,8 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "CartWD.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "CartWDWidget.hxx"
|
||||
|
|
|
@ -20,10 +20,9 @@
|
|||
|
||||
class DataGridOpsWidget;
|
||||
class ScrollBarWidget;
|
||||
class CommandSender;
|
||||
|
||||
#include "Widget.hxx"
|
||||
#include "Command.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "EditableWidget.hxx"
|
||||
#include "Base.hxx"
|
||||
#include "Rect.hxx"
|
||||
|
|
|
@ -18,12 +18,11 @@
|
|||
#ifndef DRIVING_WIDGET_HXX
|
||||
#define DRIVING_WIDGET_HXX
|
||||
|
||||
class Controller;
|
||||
class ButtonWidget;
|
||||
class CheckboxWidget;
|
||||
class DataGridWidget;
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class DrivingWidget : public ControllerWidget
|
||||
|
|
|
@ -15,9 +15,9 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "FlashWidget.hxx"
|
||||
#include "MT24LC256.hxx"
|
||||
#include "Base.hxx"
|
||||
#include "MT24LC256.hxx"
|
||||
#include "FlashWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
FlashWidget::FlashWidget(GuiObject* boss, const GUI::Font& font,
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
#ifndef FLASH_WIDGET_HXX
|
||||
#define FLASH_WIDGET_HXX
|
||||
|
||||
class Controller;
|
||||
class ButtonWidget;
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class FlashWidget : public ControllerWidget
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
#include "EventHandler.hxx"
|
||||
#include "GenesisWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#define GENESIS_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class GenesisWidget : public ControllerWidget
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
#include "EventHandler.hxx"
|
||||
#include "JoystickWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#define JOYSTICK_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class JoystickWidget : public ControllerWidget
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
#include "EventHandler.hxx"
|
||||
#include "KeyboardWidget.hxx"
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#ifndef KEYBOARD_WIDGET_HXX
|
||||
#define KEYBOARD_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
|
|
|
@ -15,9 +15,7 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include "OSystem.hxx"
|
||||
#include "Paddles.hxx"
|
||||
#include "EventHandler.hxx"
|
||||
#include "PaddleWidget.hxx"
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#ifndef PADDLE_WIDGET_HXX
|
||||
#define PADDLE_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Event.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class PaddleWidget : public ControllerWidget
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
#ifndef POINTINGDEVICE_WIDGET_HXX
|
||||
#define POINTINGDEVICE_WIDGET_HXX
|
||||
|
||||
class Controller;
|
||||
class DataGridWidget;
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "ControllerWidget.hxx"
|
||||
|
||||
class PointingDeviceWidget : public ControllerWidget
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#ifndef PROMPT_WIDGET_HXX
|
||||
#define PROMPT_WIDGET_HXX
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <cstdarg>
|
||||
|
||||
class ScrollBarWidget;
|
||||
class FilesystemNode;
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "GuiObject.hxx"
|
||||
#include "InputTextDialog.hxx"
|
||||
#include "OSystem.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "Widget.hxx"
|
||||
|
||||
|
@ -157,6 +158,11 @@ RamWidget::RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& n
|
|||
if(_h == 0) _h = ypos + myLineHeight - y;
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
RamWidget::~RamWidget()
|
||||
{
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
|
||||
{
|
||||
|
|
|
@ -24,10 +24,10 @@ class DataGridWidget;
|
|||
class DataGridOpsWidget;
|
||||
class EditTextWidget;
|
||||
class StaticTextWidget;
|
||||
class InputTextDialog;
|
||||
|
||||
#include "Widget.hxx"
|
||||
#include "Command.hxx"
|
||||
#include "InputTextDialog.hxx"
|
||||
|
||||
class RamWidget : public Widget, public CommandSender
|
||||
{
|
||||
|
@ -35,7 +35,7 @@ class RamWidget : public Widget, public CommandSender
|
|||
RamWidget(GuiObject* boss, const GUI::Font& lfont, const GUI::Font& nfont,
|
||||
int x, int y, int w, int h,
|
||||
uInt32 ramsize, uInt32 numrows, uInt32 pagesize);
|
||||
virtual ~RamWidget() = default;
|
||||
virtual ~RamWidget();
|
||||
|
||||
void loadConfig() override;
|
||||
void setOpsWidget(DataGridOpsWidget* w);
|
||||
|
|
|
@ -25,8 +25,8 @@ class DataGridWidget;
|
|||
class DataGridOpsWidget;
|
||||
class EditTextWidget;
|
||||
class StaticTextWidget;
|
||||
class CartDebug;
|
||||
|
||||
#include "CartDebug.hxx"
|
||||
#include "RamWidget.hxx"
|
||||
|
||||
class RiotRamWidget : public RamWidget
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "FrameBuffer.hxx"
|
||||
#include "GuiObject.hxx"
|
||||
#include "OSystem.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "RiotDebug.hxx"
|
||||
#include "PopUpWidget.hxx"
|
||||
#include "ToggleBitWidget.hxx"
|
||||
|
|
|
@ -24,8 +24,9 @@ class DataGridWidget;
|
|||
class PopUpWidget;
|
||||
class ToggleBitWidget;
|
||||
class ControllerWidget;
|
||||
class Controller;
|
||||
|
||||
#include "Control.hxx"
|
||||
#include "Widget.hxx"
|
||||
#include "Command.hxx"
|
||||
|
||||
class RiotWidget : public Widget, public CommandSender
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
class ScrollBarWidget;
|
||||
class PackedBitArray;
|
||||
class CheckListWidget;
|
||||
class RomListSettings;
|
||||
|
||||
#include "Base.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "EditableWidget.hxx"
|
||||
#include "RomListSettings.hxx"
|
||||
|
||||
/** RomListWidget */
|
||||
class RomListWidget : public EditableWidget
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "Settings.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
|
@ -228,3 +226,9 @@ void RomWidget::patchROM(int disasm_line, const string& bytes,
|
|||
Common::Base::setFormat(oldbase);
|
||||
}
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void RomWidget::scrollTo(int line)
|
||||
{
|
||||
myRomList->setSelected(line);
|
||||
}
|
||||
|
|
|
@ -20,10 +20,11 @@
|
|||
|
||||
class GuiObject;
|
||||
class EditTextWidget;
|
||||
class RomListWidget;
|
||||
|
||||
#include "Base.hxx"
|
||||
#include "Command.hxx"
|
||||
#include "RomListWidget.hxx"
|
||||
#include "Widget.hxx"
|
||||
|
||||
class RomWidget : public Widget, public CommandSender
|
||||
{
|
||||
|
@ -41,7 +42,7 @@ class RomWidget : public Widget, public CommandSender
|
|||
void invalidate(bool forcereload = true)
|
||||
{ myListIsDirty = true; if(forcereload) loadConfig(); }
|
||||
|
||||
void scrollTo(int line) { myRomList->setSelected(line); }
|
||||
void scrollTo(int line);
|
||||
|
||||
private:
|
||||
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
#ifndef SAVEKEY_WIDGET_HXX
|
||||
#define SAVEKEY_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "FlashWidget.hxx"
|
||||
|
||||
class SaveKeyWidget : public FlashWidget
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
class GuiObject;
|
||||
class EditTextWidget;
|
||||
class CheckboxWidget;
|
||||
|
||||
#include "Widget.hxx"
|
||||
#include "Command.hxx"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "FrameBuffer.hxx"
|
||||
#include "GuiObject.hxx"
|
||||
#include "OSystem.hxx"
|
||||
#include "Debugger.hxx"
|
||||
#include "CartDebug.hxx"
|
||||
#include "TIA.hxx"
|
||||
#include "TIADebug.hxx"
|
||||
|
|
|
@ -18,7 +18,8 @@
|
|||
#ifndef TRAKBALL_WIDGET_HXX
|
||||
#define TRAKBALL_WIDGET_HXX
|
||||
|
||||
#include "Control.hxx"
|
||||
class Controller;
|
||||
|
||||
#include "PointingDeviceWidget.hxx"
|
||||
|
||||
class TrakBallWidget : public PointingDeviceWidget
|
||||
|
|
|
@ -48,6 +48,7 @@ MODULE_OBJS := \
|
|||
src/debugger/gui/CartUAWidget.o \
|
||||
src/debugger/gui/CartWDWidget.o \
|
||||
src/debugger/gui/CartX07Widget.o \
|
||||
src/debugger/gui/CartDebugWidget.o \
|
||||
src/debugger/gui/CpuWidget.o \
|
||||
src/debugger/gui/DataGridOpsWidget.o \
|
||||
src/debugger/gui/DataGridWidget.o \
|
||||
|
|
|
@ -15,9 +15,6 @@
|
|||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//============================================================================
|
||||
|
||||
#include <algorithm>
|
||||
#include <sstream>
|
||||
|
||||
#include "bspf.hxx"
|
||||
|
||||
#include "CommandMenu.hxx"
|
||||
|
|
Loading…
Reference in New Issue