summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2003-08-08 19:06:43 +0000
committerGrant Gayed <ggayed>2003-08-08 19:06:43 +0000
commiteb96ddbd78a1d043d59fc2eefe38612a75b454dd (patch)
tree8a70b816ac182742333d607ce71f7580ca9c2b98
parent6b28a0c174dd79e5553032e158163699afc1b2f5 (diff)
downloadeclipse.platform.swt-eb96ddbd78a1d043d59fc2eefe38612a75b454dd.tar.gz
eclipse.platform.swt-eb96ddbd78a1d043d59fc2eefe38612a75b454dd.tar.xz
eclipse.platform.swt-eb96ddbd78a1d043d59fc2eefe38612a75b454dd.zip
40624
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
index 1fa26114f1..b5e4784ca7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
@@ -274,8 +274,8 @@ public boolean setFocus () {
public void setFont (Font font) {
checkWidget();
- super.setFont (font);
if (caret != null) caret.setFont (font);
+ super.setFont (font);
}
void updateCaret () {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java
index 1f90ee4f86..cc0a0adcc8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java
@@ -219,8 +219,8 @@ boolean setBounds (int x, int y, int width, int height, boolean move, boolean re
}
public void setFont (Font font) {
checkWidget();
- super.setFont (font);
if (caret != null) caret.setFont (font);
+ super.setFont (font);
}
int XExposure (int w, int client_data, int call_data, int continue_to_dispatch) {
boolean isFocus = caret != null && caret.isFocusCaret ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java
index 90700b3cee..72cb343246 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java
@@ -218,7 +218,7 @@ public void setCaret (Caret caret) {
public void setFont (Font font) {
checkWidget();
- super.setFont (font);
if (caret != null) caret.setFont (font);
+ super.setFont (font);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
index 59f710bb99..3d0a7d03b1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
@@ -201,8 +201,8 @@ public void setCaret (Caret caret) {
public void setFont (Font font) {
checkWidget ();
- super.setFont (font);
if (caret != null) caret.setFont (font);
+ super.setFont (font);
}
LRESULT WM_KILLFOCUS (int wParam, int lParam) {