summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio>2008-09-18 14:04:10 +0000
committerSilenio Quarti <silenio>2008-09-18 14:04:10 +0000
commit1d98892db1bdc589d2e5f0c31aa064188cc956cf (patch)
tree4ad3422d986b1456e376b398798f86d454e8757c
parentba4e2f7a51360d32c7e36f91444f27d4b096ca00 (diff)
downloadeclipse.platform.swt-1d98892db1bdc589d2e5f0c31aa064188cc956cf.tar.gz
eclipse.platform.swt-1d98892db1bdc589d2e5f0c31aa064188cc956cf.tar.xz
eclipse.platform.swt-1d98892db1bdc589d2e5f0c31aa064188cc956cf.zip
245667 - Horizontal Sash does not show resize cursor
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java4
2 files changed, 3 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
index 3916d54bf4..3910b13389 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java
@@ -3294,7 +3294,7 @@ public void setCursor (Cursor cursor) {
if (theWindow [0] == 0) return;
}
Rect rect = new Rect ();
- OS.GetWindowBounds (theWindow [0], (short) OS.kWindowContentRgn, rect);
+ OS.GetWindowBounds (theWindow [0], (short) OS.kWindowStructureRgn, rect);
int [] theControl = new int [1];
if (display.grabControl == this) {
theControl [0] = handle;
@@ -3338,7 +3338,6 @@ public void setCursor (Cursor cursor) {
OS.HIViewConvertPoint (pt, theControl [0], 0);
where.h -= (int) pt.x;
where.v -= (int) pt.y;
- OS.GetWindowBounds (theWindow [0], (short) OS.kWindowStructureRgn, rect);
where.h -= rect.left;
where.v -= rect.top;
int modifiers = OS.GetCurrentEventKeyModifiers ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index 360432e933..e67cfd0c6c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -1365,7 +1365,7 @@ public Control getCursorControl () {
if (OS.FindWindow (where, theWindow) != OS.inContent) return null;
if (theWindow [0] == 0) return null;
Rect rect = new Rect ();
- OS.GetWindowBounds (theWindow [0], (short) OS.kWindowContentRgn, rect);
+ OS.GetWindowBounds (theWindow [0], (short) OS.kWindowStructureRgn, rect);
CGPoint inPoint = new CGPoint ();
inPoint.x = where.h - rect.left;
inPoint.y = where.v - rect.top;
@@ -3353,7 +3353,7 @@ boolean runEnterExit () {
if (OS.FindWindow (where, theWindow) == OS.inContent) {
if (theWindow [0] != 0) {
Rect rect = new Rect ();
- OS.GetWindowBounds (theWindow [0], (short) OS.kWindowContentRgn, rect);
+ OS.GetWindowBounds (theWindow [0], (short) OS.kWindowStructureRgn, rect);
CGPoint inPoint = new CGPoint ();
inPoint.x = where.h - rect.left;
inPoint.y = where.v - rect.top;