SCUMM: Make HelpDialog & ConfigDialog internal

svn-id: r48562
This commit is contained in:
Max Horn 2010-04-06 09:26:04 +00:00
parent 3a8366526b
commit 7dafef752f
2 changed files with 45 additions and 46 deletions

View File

@ -204,6 +204,51 @@ static const ResString string_map_table_v345[] = {
#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;
}

View File

@ -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 @@ protected:
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