mirror of https://github.com/stella-emu/stella.git
Reverted the previous changes, since it looks like I'll have to revert back
to a TabWidget and PromptWidget, and it's going to take some time. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@478 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena
parent
7e7d0b57f5
commit
c988604949
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: DebuggerDialog.cxx,v 1.5 2005-06-09 19:04:59 stephena Exp $
|
||||
// $Id: DebuggerDialog.cxx,v 1.6 2005-06-09 20:09:22 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -47,7 +47,7 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
|
|||
const int space = 5;
|
||||
const int width = 40;
|
||||
int xpos = border;
|
||||
/*
|
||||
|
||||
// Add a row of buttons for the various debugger operations
|
||||
new ButtonWidget(this, xpos, border, width, 16, "Prompt", kPromptCmd, 0);
|
||||
xpos += space + width;
|
||||
|
|
@ -61,14 +61,12 @@ DebuggerDialog::DebuggerDialog(OSystem* osystem, DialogContainer* parent,
|
|||
xpos += space + width;
|
||||
new ButtonWidget(this, xpos, border, width, 16, "Code", kCodeCmd, 0);
|
||||
xpos += space + width;
|
||||
*/
|
||||
|
||||
const int xoff = border;
|
||||
const int yoff = border + 16 + 2;
|
||||
|
||||
// Create the debugger dialog boxes
|
||||
// myPromptDialog = new PromptDialog(this, osystem, parent, x, y, w, h);
|
||||
|
||||
myPromptDialog = new PromptDialog(this, osystem, parent, x + xoff, y + yoff,
|
||||
myPromptDialog = new PromptDialog(osystem, parent, x + xoff, y + yoff,
|
||||
w - xoff - 2, h - yoff - 3);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: ListWidget.cxx,v 1.12 2005-06-08 18:45:09 stephena Exp $
|
||||
// $Id: ListWidget.cxx,v 1.13 2005-06-09 20:09:23 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -190,7 +190,7 @@ bool ListWidget::handleKeyDown(int ascii, int keycode, int modifiers)
|
|||
{
|
||||
// Ignore all mod keys
|
||||
if(instance()->eventHandler().kbdControl(modifiers) ||
|
||||
instance()->eventHandler().kbdControl(modifiers))
|
||||
instance()->eventHandler().kbdAlt(modifiers))
|
||||
return true;
|
||||
|
||||
bool handled = true;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: PromptDialog.cxx,v 1.8 2005-06-09 19:04:59 stephena Exp $
|
||||
// $Id: PromptDialog.cxx,v 1.9 2005-06-09 20:09:23 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -39,29 +39,10 @@
|
|||
*/
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
PromptDialog::PromptDialog(DebuggerDialog* dbg, OSystem* osystem,
|
||||
DialogContainer* parent,
|
||||
PromptDialog::PromptDialog(OSystem* osystem, DialogContainer* parent,
|
||||
int x, int y, int w, int h)
|
||||
: Dialog(osystem, parent, x, y, w, h),
|
||||
myDebuggerDialog(dbg)
|
||||
: Dialog(osystem, parent, x, y, w, h)
|
||||
{
|
||||
// Add the buttons common to all DebuggerDialog children
|
||||
// myDebuggerDialog->addButtons(this);
|
||||
/*
|
||||
const int border = 5;
|
||||
const int space = 5;
|
||||
const int width = 40;
|
||||
int xpos = border;
|
||||
|
||||
// Add a row of buttons for the various debugger operations
|
||||
new ButtonWidget(this, xpos, border, width, 16, "Prompt", 0, 0);
|
||||
*/
|
||||
|
||||
|
||||
new ButtonWidget(this, 10, 10, 50, 20, "Prompt", 0);
|
||||
|
||||
|
||||
|
||||
_kConsoleCharWidth = instance()->consoleFont().getMaxCharWidth();
|
||||
_kConsoleLineHeight = instance()->consoleFont().getFontHeight() + 2;
|
||||
|
||||
|
|
@ -111,7 +92,7 @@ void PromptDialog::loadConfig()
|
|||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void PromptDialog::drawDialog1()
|
||||
void PromptDialog::drawDialog()
|
||||
{
|
||||
FrameBuffer& fb = instance()->frameBuffer();
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
// See the file "license" for information on usage and redistribution of
|
||||
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||
//
|
||||
// $Id: PromptDialog.hxx,v 1.6 2005-06-09 19:04:59 stephena Exp $
|
||||
// $Id: PromptDialog.hxx,v 1.7 2005-06-09 20:09:23 stephena Exp $
|
||||
//
|
||||
// Based on code from ScummVM - Scumm Interpreter
|
||||
// Copyright (C) 2002-2004 The ScummVM project
|
||||
|
|
@ -25,7 +25,6 @@
|
|||
class CommandSender;
|
||||
class DialogContainer;
|
||||
class ScrollBarWidget;
|
||||
class DebuggerDialog;
|
||||
|
||||
#include <stdarg.h>
|
||||
#include "Dialog.hxx"
|
||||
|
|
@ -40,7 +39,7 @@ enum {
|
|||
class PromptDialog : public Dialog
|
||||
{
|
||||
public:
|
||||
PromptDialog(DebuggerDialog* dbg, OSystem* osystem, DialogContainer* parent,
|
||||
PromptDialog(OSystem* osystem, DialogContainer* parent,
|
||||
int x, int y, int w, int h);
|
||||
virtual ~PromptDialog();
|
||||
|
||||
|
|
@ -53,7 +52,7 @@ class PromptDialog : public Dialog
|
|||
protected:
|
||||
inline char &buffer(int idx) { return _buffer[idx % kBufferSize]; }
|
||||
|
||||
void drawDialog1();
|
||||
void drawDialog();
|
||||
void drawCaret();
|
||||
void putcharIntern(int c);
|
||||
void insertIntoPrompt(const char *str);
|
||||
|
|
@ -101,9 +100,6 @@ class PromptDialog : public Dialog
|
|||
int _historyLine;
|
||||
|
||||
int _kConsoleCharWidth, _kConsoleLineHeight;
|
||||
|
||||
private:
|
||||
DebuggerDialog* myDebuggerDialog;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue