diff options
| author | Silenio Quarti <silenio> | 2002-12-06 17:47:54 +0000 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2002-12-06 17:47:54 +0000 |
| commit | e0647bf36a57a93a52a212fea4cb4de17e8f5410 (patch) | |
| tree | f57e22bb53a6b9affa57126639e3a38ba9fe0070 | |
| parent | ba0c688c70ab9595d219a1b1f8aa1cc0024247b0 (diff) | |
| download | eclipse.platform.swt-e0647bf36a57a93a52a212fea4cb4de17e8f5410.tar.gz eclipse.platform.swt-e0647bf36a57a93a52a212fea4cb4de17e8f5410.tar.xz eclipse.platform.swt-e0647bf36a57a93a52a212fea4cb4de17e8f5410.zip | |
*** empty log message ***
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c | 20 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java | 3 |
2 files changed, 23 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c index 124d23bb89..f1ef902117 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c @@ -7032,6 +7032,26 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_carbon_OS_TrackMouseLocatio } #endif /* NO_TrackMouseLocationWithOptions */ +#ifndef NO_UnionRect +JNIEXPORT void JNICALL OS_NATIVE(UnionRect) + (JNIEnv *env, jclass that, jobject arg0, jobject arg1, jobject arg2) +{ + Rect _arg0, *lparg0=NULL; + Rect _arg1, *lparg1=NULL; + Rect _arg2, *lparg2=NULL; + + DEBUG_CALL("UnionRect\n") + + if (arg0) lparg0 = getRectFields(env, arg0, &_arg0); + if (arg1) lparg1 = getRectFields(env, arg1, &_arg1); + if (arg2) lparg2 = getRectFields(env, arg2, &_arg2); + UnionRect(lparg0, lparg1, lparg2); + if (arg0) setRectFields(env, arg0, lparg0); + if (arg1) setRectFields(env, arg1, lparg1); + if (arg2) setRectFields(env, arg2, lparg2); +} +#endif + #ifndef NO_UnionRgn JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_carbon_OS_UnionRgn (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java index 71671d419b..20c6c92b5a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java @@ -415,6 +415,8 @@ public class OS { public static final int kThemePushButtonFont = 105; public static final int kThemeRadioButton = 2; public static final int kThemeResizeLeftRightCursor = 17; + public static final int kThemeResizeLeftCursor = 15; + public static final int kThemeResizeRightCursor = 16; public static final int kThemeRoundedBevelButton = 15; public static final int kThemeSmallBevelButton = 8; public static final int kThemeSmallEmphasizedSystemFont = 2; @@ -1026,6 +1028,7 @@ public static final native void TextMode(short mode); public static final native void TextSize(short size); public static final native short TextWidth(byte[] textBuf, short firstByte, short byteCount); public static final native int TrackMouseLocationWithOptions(int inPort, int inOptions, double inTime, Point outPt, int [] outModifiers, short[] outResult); +public static final native void UnionRect(int srcA, int srcB, int dst); public static final native void UnionRgn(int srcRgnA, int srcRgnB, int dstRgn); public static final native int UnlockPortBits(int portHandle); public static final native void UpdateControls(int wHandle, int rgnHandle); |