ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore setting of caption "Error".

This commit is contained in:
Dmitry Timoshkov 2002-10-22 00:42:53 +00:00 committed by Alexandre Julliard
parent 07d5c1a32e
commit 9abcad524c
7 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user/resources/user32.rc
View File

@ -24,7 +24,8 @@
#include "dlgs.h"
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
#define IDS_MDI_MOREWINDOWS 13
#define IDS_ERROR 2
/*
* Everything that does not depend on language,

3
dlls/user/resources/user32_En.rc
View File

@ -77,5 +77,6 @@ END
STRINGTABLE DISCARDABLE
{
MDI_IDS_MOREWINDOWS "&More Windows..." /* defined in mdi.h */
IDS_ERROR "Error"
IDS_MDI_MOREWINDOWS "&More Windows..."
}

5
dlls/user/resources/user32_Ru.rc
View File

@ -64,3 +64,8 @@ BEGIN
PUSHBUTTON "&Íåò", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
END
STRINGTABLE DISCARDABLE
{
IDS_ERROR "Îøèáêà"
IDS_MDI_MOREWINDOWS "&More Windows..."
}

3
dlls/user/resources/user32_Sk.rc
View File

@ -77,5 +77,6 @@ END
STRINGTABLE DISCARDABLE
{
MDI_IDS_MOREWINDOWS "&Viac okien..." /* defined in mdi.h */
IDS_ERROR "Error"
IDS_MDI_MOREWINDOWS "&Viac okien..."
}

6
dlls/user/resources/user32_Zh.rc
View File

@ -72,7 +72,8 @@ END
STRINGTABLE DISCARDABLE
{
MDI_IDS_MOREWINDOWS "更多窗口(&M)..." /* defined in mdi.h */
IDS_ERROR "Error"
IDS_MDI_MOREWINDOWS "更多窗口(&M)..." /* defined in mdi.h */
}
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
@ -132,7 +133,8 @@ END
STRINGTABLE DISCARDABLE
{
MDI_IDS_MOREWINDOWS "更多視窗(&M)..." /* defined in mdi.h */
IDS_ERROR "Error"
IDS_MDI_MOREWINDOWS "更多視窗(&M)..."
}
#pragma code_page(default)

6
windows/mdi.c
View File

@ -114,7 +114,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi);
#define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..."
option will appear under the Windows menu */
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
#define IDS_MDI_MOREWINDOWS 13
#define MDIF_NEEDUPDATE 0x0001
@ -279,7 +279,7 @@ static BOOL MDI_MenuDeleteItem( HWND client, HWND hWndChild )
if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT)
{
WCHAR szTmp[50];
LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp);
}
return TRUE;
@ -596,7 +596,7 @@ static HWND MDICreateChild( HWND parent, MDICLIENTINFO *ci,
if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
{
WCHAR szTmp[50];
LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
ModifyMenuW(ci->hWindowMenu,
ci->idFirstChild + MDI_MOREWINDOWSLIMIT,

12
windows/msgbox.c
View File

@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog);
#define MSGBOX_IDICON 1088
#define MSGBOX_IDTEXT 100
#define IDS_ERROR 2
static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
{
@ -61,9 +62,18 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb)
if (HIWORD(lpmb->lpszCaption)) {
SetWindowTextW(hwnd, lpmb->lpszCaption);
} else {
if (LoadStringW(lpmb->hInstance, LOWORD(lpmb->lpszCaption), buf, 256))
UINT res_id = LOWORD(lpmb->lpszCaption);
if (res_id)
{
if (LoadStringW(lpmb->hInstance, res_id, buf, 256))
SetWindowTextW(hwnd, buf);
}
else
{
if (LoadStringW(0, IDS_ERROR, buf, 256))
SetWindowTextW(hwnd, buf);
}
}
if (HIWORD(lpmb->lpszText)) {
lpszText = lpmb->lpszText;
} else {