- Remove commented out lines added in r52332 - clip children should not be taken into account here

[SHELL32]
- Use COPYRIGHT_YEAR definition instead of current year

svn path=/trunk/; revision=52343
This commit is contained in:
Rafal Harabien 2011-06-18 14:55:03 +00:00
parent 11e8c31bdc
commit 2d96ec4333
3 changed files with 6 additions and 5 deletions

View file

@ -58,6 +58,7 @@ Paolo Pantaleo <paolopan@freemail.it>
Peter Ward <dralnix@gmail.com> Peter Ward <dralnix@gmail.com>
Pierre Schweitzer <pschweitzer@reactos.org> Pierre Schweitzer <pschweitzer@reactos.org>
Phillip Susi <phreak@iag.net> Phillip Susi <phreak@iag.net>
Rafal Harabien <rafalh@reactos.org>
Rex Jolliff <rex@lvcablemodem.com> Rex Jolliff <rex@lvcablemodem.com>
Richard Campbell <betam4x@gmail.com> Richard Campbell <betam4x@gmail.com>
Robert Bergkvist <fragdance@hotmail.com> Robert Bergkvist <fragdance@hotmail.com>

View file

@ -1 +1,3 @@
const char * const SHELL_Authors[] = { "Copyright 1993-2011 WINE team", "Copyright 1998-2011 ReactOS Team", 0 }; #include <reactos/version.h>
const char * const SHELL_Authors[] = { "Copyright 1993-" COPYRIGHT_YEAR " WINE team", "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team", 0 };

View file

@ -1037,8 +1037,7 @@ co_WinPosSetWindowPos(
SWP_HIDEWINDOW | SWP_FRAMECHANGED)) != SWP_HIDEWINDOW | SWP_FRAMECHANGED)) !=
(SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER))
{ {
VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE,
FALSE, //(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE,
(Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE);
VisRgn = NULL; VisRgn = NULL;
@ -1129,8 +1128,7 @@ co_WinPosSetWindowPos(
if (!(WinPos.flags & SWP_NOREDRAW)) if (!(WinPos.flags & SWP_NOREDRAW))
{ {
/* Determine the new visible region */ /* Determine the new visible region */
VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE,
FALSE,//(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE,
(Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE);
VisRgn = NULL; VisRgn = NULL;