From 59f0e69521f54f5118ecacb7bee1388ba891bf87 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 7 Apr 2006 09:00:57 +0000 Subject: [PATCH] (svn r4313) The parent window of the chat box is always the main toolbar (?!), therefore don't pass this information as parameter --- gui.h | 2 +- main_gui.c | 2 +- network_gui.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui.h b/gui.h index 568e350e34..f5c024a1d1 100644 --- a/gui.h +++ b/gui.h @@ -124,7 +124,7 @@ extern const byte _fios_colors[]; /* network gui */ void ShowNetworkGameWindow(void); -void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number); +void ShowChatWindow(int maxlen); /* bridge_gui.c */ void ShowBuildBridgeWindow(uint start, uint end, byte type); diff --git a/main_gui.c b/main_gui.c index 14b4b49601..87750ad254 100644 --- a/main_gui.c +++ b/main_gui.c @@ -332,7 +332,7 @@ void ShowNetworkChatQueryWindow(byte desttype, byte dest) { _rename_id = desttype + (dest << 8); _rename_what = 2; - ShowChatWindow(150, 1, 0); + ShowChatWindow(150); } void ShowNetworkGiveMoneyWindow(byte player) diff --git a/network_gui.c b/network_gui.c index 4d089c01de..f537a7ebb9 100644 --- a/network_gui.c +++ b/network_gui.c @@ -1545,7 +1545,7 @@ static const WindowDesc _chat_window_desc = { ChatWindowWndProc }; -void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number) +void ShowChatWindow(int maxlen) { Window *w; @@ -1557,8 +1557,8 @@ void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_nu w->click_state = 1 << 1; WP(w,querystr_d).caption = STR_NULL; - WP(w,querystr_d).wnd_class = window_class; - WP(w,querystr_d).wnd_num = window_number; + WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR; + WP(w,querystr_d).wnd_num = 0; WP(w,querystr_d).text.caret = false; WP(w,querystr_d).text.maxlength = maxlen; WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box"