Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:05:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

buttons in page setup now working properly (for En and De only)

Browse source 
svn path=/trunk/; revision=20631
This commit is contained in:
Christoph von Wittich 2006-01-06 22:41:42 +00:00
parent 4d068ca157
commit 357c1b2aa4
3 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/system/notepad/De.rc
View file

@ -95,8 +95,8 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD
LTEXT "&Unten:", 0x14E,100, 73, 30, 10, WS_CHILD LTEXT "&Unten:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
PUSHBUTTON "Abbrechen", 0x152, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15, WS_TABSTOP
} }

4
reactos/subsys/system/notepad/En.rc
View file

@ -97,8 +97,8 @@ EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD
LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
PUSHBUTTON "Cancel", 0x152, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15, WS_TABSTOP
} }

77
reactos/subsys/system/notepad/dialog.c
View file

@ -847,51 +847,54 @@ VOID DIALOG_FilePageSetup(void)
static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch (msg) switch (msg)
{ {
case WM_COMMAND: case WM_COMMAND:
switch (wParam) if (HIWORD(wParam) == BN_CLICKED)
{ {
case IDOK: switch (LOWORD(wParam))
/* save user input and close dialog */ {
GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader)); case IDOK:
GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter)); /* save user input and close dialog */
GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop)); GetDlgItemText(hDlg, 0x141, Globals.szHeader, SIZEOF(Globals.szHeader));
GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom)); GetDlgItemText(hDlg, 0x143, Globals.szFooter, SIZEOF(Globals.szFooter));
GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft)); GetDlgItemText(hDlg, 0x14A, Globals.szMarginTop, SIZEOF(Globals.szMarginTop));
GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight)); GetDlgItemText(hDlg, 0x150, Globals.szMarginBottom, SIZEOF(Globals.szMarginBottom));
EndDialog(hDlg, IDOK); GetDlgItemText(hDlg, 0x147, Globals.szMarginLeft, SIZEOF(Globals.szMarginLeft));
return TRUE; GetDlgItemText(hDlg, 0x14D, Globals.szMarginRight, SIZEOF(Globals.szMarginRight));
EndDialog(hDlg, IDOK);
return TRUE;
case IDCANCEL: case IDCANCEL:
/* discard user input and close dialog */ /* discard user input and close dialog */
EndDialog(hDlg, IDCANCEL); EndDialog(hDlg, IDCANCEL);
return TRUE; return TRUE;
case IDHELP: case IDHELP:
{ {
/* FIXME: Bring this to work */ /* FIXME: Bring this to work */
static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 };
static const WCHAR helpW[] = { 'H','e','l','p',0 }; static const WCHAR helpW[] = { 'H','e','l','p',0 };
MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); MessageBox(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION);
return TRUE; return TRUE;
}
default:
break;
}
} }
break;
default:
break;
}
break;
case WM_INITDIALOG: case WM_INITDIALOG:
/* fetch last user input prior to display dialog */ /* fetch last user input prior to display dialog */
SetDlgItemText(hDlg, 0x141, Globals.szHeader); SetDlgItemText(hDlg, 0x141, Globals.szHeader);
SetDlgItemText(hDlg, 0x143, Globals.szFooter); SetDlgItemText(hDlg, 0x143, Globals.szFooter);
SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop); SetDlgItemText(hDlg, 0x14A, Globals.szMarginTop);
SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom); SetDlgItemText(hDlg, 0x150, Globals.szMarginBottom);
SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft); SetDlgItemText(hDlg, 0x147, Globals.szMarginLeft);
SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight); SetDlgItemText(hDlg, 0x14D, Globals.szMarginRight);
break; break;
} }
return FALSE; return FALSE;
} }