diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 23:56:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:42 +0300 |
commit | d59cd9111c1e86b224ea62cc975c49b157e2b3cf (patch) | |
tree | d7186479633c0269573e92b5a5213d04b84b3995 /src/net | |
parent | 71d2b482d84246b8456ea863f94a9a766d33f197 (diff) | |
download | manaverse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.gz manaverse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.bz2 manaverse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.xz manaverse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.zip |
Add to some controls palette inheritance from other controls.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/gui/guildtab.cpp | 4 | ||||
-rw-r--r-- | src/net/ea/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.cpp | 4 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.h | 2 | ||||
-rw-r--r-- | src/net/ea/guildhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/ea/partyhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/gui/guildtab.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/eathena/gui/partytab.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/gui/partytab.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/gui/guildtab.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/gui/partytab.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/gui/partytab.h | 2 |
14 files changed, 20 insertions, 20 deletions
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 4726742da..6ec3d7167 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -45,8 +45,8 @@ namespace Ea { extern Guild *taGuild; -GuildTab::GuildTab() : - ChatTab(_("Guild")) +GuildTab::GuildTab(const Widget2 *const widget) : + ChatTab(widget, _("Guild")) { setTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB)); setHighlightedTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB_HIGHLIGHTED)); diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index 58f94e4d3..b100edf07 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -34,7 +34,7 @@ namespace Ea class GuildTab : public ChatTab { public: - GuildTab(); + GuildTab(const Widget2 *const widget); A_DELETE_COPY(GuildTab) diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index 11c1086cb..2c97c8cc4 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -45,8 +45,8 @@ namespace Ea { -PartyTab::PartyTab() : - ChatTab(_("Party")) +PartyTab::PartyTab(const Widget2 *const widget) : + ChatTab(widget, _("Party")) { setTabColor(&getThemeColor(Theme::PARTY_CHAT_TAB)); setHighlightedTabColor(&getThemeColor(Theme::PARTY_CHAT_TAB_HIGHLIGHTED)); diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 8104217ee..1b6b84de7 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -34,7 +34,7 @@ namespace Ea class PartyTab : public ChatTab { public: - PartyTab(); + PartyTab(const Widget2 *const widget); A_DELETE_COPY(PartyTab) diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 5a6426e16..4af230773 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -121,7 +121,7 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) taGuild = g; if (!guildTab && chatWindow) { - guildTab = new GuildTab(); + guildTab = new GuildTab(chatWindow); guildTab->loadFromLogFile("#Guild"); if (player_node) player_node->addGuild(taGuild); diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 6d76e3165..7702bfcee 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -219,7 +219,7 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg) if (!chatWindow) return; - Ea::partyTab = new PartyTab(); + Ea::partyTab = new PartyTab(chatWindow); Ea::partyTab->loadFromLogFile("#Party"); } diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index 387cb9446..862b3cd91 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -41,8 +41,8 @@ namespace EAthena { -GuildTab::GuildTab() : - Ea::GuildTab() +GuildTab::GuildTab(const Widget2 *const widget) : + Ea::GuildTab(widget) { } diff --git a/src/net/eathena/gui/guildtab.h b/src/net/eathena/gui/guildtab.h index e751e19ac..946857fff 100644 --- a/src/net/eathena/gui/guildtab.h +++ b/src/net/eathena/gui/guildtab.h @@ -34,7 +34,7 @@ namespace EAthena class GuildTab : public Ea::GuildTab { public: - GuildTab(); + GuildTab(const Widget2 *const widget); A_DELETE_COPY(GuildTab) diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 57a0bf8c1..89682e1eb 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -44,8 +44,8 @@ namespace EAthena { -PartyTab::PartyTab() : - Ea::PartyTab() +PartyTab::PartyTab(const Widget2 *const widget) : + Ea::PartyTab(widget) { } diff --git a/src/net/eathena/gui/partytab.h b/src/net/eathena/gui/partytab.h index 621ebfc9e..ce9a46564 100644 --- a/src/net/eathena/gui/partytab.h +++ b/src/net/eathena/gui/partytab.h @@ -34,7 +34,7 @@ namespace EAthena class PartyTab : public Ea::PartyTab { public: - PartyTab(); + PartyTab(const Widget2 *const widget); A_DELETE_COPY(PartyTab) diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 752a33746..4f6029b9d 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -41,8 +41,8 @@ namespace TmwAthena { -GuildTab::GuildTab() : - Ea::GuildTab() +GuildTab::GuildTab(const Widget2 *const widget) : + Ea::GuildTab(widget) { } diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 8757cb533..187ddc610 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -34,7 +34,7 @@ namespace TmwAthena class GuildTab : public Ea::GuildTab { public: - GuildTab(); + GuildTab(const Widget2 *const widget); A_DELETE_COPY(GuildTab) diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 40ed53fcf..1b4bc21de 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -44,8 +44,8 @@ namespace TmwAthena { -PartyTab::PartyTab() : - Ea::PartyTab() +PartyTab::PartyTab(const Widget2 *const widget) : + Ea::PartyTab(widget) { } diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index 8431340b6..860a79bbb 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -34,7 +34,7 @@ namespace TmwAthena class PartyTab : public Ea::PartyTab { public: - PartyTab(); + PartyTab(const Widget2 *const widget); A_DELETE_COPY(PartyTab) |