diff options
| author | Steve Northover <steve> | 2002-12-07 00:37:51 +0000 |
|---|---|---|
| committer | Steve Northover <steve> | 2002-12-07 00:37:51 +0000 |
| commit | 4c353897941995ea06af97abf6874674f15f5378 (patch) | |
| tree | c6caf4e2693bd9aaac26fcc1fc67d8ca5ea6bf26 | |
| parent | 9a896abfc057293ce3437401c9533e7507942480 (diff) | |
| download | eclipse.platform.swt-4c353897941995ea06af97abf6874674f15f5378.tar.gz eclipse.platform.swt-4c353897941995ea06af97abf6874674f15f5378.tar.xz eclipse.platform.swt-4c353897941995ea06af97abf6874674f15f5378.zip | |
*** empty log message ***
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/swt.c | 10 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java | 5 |
2 files changed, 13 insertions, 2 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 f1ef902117..87f27ad336 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 @@ -1055,6 +1055,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(ClearKeyboardFocus) } #endif +#ifndef NO_ClearMenuBar +JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_carbon_OS_ClearMenuBar + (JNIEnv *env, jclass that) +{ + DEBUG_CALL("ClearMenuBar\n") + + ClearMenuBar(); +} +#endif /* NO_ClearMenuBar */ + #ifndef NO_ClipCGContextToRegion JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_carbon_OS_ClipCGContextToRegion (JNIEnv *env, jclass that, jint arg0, jobject 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 73828a9fe2..249b45354b 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 @@ -576,6 +576,7 @@ public static final native int CallNextEventHandler(int nextHandler, int eventRe public static final native short CharWidth(short c); public static final native int ClearCurrentScrap(); public static final native int ClearKeyboardFocus(int inWindow); +public static final native void ClearMenuBar(); public static final native int ClipCGContextToRegion(int inContext, Rect portRect, int rgnHandle); public static final native int CloseDataBrowserContainer(int cHandle, int container); public static final native void ClosePoly(); @@ -769,7 +770,7 @@ public static final native int GetWindowDefaultButton(int wHandle, int[] cHandle public static final native int GetWindowEventTarget(int wHandle); public static final native int GetWindowFromPort(int pHandle); public static final native int GetWindowGroupOfClass (int windowClass); -public static final native int GetWindowModality(int wHandle, int[] modalityKind, int[] unavailableWindowHandle); +public static final native int GetWindowModality(int inWindow, int[] outModalKind, int[] outUnavailableWindow); public static final native int GetWindowPort(int wHandle); public static final native void GetWindowStructureWidths(int intWindow, Rect outRect); public static final native int HandleControlSetCursor(int control, Point localPoint, int modifiers, boolean[] cursorWasSet); @@ -984,7 +985,7 @@ public static final native int SetWindowDefaultButton(int wHandle, int cHandle); public static final native int SetWindowGroup(int inWindow, int inNewGroup); public static final native int SetWindowGroupOwner(int inGroup, int inWindow); public static final native int SetWindowGroupParent(int inGroup, int inNewGroup); -public static final native int SetWindowModality(int wHandle, int modalityKind, int unavailableWindowHandle); +public static final native int SetWindowModality(int inWindow, int inModalKind, int inUnavailableWindow); public static final native int SetWindowTitleWithCFString(int wHandle, int sHandle); public static final native void ShowWindow(int wHandle); public static final native void SizeControl(int cHandle, short w, short h); |