(svn r4313) The parent window of the chat box is always the main toolbar (?!), therefore don't pass this information as parameter

pull/155/head
tron 19 years ago
parent 2e2235e3cf
commit 59f0e69521

@ -124,7 +124,7 @@ extern const byte _fios_colors[];
/* network gui */ /* network gui */
void ShowNetworkGameWindow(void); void ShowNetworkGameWindow(void);
void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number); void ShowChatWindow(int maxlen);
/* bridge_gui.c */ /* bridge_gui.c */
void ShowBuildBridgeWindow(uint start, uint end, byte type); void ShowBuildBridgeWindow(uint start, uint end, byte type);

@ -332,7 +332,7 @@ void ShowNetworkChatQueryWindow(byte desttype, byte dest)
{ {
_rename_id = desttype + (dest << 8); _rename_id = desttype + (dest << 8);
_rename_what = 2; _rename_what = 2;
ShowChatWindow(150, 1, 0); ShowChatWindow(150);
} }
void ShowNetworkGiveMoneyWindow(byte player) void ShowNetworkGiveMoneyWindow(byte player)

@ -1545,7 +1545,7 @@ static const WindowDesc _chat_window_desc = {
ChatWindowWndProc ChatWindowWndProc
}; };
void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number) void ShowChatWindow(int maxlen)
{ {
Window *w; Window *w;
@ -1557,8 +1557,8 @@ void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_nu
w->click_state = 1 << 1; w->click_state = 1 << 1;
WP(w,querystr_d).caption = STR_NULL; WP(w,querystr_d).caption = STR_NULL;
WP(w,querystr_d).wnd_class = window_class; WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR;
WP(w,querystr_d).wnd_num = window_number; WP(w,querystr_d).wnd_num = 0;
WP(w,querystr_d).text.caret = false; WP(w,querystr_d).text.caret = false;
WP(w,querystr_d).text.maxlength = maxlen; 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" WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box"

Loading…
Cancel
Save