diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
commit | cc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch) | |
tree | edd316eb6094f0c02d6d014385865dcd88a2bc56 /src/gui/npclistdialog.h | |
parent | b0df784f1be44a657ca8092069488602270629b7 (diff) | |
parent | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff) | |
download | mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2 mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip |
Merge branch 'eathena/master'
Conflicts:
A lot of files.
Diffstat (limited to 'src/gui/npclistdialog.h')
-rw-r--r-- | src/gui/npclistdialog.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h index 7e37c7e6..6c1e02e3 100644 --- a/src/gui/npclistdialog.h +++ b/src/gui/npclistdialog.h @@ -29,6 +29,10 @@ #include <vector> +#ifdef EATHENA_SUPPORT +class Network; +#endif + /** * The npc list dialog. * @@ -43,7 +47,11 @@ class NpcListDialog : public Window, public gcn::ActionListener, * * @see Window::Window */ +#ifdef TMWSERV_SUPPORT NpcListDialog(); +#else + NpcListDialog(Network *network); +#endif /** * Called when receiving actions from the widgets. @@ -77,10 +85,23 @@ class NpcListDialog : public Window, public gcn::ActionListener, */ void reset(); + void setVisible(bool visible); + + /** + * Requests the listbox to take focus for input and sets window width + * to the last known setting. + */ + void requestFocus(); + private: +#ifdef EATHENA_SUPPORT + Network *mNetwork; +#endif gcn::ListBox *mItemList; std::vector<std::string> mItems; }; +extern NpcListDialog *npcListDialog; + #endif // GUI_NPCLISTDIALOG_H |