summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich <fheidric>2007-08-27 14:58:28 +0000
committerFelipe Heidrich <fheidric>2007-08-27 14:58:28 +0000
commit3980bdc8eaf34c46f9690c4d4193f7607cf2cd15 (patch)
tree8583e26031a449ceaaf98ebc675d9db3b9da2800
parent6975e84e525d9d282bedb5ee39d6c4bbabdc7a27 (diff)
downloadeclipse.platform.swt-3980bdc8eaf34c46f9690c4d4193f7607cf2cd15.tar.gz
eclipse.platform.swt-3980bdc8eaf34c46f9690c4d4193f7607cf2cd15.tar.xz
eclipse.platform.swt-3980bdc8eaf34c46f9690c4d4193f7607cf2cd15.zip
Bug 201217 - NPE in Canvas.kEventControlSetFocusPart(Canvas.java:150)
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Canvas.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Canvas.java
index 7a2b5f810c..0944374c57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Canvas.java
@@ -147,7 +147,7 @@ int kEventControlSetFocusPart (int nextHandler, int theEvent, int userData) {
int result = super.kEventControlSetFocusPart (nextHandler, theEvent, userData);
if (result == OS.noErr) {
if (!isDisposed ()) {
- Shell shell = parent.getShell ();
+ Shell shell = getShell ();
short [] part = new short [1];
OS.GetEventParameter (theEvent, OS.kEventParamControlPart, OS.typeControlPartCode, null, 2, null, part);
if (part [0] != OS.kControlFocusNoPart) {