[Scummvm-cvs-logs] CVS: scummvm-new/gui dialog.cpp,1.1.1.1,1.2 dialog.h,1.1.1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Wed Aug 21 09:31:11 CEST 2002
Update of /cvsroot/scummvm/scummvm-new/gui
In directory usw-pr-cvs1:/tmp/cvs-serv16015
Modified Files:
dialog.cpp dialog.h
Log Message:
oops, accidentally checked in a hacked up version of this :-)
Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/gui/dialog.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dialog.cpp 21 Aug 2002 16:07:23 -0000 1.1.1.1
+++ dialog.cpp 21 Aug 2002 16:30:39 -0000 1.2
@@ -28,7 +28,7 @@
#include "ListWidget.h"
#include "config-file.h"
#include "sound/mididrv.h"
-#include "scumm/imuse.h"
+#include "sound/imuse.h"
/*
* TODO list
@@ -407,27 +407,9 @@
}
PauseDialog::PauseDialog(NewGui *gui)
- : Dialog (gui, 60, 20, 100, 100)
+ : Dialog (gui, 50, 80, 220, 16)
{
addResText(4, 4, 220, 16, 10);
-}
-
-void PauseDialog::draw()
-{
- if (_screenBuf) {
- _gui->blitFrom(_screenBuf, _x, _y, _w, _h);
- } else {
- _gui->fillRect(_x, _y, _w, _h, _gui->_bgcolor);
- _gui->box(_x, _y, _w, _h);
- }
- _gui->addDirtyRect(_x, _y, _w, _h);
-
- _gui->frameRect(10 + _x, 15 + _y, 100, 100, _gui->_color);
- for (int y = 0; y < 16; ++y)
- for (int x = 0; x < 16; ++x)
- _gui->fillRect(10 + _x + x*5, 15 + _y + y*5, 5, 5, y*16 + x);
-
-
}
SoundDialog::SoundDialog(NewGui *gui)
Index: dialog.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/gui/dialog.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dialog.h 21 Aug 2002 16:07:23 -0000 1.1.1.1
+++ dialog.h 21 Aug 2002 16:30:39 -0000 1.2
@@ -116,8 +116,6 @@
public:
PauseDialog(NewGui *gui);
- virtual void draw();
-
virtual void handleMouseDown(int x, int y, int button, int clickCount)
{ close(); }
virtual void handleKeyDown(char key, int modifiers)
More information about the Scummvm-git-logs
mailing list