Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOTEPAD]

Browse source 
Fix check mark of the status bar menu item.
Fix is based on mudheads patch.
CORE-8297 #resolve

svn path=/trunk/; revision=65837
This commit is contained in:
Eric Kohl 2014-12-26 14:06:19 +00:00
parent df82e81f89
commit 9b71ae1269
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/base/applications/notepad/dialog.c
View file

@ -557,7 +557,11 @@ VOID DIALOG_FilePrint(VOID)
/* Let commdlg manage copy settings */
printer.nCopies = (WORD)PD_USEDEVMODECOPIES;
if (!PrintDlg(&printer)) return;
if (!PrintDlg(&printer))
{
DeleteObject(font);
return;
}
assert(printer.hDC != 0);
@ -568,7 +572,11 @@ VOID DIALOG_FilePrint(VOID)
di.lpszDatatype = NULL;
di.fwType = 0;
if (StartDoc(printer.hDC, &di) <= 0) return;
if (StartDoc(printer.hDC, &di) <= 0)
{
DeleteObject(font);
return;
}
/* Get the page dimensions in pixels. */
cWidthPels = GetDeviceCaps(printer.hDC, HORZRES);
@ -579,6 +587,8 @@ VOID DIALOG_FilePrint(VOID)
pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(TCHAR));
if (!pTemp)
{
EndDoc(printer.hDC);
DeleteObject(font);
ShowLastError();
return;
}
@ -605,6 +615,11 @@ VOID DIALOG_FilePrint(VOID)
if (StartPage(printer.hDC) <= 0) {
static const TCHAR failed[] = _T("StartPage failed");
static const TCHAR error[] = _T("Print Error");
SelectObject(printer.hDC, old_font);
EndDoc(printer.hDC);
DeleteDC(printer.hDC);
HeapFree(GetProcessHeap(), 0, pTemp);
DeleteObject(font);
MessageBox(Globals.hMainWnd, failed, error, MB_ICONEXCLAMATION);
return;
}
@ -644,9 +659,12 @@ VOID DIALOG_FilePrint(VOID)
} while (i<size);
}
if (old_font != 0)
SelectObject(printer.hDC, old_font);
EndDoc(printer.hDC);
DeleteDC(printer.hDC);
HeapFree(GetProcessHeap(), 0, pTemp);
DeleteObject(font);
}
VOID DIALOG_FilePrinterSetup(VOID)
@ -743,7 +761,7 @@ VOID DoCreateStatusBar(VOID)
SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0);
}
// Set status bar visible or not accordind the the settings.
// Set status bar visiblity according to the settings.
if (Globals.bWrapLongLines == TRUE ||
Globals.bShowStatusBar == FALSE)
{
@ -758,7 +776,7 @@ VOID DoCreateStatusBar(VOID)
}
// Set check state in show status bar item.
if (Globals.bShowStatusBar == TRUE)
if (bStatusBarVisible)
{
CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED);
}