summaryrefslogtreecommitdiff
path: root/src/gui/chatwindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/chatwindow.h')
-rw-r--r--src/gui/chatwindow.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 66d35ead5..4f65ed44d 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -285,6 +285,8 @@ class ChatWindow : public Window,
void unHideWindow();
+ void widgetResized(const gcn::Event &event);
+
protected:
friend class ChatTab;
friend class WhisperTab;
@@ -315,11 +317,12 @@ class ChatWindow : public Window,
/** Used for showing item popup on clicking links **/
ItemLinkHandler *mItemLinkHandler;
+ /** Tabbed area for holding each channel. */
+ TabbedArea *mChatTabs;
+
/** Input box for typing chat messages. */
ChatInput *mChatInput;
- void widgetResized(const gcn::Event &event);
-
void initTradeFilter();
int mRainbowColor;
@@ -329,9 +332,6 @@ class ChatWindow : public Window,
bool mTmpVisible;
- /** Tabbed area for holding each channel. */
- TabbedArea *mChatTabs;
-
typedef std::map<const std::string, ChatTab*> TabMap;
/** Manage whisper tabs */
TabMap mWhispers;
@@ -350,8 +350,8 @@ class ChatWindow : public Window,
StringVect mTradeFilter;
- gcn::DropDown *mColorPicker;
ColorListModel *mColorListModel;
+ gcn::DropDown *mColorPicker;
int mChatColor;
unsigned int mChatHistoryIndex;
std::list<std::string> mAwayLog;