From 832ec7056511ee04dc3d4fdce09acf2ceb2c58dd Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 28 Feb 2006 21:35:40 +0800 Subject: [PATCH] notepad: Wrap long lines by default like Windows does. --- programs/notepad/main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 0b10c57ca29..b6640660b64 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -143,6 +143,9 @@ static VOID NOTEPAD_InitData(VOID) *p = '\0'; Globals.hDevMode = NULL; Globals.hDevNames = NULL; + + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, + MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); } /*********************************************************************** @@ -178,11 +181,15 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_CREATE: { static const WCHAR editW[] = { 'e','d','i','t',0 }; + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | + ES_AUTOVSCROLL | ES_MULTILINE; RECT rc; GetClientRect(hWnd, &rc); + + if (!Globals.bWrapLongLines) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; + Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - ES_AUTOVSCROLL | ES_MULTILINE, + dwStyle, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); NOTEPAD_InitFont(); @@ -370,6 +377,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; + Globals.bWrapLongLines = TRUE; ZeroMemory(&class, sizeof(class)); class.cbSize = sizeof(class);