diff options
5 files changed, 36 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties index 72200f95b2..6aff122473 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties @@ -1139,6 +1139,15 @@ OS_CreateIconControl_2= OS_CreateIconControl_3= OS_CreateIconControl_4=cast=(ControlRef *) +OS_CreateLittleArrowsControl= +OS_CreateLittleArrowsControl_0=cast=WindowRef +OS_CreateLittleArrowsControl_1=cast=const Rect * +OS_CreateLittleArrowsControl_2= +OS_CreateLittleArrowsControl_3= +OS_CreateLittleArrowsControl_4= +OS_CreateLittleArrowsControl_5= +OS_CreateLittleArrowsControl_6=cast=(ControlRef *) + OS_CreateNewMenu= OS_CreateNewMenu_0=cast=(MenuID) OS_CreateNewMenu_1=cast=(MenuAttributes) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c index ad4818658f..0744c1dfd8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c @@ -2299,6 +2299,25 @@ failTag: } #endif +#ifndef NO_CreateLittleArrowsControl +JNIEXPORT jint JNICALL OS_NATIVE(CreateLittleArrowsControl) + (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6) +{ + Rect _arg1, *lparg1=NULL; + jint *lparg6=NULL; + jint rc = 0; + OS_NATIVE_ENTER(env, that, CreateLittleArrowsControl_FUNC); + if (arg1) if ((lparg1 = getRectFields(env, arg1, &_arg1)) == NULL) goto failTag; + if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto failTag; + rc = (jint)CreateLittleArrowsControl((WindowRef)arg0, (const Rect *)lparg1, arg2, arg3, arg4, arg5, (ControlRef *)lparg6); +failTag: + if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0); + if (arg1 && lparg1) setRectFields(env, arg1, lparg1); + OS_NATIVE_EXIT(env, that, CreateLittleArrowsControl_FUNC); + return rc; +} +#endif + #ifndef NO_CreateNewMenu JNIEXPORT jint JNICALL OS_NATIVE(CreateNewMenu) (JNIEnv *env, jclass that, jshort arg0, jint arg1, jintArray arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c index 0f504e9ab3..8197eb7d8d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 758; -int OS_nativeFunctionCallCount[758]; +int OS_nativeFunctionCount = 759; +int OS_nativeFunctionCallCount[759]; char * OS_nativeFunctionNames[] = { "AECountItems", "AEGetNthPtr", @@ -181,6 +181,7 @@ char * OS_nativeFunctionNames[] = { "CreateEvent", "CreateGroupBoxControl", "CreateIconControl", + "CreateLittleArrowsControl", "CreateNewMenu", "CreateNewWindow", "CreatePopupArrowControl", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h index 7226ffc574..9cd8a272be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h @@ -185,6 +185,7 @@ typedef enum { CreateEvent_FUNC, CreateGroupBoxControl_FUNC, CreateIconControl_FUNC, + CreateLittleArrowsControl_FUNC, CreateNewMenu_FUNC, CreateNewWindow_FUNC, CreatePopupArrowControl_FUNC, 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 cfc31e909e..84d9feee26 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 @@ -124,6 +124,7 @@ public class OS { public static final int kControlDataBrowserIncludesFrameAndFocusTag = ('b'<<24) + ('r'<<16) + ('d'<<8) + 'r'; public static final int kControlDownButtonPart = 21; public static final int kControlEditTextCFStringTag = ('c'<<24) + ('f'<<16) + ('s'<<8) + 't'; + public static final int kControlEditTextLockedTag = ('l'<<24) + ('o'<<16) + ('c'<<8) + 'k'; public static final int kControlEditTextSingleLineTag = ('s'<<24) + ('g'<<16) + ('l'<<8) + 'c'; public static final int kControlEditTextSelectionTag = ('s'<<24) + ('e'<<16) + ('l'<<8) + 'e'; public static final int kControlEditTextTextTag = ('t'<<24) + ('e'<<16) + ('x'<<8) + 't'; @@ -560,6 +561,8 @@ public class OS { public static final int kThemeMetricEditTextWhitespace = 4; public static final int kThemeMetricFocusRectOutset = 7; public static final int kThemeMetricHSliderHeight = 41; + public static final int kThemeMetricLittleArrowsHeight = 27; + public static final int kThemeMetricLittleArrowsWidth = 28; public static final int kThemeMetricMenuTextTrailingEdgeMargin = 67; public static final int kThemeMetricMenuIconTrailingEdgeMargin = 69; public static final int kThemeMetricNormalProgressBarThickness = 58; @@ -837,6 +840,7 @@ public static final native int CreateDataBrowserControl(int window, Rect boundsR public static final native int CreateEvent(int allocator, int inClassID, int kind, double when, int flags, int[] outEventRef); public static final native int CreateGroupBoxControl(int window, Rect boundsRect, int title, boolean primary, int[] outControl); public static final native int CreateIconControl(int window, Rect boundsRect, ControlButtonContentInfo icon, boolean dontTrack, int[] outControl); +public static final native int CreateLittleArrowsControl(int window, Rect boundsRect, int value, int minimum, int maximum, int increment, int[] outControl); public static final native int CreateNewMenu(short menuID, int menuAttributes, int[] outMenuRef); public static final native int CreateNewWindow(int windowClass, int attributes, Rect bounds, int[] wHandle); public static final native int CreatePopupArrowControl(int window, Rect boundsRect, short orientation, short size, int[] outControl); |