[Scummvm-cvs-logs] SF.net SVN: scummvm:[48562] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 48562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48562&view=rev
Author:   fingolfin
Date:     2010-04-06 09:26:04 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
SCUMM: Make HelpDialog & ConfigDialog internal

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/dialogs.cpp
    scummvm/trunk/engines/scumm/dialogs.h

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2010-04-06 09:25:44 UTC (rev 48561)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2010-04-06 09:26:04 UTC (rev 48562)
@@ -204,6 +204,51 @@
 
 #pragma mark -
 
+#ifndef DISABLE_HELP
+
+class HelpDialog : public ScummDialog {
+public:
+	HelpDialog(const GameSettings &game);
+	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+
+	virtual void reflowLayout();
+
+protected:
+	typedef Common::String String;
+
+	GUI::ButtonWidget *_nextButton;
+	GUI::ButtonWidget *_prevButton;
+
+	GUI::StaticTextWidget *_title;
+	GUI::StaticTextWidget *_key[HELP_NUM_LINES];
+	GUI::StaticTextWidget *_dsc[HELP_NUM_LINES];
+
+	int _page;
+	int _numPages;
+	int _numLines;
+
+	const GameSettings _game;
+
+	void displayKeyBindings();
+};
+
+#endif
+
+class ConfigDialog : public GUI::OptionsDialog {
+protected:
+#ifdef SMALL_SCREEN_DEVICE
+	GUI::Dialog		*_keysDialog;
+#endif
+
+public:
+	ConfigDialog();
+	~ConfigDialog();
+
+	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+};
+
+#pragma mark -
+
 ScummDialog::ScummDialog(int x, int y, int w, int h) : GUI::Dialog(x, y, w, h) {
 	_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
 }

Modified: scummvm/trunk/engines/scumm/dialogs.h
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.h	2010-04-06 09:25:44 UTC (rev 48561)
+++ scummvm/trunk/engines/scumm/dialogs.h	2010-04-06 09:26:04 UTC (rev 48562)
@@ -32,9 +32,6 @@
 #include "gui/saveload.h"
 
 #include "scumm/detection.h"
-#ifndef DISABLE_HELP
-#include "scumm/help.h"
-#endif
 
 namespace GUI {
 	class ListWidget;
@@ -82,49 +79,6 @@
 	void load();
 };
 
-#ifndef DISABLE_HELP
-
-class HelpDialog : public ScummDialog {
-public:
-	HelpDialog(const GameSettings &game);
-	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
-
-	virtual void reflowLayout();
-
-protected:
-	typedef Common::String String;
-
-	GUI::ButtonWidget *_nextButton;
-	GUI::ButtonWidget *_prevButton;
-
-	GUI::StaticTextWidget *_title;
-	GUI::StaticTextWidget *_key[HELP_NUM_LINES];
-	GUI::StaticTextWidget *_dsc[HELP_NUM_LINES];
-
-	int _page;
-	int _numPages;
-	int _numLines;
-
-	const GameSettings _game;
-
-	void displayKeyBindings();
-};
-
-#endif
-
-class ConfigDialog : public GUI::OptionsDialog {
-protected:
-#ifdef SMALL_SCREEN_DEVICE
-	GUI::Dialog		*_keysDialog;
-#endif
-
-public:
-	ConfigDialog();
-	~ConfigDialog();
-
-	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
-};
-
 /**
  * A dialog which displays an arbitrary message to the user and returns
  * ther users reply as its result value. More specifically, it returns


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.