[Scummvm-cvs-logs] SF.net SVN: scummvm:[35020] scummvm/trunk/gui
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Nov 12 14:01:21 CET 2008
Revision: 35020
http://scummvm.svn.sourceforge.net/scummvm/?rev=35020&view=rev
Author: fingolfin
Date: 2008-11-12 13:01:21 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/gui/message.cpp
scummvm/trunk/gui/message.h
Modified: scummvm/trunk/gui/message.cpp
===================================================================
--- scummvm/trunk/gui/message.cpp 2008-11-12 12:58:33 UTC (rev 35019)
+++ scummvm/trunk/gui/message.cpp 2008-11-12 13:01:21 UTC (rev 35020)
@@ -89,10 +89,10 @@
}
if (defaultButton)
- addButton(this, okButtonPos, _h - buttonHeight - 8, defaultButton, kOkCmd, Common::ASCII_RETURN); // Confirm dialog
+ new ButtonWidget(this, okButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, defaultButton, kOkCmd, Common::ASCII_RETURN); // Confirm dialog
if (altButton)
- addButton(this, cancelButtonPos, _h - buttonHeight - 8, altButton, kCancelCmd, Common::ASCII_ESCAPE); // Cancel dialog
+ new ButtonWidget(this, cancelButtonPos, _h - buttonHeight - 8, buttonWidth, buttonHeight, altButton, kCancelCmd, Common::ASCII_ESCAPE); // Cancel dialog
}
void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
@@ -108,13 +108,6 @@
}
}
-ButtonWidget *MessageDialog::addButton(GuiObject *boss, int x, int y, const Common::String &label, uint32 cmd, char hotkey) {
- int w = g_gui.xmlEval()->getVar("Globals.Button.Width", 0);
- int h = g_gui.xmlEval()->getVar("Globals.Button.Height", 0);
-
- return new ButtonWidget(boss, x, y, w, h, label, cmd, hotkey);
-}
-
TimedMessageDialog::TimedMessageDialog(const Common::String &message, uint32 duration)
: MessageDialog(message, 0, 0) {
_timer = getMillis() + duration;
Modified: scummvm/trunk/gui/message.h
===================================================================
--- scummvm/trunk/gui/message.h 2008-11-12 12:58:33 UTC (rev 35019)
+++ scummvm/trunk/gui/message.h 2008-11-12 13:01:21 UTC (rev 35020)
@@ -44,9 +44,6 @@
MessageDialog(const Common::String &message, const char *defaultButton = "OK", const char *altButton = 0);
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
-
-protected:
- ButtonWidget *addButton(GuiObject *boss, int x, int y, const Common::String &label, uint32 cmd, char hotkey);
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list