ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Oops, forgot to remove some debugging code. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@802 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2005-09-30 00:53:30 +00:00
parent c6ac381c01
commit 95c826f3d1
3 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stella/src/gui/EditTextWidget.cxx
View File

@ -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: EditTextWidget.cxx,v 1.10 2005-09-30 00:40:34 stephena Exp $
// $Id: EditTextWidget.cxx,v 1.11 2005-09-30 00:53:30 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -33,9 +33,6 @@ EditTextWidget::EditTextWidget(GuiObject* boss, int x, int y, int w, int h,
_flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS;
_type = kEditTextWidget;
if(text == "name")
cerr << "EditTextWidget(): _x = " << _x << ", _y = " << _y << endl << endl;
setEditString(text);
}
@ -71,9 +68,6 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EditTextWidget::drawWidget(bool hilite)
{
//cerr << "EditTextWidget::drawWidget(): (" << _editString << ") " << this << endl
// << "_x = " << _x << ", _y = " << _y << endl << endl;
FrameBuffer& fb = _boss->instance()->frameBuffer();
// Draw a thin frame around us.

22
stella/src/gui/Widget.cxx
View File

@ -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: Widget.cxx,v 1.37 2005-09-30 00:40:34 stephena Exp $
// $Id: Widget.cxx,v 1.38 2005-09-30 00:53:30 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -40,7 +40,6 @@ Widget::Widget(GuiObject* boss, int x, int y, int w, int h)
_id(-1),
_flags(0),
_hasFocus(false),
_drawFocusBorder(false),
_color(kTextColor)
{
// Insert into the widget list of the boss
@ -76,16 +75,6 @@ void Widget::draw()
_x = getAbsX();
_y = getAbsY();
if(_type == kEditTextWidget)
{
EditableWidget* t = (EditableWidget*) this;
if(t->getEditString() == "name")
{
cerr << "oldX = " << oldX << ", oldY = " << oldY << endl
<< "_x = " << _x << ", _y = " << _y << endl << endl;
}
}
// Clear background (unless alpha blending is enabled)
if(_flags & WIDGET_CLEARBG)
fb.fillRect(_x, _y, _w, _h, kBGColor);
@ -106,13 +95,6 @@ cerr << "oldX = " << oldX << ", oldY = " << oldY << endl
// Now perform the actual widget draw
drawWidget((_flags & WIDGET_HILITED) ? true : false);
// Draw focus border
if(_drawFocusBorder)
{
_drawFocusBorder = false;
}
// Restore x/y
if (_flags & WIDGET_BORDER) {
_x -= 4;
@ -254,7 +236,6 @@ Widget* Widget::setFocusForChain(GuiObject* boss, WidgetArray& arr,
{
tmp->lostFocus();
if(!(tmp->_flags & WIDGET_NODRAW_FOCUS))
// tmp->_drawFocusBorder = true;
fb.frameRect(x, y, w, h, kBGColor);
tmp->setDirty(); tmp->draw();
@ -295,7 +276,6 @@ Widget* Widget::setFocusForChain(GuiObject* boss, WidgetArray& arr,
tmp->receivedFocus();
if(!(tmp->_flags & WIDGET_NODRAW_FOCUS))
// tmp->_drawFocusBorder = true;
fb.frameRect(x, y, w, h, kTextColorEm, kDashLine);
tmp->setDirty(); tmp->draw();

5
stella/src/gui/Widget.hxx
View File

@ -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: Widget.hxx,v 1.38 2005-09-30 00:40:34 stephena Exp $
// $Id: Widget.hxx,v 1.39 2005-09-30 00:53:30 stephena Exp $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
@ -72,7 +72,7 @@ enum {
This is the base class for all widgets.
@author Stephen Anthony
@version $Id: Widget.hxx,v 1.38 2005-09-30 00:40:34 stephena Exp $
@version $Id: Widget.hxx,v 1.39 2005-09-30 00:53:30 stephena Exp $
*/
class Widget : public GuiObject
{
@ -142,7 +142,6 @@ class Widget : public GuiObject
int _id;
int _flags;
bool _hasFocus;
bool _drawFocusBorder;
OverlayColor _color;
public: