hg: jdk7u/jdk7u40-dev/jdk: 8020298: [macosx] Incorrect merge in the lwawt code

[sergey.bylokhov at oracle.com]

Changeset: 93ff09de1ad8
Author:    serb
Date:      2013-07-16 19:15 +0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u40-dev/jdk/rev/93ff09de1ad8

8020298: [macosx] Incorrect merge in the lwawt code
Reviewed-by: art, anthony

! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java