Skip to content

Commit 3f4b535

Browse files
committed
[Cocoa] Align ordering in bridgesupport and OS to MacGenerator result
The entries of the AppKitFull.bridgesupport.extras and OS classes are currently not ordered according to what the MacGenerator produces. In order to have consistent MacGenerator results without ordering changes, this change applies the order of class entries that is generated by the MacGenerator.
1 parent 2765985 commit 3f4b535

2 files changed

Lines changed: 9 additions & 21 deletions

File tree

bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4387,6 +4387,7 @@
43874387
<enum name="NSButtonTypeSwitch" swt_gen="true"></enum>
43884388
<enum name="NSCarriageReturnCharacter" swt_gen="true"></enum>
43894389
<enum name="NSClosePathBezierPathElement" swt_gen="true"></enum>
4390+
<enum name="NSColorSpaceModelRGB" swt_gen="true"></enum>
43904391
<enum name="NSCommandKeyMask" swt_gen="true"></enum>
43914392
<enum name="NSCompositingOperationClear" swt_gen="true"></enum>
43924393
<enum name="NSCompositingOperationCopy" swt_gen="true"></enum>
@@ -4402,6 +4403,9 @@
44024403
<enum name="NSControlStateValueOn" swt_gen="true"></enum>
44034404
<enum name="NSCriticalAlertStyle" swt_gen="true"></enum>
44044405
<enum name="NSCurveToBezierPathElement" swt_gen="true"></enum>
4406+
<enum name="NSDatePickerStyleClockAndCalendar" swt_gen="true"></enum>
4407+
<enum name="NSDatePickerStyleTextField" swt_gen="true"></enum>
4408+
<enum name="NSDatePickerStyleTextFieldAndStepper" swt_gen="true"></enum>
44054409
<enum name="NSDeleteCharacter" swt_gen="true"></enum>
44064410
<enum name="NSDeviceIndependentModifierFlagsMask" swt_gen="true"></enum>
44074411
<enum name="NSDragOperationCopy" swt_gen="true"></enum>
@@ -4459,10 +4463,8 @@
44594463
<enum name="NSLineBreakByTruncatingTail" swt_gen="true"></enum>
44604464
<enum name="NSLineBreakByWordWrapping" swt_gen="true"></enum>
44614465
<enum name="NSLineToBezierPathElement" swt_gen="true"></enum>
4462-
44634466
<enum name="NSMiterLineJoinStyle" swt_gen="true"></enum>
44644467
<enum name="NSModalResponseCancel" swt_gen="true"></enum>
4465-
44664468
<enum name="NSMouseEntered" swt_gen="true"></enum>
44674469
<enum name="NSMouseExited" swt_gen="true"></enum>
44684470
<enum name="NSMouseMoved" swt_gen="true"></enum>
@@ -4472,7 +4474,6 @@
44724474
<enum name="NSNoImage" swt_gen="true"></enum>
44734475
<enum name="NSNoTitle" swt_gen="true"></enum>
44744476
<enum name="NSNonZeroWindingRule" swt_gen="true"></enum>
4475-
44764477
<enum name="NSOpenGLCPSurfaceOrder" swt_gen="true"></enum>
44774478
<enum name="NSOpenGLPFAAccumSize" swt_gen="true"></enum>
44784479
<enum name="NSOpenGLPFAAlphaSize" swt_gen="true"></enum>
@@ -4492,16 +4493,13 @@
44924493
<enum name="NSPrintPanelShowsPageSetupAccessory" swt_gen="true"></enum>
44934494
<enum name="NSPrintPanelShowsPrintSelection" swt_gen="true"></enum>
44944495
<enum name="NSProgressIndicatorPreferredThickness" swt_gen="true"></enum>
4495-
<enum name="NSColorSpaceModelRGB" swt_gen="true"></enum>
4496-
44974496
<enum name="NSRegularSquareBezelStyle" swt_gen="true"></enum>
44984497
<enum name="NSResizableWindowMask" swt_gen="true"></enum>
44994498
<enum name="NSRightMouseDown" swt_gen="true"></enum>
45004499
<enum name="NSRightMouseDragged" swt_gen="true"></enum>
45014500
<enum name="NSRightMouseUp" swt_gen="true"></enum>
45024501
<enum name="NSRoundLineCapStyle" swt_gen="true"></enum>
45034502
<enum name="NSRoundLineJoinStyle" swt_gen="true"></enum>
4504-
45054503
<enum name="NSScrollElasticityNone" swt_gen="true"></enum>
45064504
<enum name="NSScrollWheel" swt_gen="true"></enum>
45074505
<enum name="NSScrollerDecrementLine" swt_gen="true"></enum>
@@ -4513,7 +4511,6 @@
45134511
<enum name="NSScrollerStyleLegacy" swt_gen="true"></enum>
45144512
<enum name="NSScrollerStyleOverlay" swt_gen="true"></enum>
45154513
<enum name="NSShiftKeyMask" swt_gen="true"></enum>
4516-
45174514
<enum name="NSSquareLineCapStyle" swt_gen="true"></enum>
45184515
<enum name="NSStatusWindowLevel" swt_gen="true"></enum>
45194516
<enum name="NSStringDrawingUsesLineFragmentOrigin" swt_gen="true"></enum>
@@ -4533,9 +4530,6 @@
45334530
<enum name="NSTextAlignmentJustified" swt_gen="true"></enum>
45344531
<enum name="NSTextAlignmentLeft" swt_gen="true"></enum>
45354532
<enum name="NSTextAlignmentRight" swt_gen="true"></enum>
4536-
<enum name="NSDatePickerStyleClockAndCalendar" swt_gen="true"></enum>
4537-
<enum name="NSDatePickerStyleTextField" swt_gen="true"></enum>
4538-
<enum name="NSDatePickerStyleTextFieldAndStepper" swt_gen="true"></enum>
45394533
<enum name="NSToolbarDisplayModeIconOnly" swt_gen="true"></enum>
45404534
<enum name="NSTouchPhaseAny" swt_gen="true"></enum>
45414535
<enum name="NSTouchPhaseBegan" swt_gen="true"></enum>

bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,6 @@ public static Selector getSelector (long value) {
21642164
public static final int NSBezelStylePushDisclosure = 14;
21652165
public static final int NSBezelStyleSmallSquare = 6;
21662166
public static final int NSBoldFontMask = 2;
2167-
21682167
public static final int NSBottomTabsBezelBorder = 2;
21692168
public static final int NSBoxCustom = 4;
21702169
public static final int NSBoxSeparator = 2;
@@ -2174,9 +2173,8 @@ public static Selector getSelector (long value) {
21742173
public static final int NSButtonTypeRadio = 4;
21752174
public static final int NSButtonTypeSwitch = 3;
21762175
public static final int NSCarriageReturnCharacter = 13;
2177-
public static final int NSDatePickerStyleClockAndCalendar = 1;
2178-
21792176
public static final int NSClosePathBezierPathElement = 3;
2177+
public static final int NSColorSpaceModelRGB = 1;
21802178
public static final int NSCommandKeyMask = 1048576;
21812179
public static final int NSCompositingOperationClear = 0;
21822180
public static final int NSCompositingOperationCopy = 1;
@@ -2186,9 +2184,11 @@ public static Selector getSelector (long value) {
21862184
public static final int NSControlKeyMask = 262144;
21872185
public static final int NSCriticalAlertStyle = 2;
21882186
public static final int NSCurveToBezierPathElement = 2;
2187+
public static final int NSDatePickerStyleClockAndCalendar = 1;
2188+
public static final int NSDatePickerStyleTextField = 2;
2189+
public static final int NSDatePickerStyleTextFieldAndStepper = 0;
21892190
public static final int NSDeleteCharacter = 127;
21902191
public static final long NSDeviceIndependentModifierFlagsMask = 4294901760L;
2191-
21922192
public static final int NSDragOperationCopy = 1;
21932193
public static final int NSDragOperationDelete = 32;
21942194
public static final long NSDragOperationEvery = -1L;
@@ -2212,7 +2212,6 @@ public static Selector getSelector (long value) {
22122212
public static final int NSFocusRingTypeNone = 1;
22132213
public static final int NSFontPanelModeMaskAllEffects = 1048320;
22142214
public static final int NSFontPanelModeMaskAllModes = -1;
2215-
22162215
public static final int NSHelpFunctionKey = 63302;
22172216
public static final int NSHelpKeyMask = 4194304;
22182217
public static final int NSHourMinuteDatePickerElementFlag = 12;
@@ -2229,6 +2228,7 @@ public static Selector getSelector (long value) {
22292228
public static final int NSImageLeft = 2;
22302229
public static final int NSImageOnly = 1;
22312230
public static final int NSImageOverlaps = 6;
2231+
public static final int NSImageScaleNone = 2;
22322232
public static final int NSInformationalAlertStyle = 1;
22332233
public static final int NSItalicFontMask = 1;
22342234
public static final int NSKeyDown = 10;
@@ -2281,15 +2281,13 @@ public static Selector getSelector (long value) {
22812281
public static final int NSPrintPanelShowsPageSetupAccessory = 256;
22822282
public static final int NSPrintPanelShowsPrintSelection = 32;
22832283
public static final int NSProgressIndicatorPreferredThickness = 14;
2284-
public static final int NSColorSpaceModelRGB = 1;
22852284
public static final int NSRegularSquareBezelStyle = 2;
22862285
public static final int NSResizableWindowMask = 8;
22872286
public static final int NSRightMouseDown = 3;
22882287
public static final int NSRightMouseDragged = 7;
22892288
public static final int NSRightMouseUp = 4;
22902289
public static final int NSRoundLineCapStyle = 1;
22912290
public static final int NSRoundLineJoinStyle = 1;
2292-
public static final int NSImageScaleNone = 2;
22932291
public static final int NSScrollElasticityNone = 1;
22942292
public static final int NSScrollWheel = 22;
22952293
public static final int NSScrollerDecrementLine = 4;
@@ -2320,9 +2318,6 @@ public static Selector getSelector (long value) {
23202318
public static final int NSTextAlignmentJustified = 3;
23212319
public static final int NSTextAlignmentLeft = 0;
23222320
public static final int NSTextAlignmentRight = IS_X86_64 ? 1 : 2;
2323-
public static final int NSDatePickerStyleTextFieldAndStepper = 0;
2324-
public static final int NSDatePickerStyleTextField = 2;
2325-
23262321
public static final int NSToolbarDisplayModeIconOnly = 2;
23272322
public static final long NSTouchPhaseAny = -1L;
23282323
public static final int NSTouchPhaseBegan = 1;
@@ -2334,7 +2329,6 @@ public static Selector getSelector (long value) {
23342329
public static final int NSUnderlineStyleNone = 0;
23352330
public static final int NSUnderlineStyleSingle = 1;
23362331
public static final int NSUnderlineStyleThick = 2;
2337-
23382332
public static final int NSViewHeightSizable = 16;
23392333
public static final int NSViewMaxXMargin = 4;
23402334
public static final int NSViewMaxYMargin = 32;

0 commit comments

Comments
 (0)