(svn r23601) -Fix: fix the conflict in window number

This commit is contained in:
truebrain
2011-12-19 20:50:21 +00:00
parent bcbdc3933c
commit 561b25d031
19 changed files with 146 additions and 108 deletions

View File

@@ -479,7 +479,7 @@ struct SignWindow : QueryStringBaseWindow, SignList {
this->caption = STR_EDIT_SIGN_CAPTION;
this->afilter = CS_ALPHANUMERAL;
this->InitNested(desc);
this->InitNested(desc, WN_QUERY_STRING_SIGN);
this->LowerWidget(WID_QES_TEXT);
UpdateSignEditWindow(si);
@@ -656,7 +656,7 @@ void HandleClickOnSign(const Sign *si)
void ShowRenameSignWindow(const Sign *si)
{
/* Delete all other edit windows */
DeleteWindowById(WC_QUERY_STRING, 0);
DeleteWindowByClass(WC_QUERY_STRING);
new SignWindow(&_query_sign_edit_desc, si);
}
@@ -667,7 +667,7 @@ void ShowRenameSignWindow(const Sign *si)
*/
void DeleteRenameSignWindow(SignID sign)
{
SignWindow *w = dynamic_cast<SignWindow *>(FindWindowById(WC_QUERY_STRING, 0));
SignWindow *w = dynamic_cast<SignWindow *>(FindWindowById(WC_QUERY_STRING, WN_QUERY_STRING_SIGN));
if (w != NULL && w->cur_sign == sign) delete w;
}