summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-24 18:29:30 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-24 18:30:16 +0300
commita316d537dce50f4b4e1e10f5c26a7851baddbd8b (patch)
tree078de355216db6dab67df9575402cdba7d537dbd /src/gui/widgets
parentcb00b6fe126afe5fff8fc7ff491fda6003ea68f2 (diff)
downloadmanaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.gz
manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.bz2
manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.xz
manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.zip
Small style changes.
Also fix overloaded methods visibility.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h3
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h3
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h3
-rw-r--r--src/gui/widgets/whispertab.h3
4 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 91e436836..99ff8bd2e 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -71,10 +71,11 @@ class DropShortcutContainer : public ShortcutContainer
void widgetHidden(const gcn::Event &event);
- private:
void mouseExited(gcn::MouseEvent &event);
+
void mouseMoved(gcn::MouseEvent &event);
+ private:
bool mItemClicked;
Item *mItemMoved;
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 255a8090e..1ed0bf627 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -72,10 +72,11 @@ class ItemShortcutContainer : public ShortcutContainer
void widgetHidden(const gcn::Event &event);
- private:
void mouseExited(gcn::MouseEvent &event);
+
void mouseMoved(gcn::MouseEvent &event);
+ private:
bool mItemClicked;
Item *mItemMoved;
unsigned mNumber;
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 72fec758f..e8f4cc2dc 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -71,10 +71,11 @@ class SpellShortcutContainer : public ShortcutContainer
void widgetHidden(const gcn::Event &event);
- private:
void mouseExited(gcn::MouseEvent &event);
+
void mouseMoved(gcn::MouseEvent &event);
+ private:
bool mSpellClicked;
TextCommand *mSpellMoved;
SpellPopup *mSpellPopup;
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 226ebaf40..85c670db1 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -46,11 +46,10 @@ class WhisperTab : public ChatTab
void saveToLogFile(std::string &msg);
- void getAutoCompleteList(StringVect &names) const;
-
protected:
friend class ChatWindow;
+ void getAutoCompleteList(StringVect &names) const;
/**
* Constructor.
*