diff --git a/mkdocs-website/docs/changelog.md b/mkdocs-website/docs/changelog.md index 3cd72065..4f6cb8bc 100644 --- a/mkdocs-website/docs/changelog.md +++ b/mkdocs-website/docs/changelog.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- [darwin] add Event ApplicationShouldHandleReopen to able handle dock icon click by @5aaee9 in [#2991](https://github.com/wailsapp/wails/pull/2991) - [darwin] add getPrimaryScreen/getScreens to impl by @tmclane in [#2618](https://github.com/wailsapp/wails/pull/2618) ### Fixed diff --git a/v3/examples/hide-window/main.go b/v3/examples/hide-window/main.go new file mode 100644 index 00000000..0f6f259b --- /dev/null +++ b/v3/examples/hide-window/main.go @@ -0,0 +1,72 @@ +package main + +import ( + _ "embed" + "log" + "runtime" + + "github.com/wailsapp/wails/v3/pkg/application" + "github.com/wailsapp/wails/v3/pkg/icons" + "github.com/wailsapp/wails/v3/pkg/events" +) + +func main() { + app := application.New(application.Options{ + Name: "Hide Window Demo", + Description: "A test of Hidden window and display it", + Assets: application.AlphaAssets, + Mac: application.MacOptions{ + // ActivationPolicy: application.ActivationPolicyAccessory, + ApplicationShouldTerminateAfterLastWindowClosed: false, + }, + }) + + systemTray := app.NewSystemTray() + + window := app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{ + Width: 500, + Height: 800, + Frameless: false, + AlwaysOnTop: false, + Hidden: false, + DisableResize: false, + ShouldClose: func(window *application.WebviewWindow) bool { + println("close") + window.Hide() + return false + }, + Windows: application.WindowsWindow{ + HiddenOnTaskbar: true, + }, + }) + + if runtime.GOOS == "darwin" { + systemTray.SetTemplateIcon(icons.SystrayMacTemplate) + } + + + // Click Dock icon tigger application show + app.On(events.Mac.ApplicationShouldHandleReopen, func(event *application.Event) { + println("reopen") + window.Show() + }) + + myMenu := app.NewMenu() + myMenu.Add("Show").OnClick(func(ctx *application.Context) { + window.Show() + }) + + myMenu.Add("Quit").OnClick(func(ctx *application.Context) { + app.Quit() + }) + + systemTray.SetMenu(myMenu) + systemTray.OnClick(func() { + app.CurrentWindow().Show() + }) + + err := app.Run() + if err != nil { + log.Fatal(err) + } +} diff --git a/v3/internal/runtime/desktop/api/event_types.js b/v3/internal/runtime/desktop/api/event_types.js index d6344aa6..6ba09269 100644 --- a/v3/internal/runtime/desktop/api/event_types.js +++ b/v3/internal/runtime/desktop/api/event_types.js @@ -49,6 +49,7 @@ export const EventTypes = { ApplicationWillUnhide: "mac:ApplicationWillUnhide", ApplicationWillUpdate: "mac:ApplicationWillUpdate", ApplicationDidChangeTheme: "mac:ApplicationDidChangeTheme!", + ApplicationShouldHandleReopen: "mac:ApplicationShouldHandleReopen!", WindowDidBecomeKey: "mac:WindowDidBecomeKey", WindowDidBecomeMain: "mac:WindowDidBecomeMain", WindowDidBeginSheet: "mac:WindowDidBeginSheet", diff --git a/v3/pkg/application/application_darwin.go b/v3/pkg/application/application_darwin.go index 4a5e28b0..32fee5f6 100644 --- a/v3/pkg/application/application_darwin.go +++ b/v3/pkg/application/application_darwin.go @@ -141,12 +141,29 @@ static void show(void) { [NSApp unhide:nil]; } +static const char* serializationNSDictionary(void *dict) { + @autoreleasepool { + NSDictionary *nsDict = (__bridge NSDictionary *)dict; + + if ([NSJSONSerialization isValidJSONObject:nsDict]) { + NSError *error; + NSData *data = [NSJSONSerialization dataWithJSONObject:nsDict options:kNilOptions error:&error]; + NSString *result = [[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]; + + return strdup([result UTF8String]); + } + } + + return nil; +} */ import "C" import ( - "github.com/wailsapp/wails/v3/internal/operatingsystem" + "encoding/json" "unsafe" + "github.com/wailsapp/wails/v3/internal/operatingsystem" + "github.com/wailsapp/wails/v3/internal/assetserver/webview" "github.com/wailsapp/wails/v3/pkg/events" ) @@ -237,8 +254,26 @@ func newPlatformApp(app *App) *macosApp { } //export processApplicationEvent -func processApplicationEvent(eventID C.uint, _ unsafe.Pointer) { +func processApplicationEvent(eventID C.uint, data unsafe.Pointer) { event := newApplicationEvent(int(eventID)) + + if data != nil { + dataCStrJSON := C.serializationNSDictionary(data) + if dataCStrJSON != nil { + defer C.free(unsafe.Pointer(dataCStrJSON)) + + dataJSON := C.GoString(dataCStrJSON) + var result map[string]any + err := json.Unmarshal([]byte(dataJSON), &result) + + if err != nil { + panic(err) + } + + event.Context().setData(result) + } + } + switch event.Id { case uint(events.Mac.ApplicationDidChangeTheme): isDark := globalApplication.IsDarkMode() diff --git a/v3/pkg/application/application_darwin_delegate.m b/v3/pkg/application/application_darwin_delegate.m index c4a360bd..e12858e3 100644 --- a/v3/pkg/application/application_darwin_delegate.m +++ b/v3/pkg/application/application_darwin_delegate.m @@ -17,6 +17,14 @@ extern bool hasListeners(unsigned int); processApplicationEvent(EventApplicationDidChangeTheme, NULL); } } +- (BOOL)applicationShouldHandleReopen:(NSNotification *)notification + hasVisibleWindows:(BOOL)flag { + if( hasListeners(EventApplicationShouldHandleReopen) ) { + processApplicationEvent(EventApplicationShouldHandleReopen, @{@"hasVisibleWindows": @(flag)}); + } + + return TRUE; +} // GENERATED EVENTS START - (void)applicationDidBecomeActive:(NSNotification *)notification { if( hasListeners(EventApplicationDidBecomeActive) ) { diff --git a/v3/pkg/application/context_application_event.go b/v3/pkg/application/context_application_event.go index 27d539d0..2cd1ca2c 100644 --- a/v3/pkg/application/context_application_event.go +++ b/v3/pkg/application/context_application_event.go @@ -31,8 +31,8 @@ func (c ApplicationEventContext) setIsDarkMode(mode bool) { c.data["isDarkMode"] = mode } -func (c ApplicationEventContext) IsDarkMode() bool { - mode, ok := c.data["isDarkMode"] +func (c ApplicationEventContext) getBool(key string) bool { + mode, ok := c.data[key] if !ok { return false } @@ -43,6 +43,18 @@ func (c ApplicationEventContext) IsDarkMode() bool { return result } +func (c ApplicationEventContext) IsDarkMode() bool { + return c.getBool("isDarkMode") +} + +func (c ApplicationEventContext) HasVisibleWindows() bool { + return c.getBool("hasVisibleWindows") +} + +func (c ApplicationEventContext) setData(data map[string]any) { + c.data = data +} + func newApplicationEventContext() *ApplicationEventContext { return &ApplicationEventContext{ data: make(map[string]any), diff --git a/v3/pkg/events/events.go b/v3/pkg/events/events.go index 8cf2f44f..72162dfd 100644 --- a/v3/pkg/events/events.go +++ b/v3/pkg/events/events.go @@ -30,26 +30,26 @@ type commonEvents struct { func newCommonEvents() commonEvents { return commonEvents{ - ApplicationStarted: 1172, - WindowMaximise: 1173, - WindowUnMaximise: 1174, - WindowFullscreen: 1175, - WindowUnFullscreen: 1176, - WindowRestore: 1177, - WindowMinimise: 1178, - WindowUnMinimise: 1179, - WindowClosing: 1180, - WindowZoom: 1181, - WindowZoomIn: 1182, - WindowZoomOut: 1183, - WindowZoomReset: 1184, - WindowFocus: 1185, - WindowLostFocus: 1186, - WindowShow: 1187, - WindowHide: 1188, - WindowDPIChanged: 1189, - WindowFilesDropped: 1190, - ThemeChanged: 1191, + ApplicationStarted: 1173, + WindowMaximise: 1174, + WindowUnMaximise: 1175, + WindowFullscreen: 1176, + WindowUnFullscreen: 1177, + WindowRestore: 1178, + WindowMinimise: 1179, + WindowUnMinimise: 1180, + WindowClosing: 1181, + WindowZoom: 1182, + WindowZoomIn: 1183, + WindowZoomOut: 1184, + WindowZoomReset: 1185, + WindowFocus: 1186, + WindowLostFocus: 1187, + WindowShow: 1188, + WindowHide: 1189, + WindowDPIChanged: 1190, + WindowFilesDropped: 1191, + ThemeChanged: 1192, } } @@ -77,6 +77,7 @@ type macEvents struct { ApplicationWillUnhide ApplicationEventType ApplicationWillUpdate ApplicationEventType ApplicationDidChangeTheme ApplicationEventType + ApplicationShouldHandleReopen ApplicationEventType WindowDidBecomeKey WindowEventType WindowDidBecomeMain WindowEventType WindowDidBeginSheet WindowEventType @@ -204,108 +205,109 @@ func newMacEvents() macEvents { ApplicationWillUnhide: 1042, ApplicationWillUpdate: 1043, ApplicationDidChangeTheme: 1044, - WindowDidBecomeKey: 1045, - WindowDidBecomeMain: 1046, - WindowDidBeginSheet: 1047, - WindowDidChangeAlpha: 1048, - WindowDidChangeBackingLocation: 1049, - WindowDidChangeBackingProperties: 1050, - WindowDidChangeCollectionBehavior: 1051, - WindowDidChangeEffectiveAppearance: 1052, - WindowDidChangeOcclusionState: 1053, - WindowDidChangeOrderingMode: 1054, - WindowDidChangeScreen: 1055, - WindowDidChangeScreenParameters: 1056, - WindowDidChangeScreenProfile: 1057, - WindowDidChangeScreenSpace: 1058, - WindowDidChangeScreenSpaceProperties: 1059, - WindowDidChangeSharingType: 1060, - WindowDidChangeSpace: 1061, - WindowDidChangeSpaceOrderingMode: 1062, - WindowDidChangeTitle: 1063, - WindowDidChangeToolbar: 1064, - WindowDidChangeVisibility: 1065, - WindowDidDeminiaturize: 1066, - WindowDidEndSheet: 1067, - WindowDidEnterFullScreen: 1068, - WindowDidEnterVersionBrowser: 1069, - WindowDidExitFullScreen: 1070, - WindowDidExitVersionBrowser: 1071, - WindowDidExpose: 1072, - WindowDidFocus: 1073, - WindowDidMiniaturize: 1074, - WindowDidMove: 1075, - WindowDidOrderOffScreen: 1076, - WindowDidOrderOnScreen: 1077, - WindowDidResignKey: 1078, - WindowDidResignMain: 1079, - WindowDidResize: 1080, - WindowDidUpdate: 1081, - WindowDidUpdateAlpha: 1082, - WindowDidUpdateCollectionBehavior: 1083, - WindowDidUpdateCollectionProperties: 1084, - WindowDidUpdateShadow: 1085, - WindowDidUpdateTitle: 1086, - WindowDidUpdateToolbar: 1087, - WindowDidUpdateVisibility: 1088, - WindowShouldClose: 1089, - WindowWillBecomeKey: 1090, - WindowWillBecomeMain: 1091, - WindowWillBeginSheet: 1092, - WindowWillChangeOrderingMode: 1093, - WindowWillClose: 1094, - WindowWillDeminiaturize: 1095, - WindowWillEnterFullScreen: 1096, - WindowWillEnterVersionBrowser: 1097, - WindowWillExitFullScreen: 1098, - WindowWillExitVersionBrowser: 1099, - WindowWillFocus: 1100, - WindowWillMiniaturize: 1101, - WindowWillMove: 1102, - WindowWillOrderOffScreen: 1103, - WindowWillOrderOnScreen: 1104, - WindowWillResignMain: 1105, - WindowWillResize: 1106, - WindowWillUnfocus: 1107, - WindowWillUpdate: 1108, - WindowWillUpdateAlpha: 1109, - WindowWillUpdateCollectionBehavior: 1110, - WindowWillUpdateCollectionProperties: 1111, - WindowWillUpdateShadow: 1112, - WindowWillUpdateTitle: 1113, - WindowWillUpdateToolbar: 1114, - WindowWillUpdateVisibility: 1115, - WindowWillUseStandardFrame: 1116, - MenuWillOpen: 1117, - MenuDidOpen: 1118, - MenuDidClose: 1119, - MenuWillSendAction: 1120, - MenuDidSendAction: 1121, - MenuWillHighlightItem: 1122, - MenuDidHighlightItem: 1123, - MenuWillDisplayItem: 1124, - MenuDidDisplayItem: 1125, - MenuWillAddItem: 1126, - MenuDidAddItem: 1127, - MenuWillRemoveItem: 1128, - MenuDidRemoveItem: 1129, - MenuWillBeginTracking: 1130, - MenuDidBeginTracking: 1131, - MenuWillEndTracking: 1132, - MenuDidEndTracking: 1133, - MenuWillUpdate: 1134, - MenuDidUpdate: 1135, - MenuWillPopUp: 1136, - MenuDidPopUp: 1137, - MenuWillSendActionToItem: 1138, - MenuDidSendActionToItem: 1139, - WebViewDidStartProvisionalNavigation: 1140, - WebViewDidReceiveServerRedirectForProvisionalNavigation: 1141, - WebViewDidFinishNavigation: 1142, - WebViewDidCommitNavigation: 1143, - WindowFileDraggingEntered: 1144, - WindowFileDraggingPerformed: 1145, - WindowFileDraggingExited: 1146, + ApplicationShouldHandleReopen: 1045, + WindowDidBecomeKey: 1046, + WindowDidBecomeMain: 1047, + WindowDidBeginSheet: 1048, + WindowDidChangeAlpha: 1049, + WindowDidChangeBackingLocation: 1050, + WindowDidChangeBackingProperties: 1051, + WindowDidChangeCollectionBehavior: 1052, + WindowDidChangeEffectiveAppearance: 1053, + WindowDidChangeOcclusionState: 1054, + WindowDidChangeOrderingMode: 1055, + WindowDidChangeScreen: 1056, + WindowDidChangeScreenParameters: 1057, + WindowDidChangeScreenProfile: 1058, + WindowDidChangeScreenSpace: 1059, + WindowDidChangeScreenSpaceProperties: 1060, + WindowDidChangeSharingType: 1061, + WindowDidChangeSpace: 1062, + WindowDidChangeSpaceOrderingMode: 1063, + WindowDidChangeTitle: 1064, + WindowDidChangeToolbar: 1065, + WindowDidChangeVisibility: 1066, + WindowDidDeminiaturize: 1067, + WindowDidEndSheet: 1068, + WindowDidEnterFullScreen: 1069, + WindowDidEnterVersionBrowser: 1070, + WindowDidExitFullScreen: 1071, + WindowDidExitVersionBrowser: 1072, + WindowDidExpose: 1073, + WindowDidFocus: 1074, + WindowDidMiniaturize: 1075, + WindowDidMove: 1076, + WindowDidOrderOffScreen: 1077, + WindowDidOrderOnScreen: 1078, + WindowDidResignKey: 1079, + WindowDidResignMain: 1080, + WindowDidResize: 1081, + WindowDidUpdate: 1082, + WindowDidUpdateAlpha: 1083, + WindowDidUpdateCollectionBehavior: 1084, + WindowDidUpdateCollectionProperties: 1085, + WindowDidUpdateShadow: 1086, + WindowDidUpdateTitle: 1087, + WindowDidUpdateToolbar: 1088, + WindowDidUpdateVisibility: 1089, + WindowShouldClose: 1090, + WindowWillBecomeKey: 1091, + WindowWillBecomeMain: 1092, + WindowWillBeginSheet: 1093, + WindowWillChangeOrderingMode: 1094, + WindowWillClose: 1095, + WindowWillDeminiaturize: 1096, + WindowWillEnterFullScreen: 1097, + WindowWillEnterVersionBrowser: 1098, + WindowWillExitFullScreen: 1099, + WindowWillExitVersionBrowser: 1100, + WindowWillFocus: 1101, + WindowWillMiniaturize: 1102, + WindowWillMove: 1103, + WindowWillOrderOffScreen: 1104, + WindowWillOrderOnScreen: 1105, + WindowWillResignMain: 1106, + WindowWillResize: 1107, + WindowWillUnfocus: 1108, + WindowWillUpdate: 1109, + WindowWillUpdateAlpha: 1110, + WindowWillUpdateCollectionBehavior: 1111, + WindowWillUpdateCollectionProperties: 1112, + WindowWillUpdateShadow: 1113, + WindowWillUpdateTitle: 1114, + WindowWillUpdateToolbar: 1115, + WindowWillUpdateVisibility: 1116, + WindowWillUseStandardFrame: 1117, + MenuWillOpen: 1118, + MenuDidOpen: 1119, + MenuDidClose: 1120, + MenuWillSendAction: 1121, + MenuDidSendAction: 1122, + MenuWillHighlightItem: 1123, + MenuDidHighlightItem: 1124, + MenuWillDisplayItem: 1125, + MenuDidDisplayItem: 1126, + MenuWillAddItem: 1127, + MenuDidAddItem: 1128, + MenuWillRemoveItem: 1129, + MenuDidRemoveItem: 1130, + MenuWillBeginTracking: 1131, + MenuDidBeginTracking: 1132, + MenuWillEndTracking: 1133, + MenuDidEndTracking: 1134, + MenuWillUpdate: 1135, + MenuDidUpdate: 1136, + MenuWillPopUp: 1137, + MenuDidPopUp: 1138, + MenuWillSendActionToItem: 1139, + MenuDidSendActionToItem: 1140, + WebViewDidStartProvisionalNavigation: 1141, + WebViewDidReceiveServerRedirectForProvisionalNavigation: 1142, + WebViewDidFinishNavigation: 1143, + WebViewDidCommitNavigation: 1144, + WindowFileDraggingEntered: 1145, + WindowFileDraggingPerformed: 1146, + WindowFileDraggingExited: 1147, } } @@ -341,31 +343,31 @@ type windowsEvents struct { func newWindowsEvents() windowsEvents { return windowsEvents{ - SystemThemeChanged: 1147, - APMPowerStatusChange: 1148, - APMSuspend: 1149, - APMResumeAutomatic: 1150, - APMResumeSuspend: 1151, - APMPowerSettingChange: 1152, - ApplicationStarted: 1153, - WebViewNavigationCompleted: 1154, - WindowInactive: 1155, - WindowActive: 1156, - WindowClickActive: 1157, - WindowMaximise: 1158, - WindowUnMaximise: 1159, - WindowFullscreen: 1160, - WindowUnFullscreen: 1161, - WindowRestore: 1162, - WindowMinimise: 1163, - WindowUnMinimise: 1164, - WindowClose: 1165, - WindowSetFocus: 1166, - WindowKillFocus: 1167, - WindowDragDrop: 1168, - WindowDragEnter: 1169, - WindowDragLeave: 1170, - WindowDragOver: 1171, + SystemThemeChanged: 1148, + APMPowerStatusChange: 1149, + APMSuspend: 1150, + APMResumeAutomatic: 1151, + APMResumeSuspend: 1152, + APMPowerSettingChange: 1153, + ApplicationStarted: 1154, + WebViewNavigationCompleted: 1155, + WindowInactive: 1156, + WindowActive: 1157, + WindowClickActive: 1158, + WindowMaximise: 1159, + WindowUnMaximise: 1160, + WindowFullscreen: 1161, + WindowUnFullscreen: 1162, + WindowRestore: 1163, + WindowMinimise: 1164, + WindowUnMinimise: 1165, + WindowClose: 1166, + WindowSetFocus: 1167, + WindowKillFocus: 1168, + WindowDragDrop: 1169, + WindowDragEnter: 1170, + WindowDragLeave: 1171, + WindowDragOver: 1172, } } @@ -395,151 +397,152 @@ var eventToJS = map[uint]string{ 1042: "mac:ApplicationWillUnhide", 1043: "mac:ApplicationWillUpdate", 1044: "mac:ApplicationDidChangeTheme!", - 1045: "mac:WindowDidBecomeKey", - 1046: "mac:WindowDidBecomeMain", - 1047: "mac:WindowDidBeginSheet", - 1048: "mac:WindowDidChangeAlpha", - 1049: "mac:WindowDidChangeBackingLocation", - 1050: "mac:WindowDidChangeBackingProperties", - 1051: "mac:WindowDidChangeCollectionBehavior", - 1052: "mac:WindowDidChangeEffectiveAppearance", - 1053: "mac:WindowDidChangeOcclusionState", - 1054: "mac:WindowDidChangeOrderingMode", - 1055: "mac:WindowDidChangeScreen", - 1056: "mac:WindowDidChangeScreenParameters", - 1057: "mac:WindowDidChangeScreenProfile", - 1058: "mac:WindowDidChangeScreenSpace", - 1059: "mac:WindowDidChangeScreenSpaceProperties", - 1060: "mac:WindowDidChangeSharingType", - 1061: "mac:WindowDidChangeSpace", - 1062: "mac:WindowDidChangeSpaceOrderingMode", - 1063: "mac:WindowDidChangeTitle", - 1064: "mac:WindowDidChangeToolbar", - 1065: "mac:WindowDidChangeVisibility", - 1066: "mac:WindowDidDeminiaturize", - 1067: "mac:WindowDidEndSheet", - 1068: "mac:WindowDidEnterFullScreen", - 1069: "mac:WindowDidEnterVersionBrowser", - 1070: "mac:WindowDidExitFullScreen", - 1071: "mac:WindowDidExitVersionBrowser", - 1072: "mac:WindowDidExpose", - 1073: "mac:WindowDidFocus", - 1074: "mac:WindowDidMiniaturize", - 1075: "mac:WindowDidMove", - 1076: "mac:WindowDidOrderOffScreen", - 1077: "mac:WindowDidOrderOnScreen", - 1078: "mac:WindowDidResignKey", - 1079: "mac:WindowDidResignMain", - 1080: "mac:WindowDidResize", - 1081: "mac:WindowDidUpdate", - 1082: "mac:WindowDidUpdateAlpha", - 1083: "mac:WindowDidUpdateCollectionBehavior", - 1084: "mac:WindowDidUpdateCollectionProperties", - 1085: "mac:WindowDidUpdateShadow", - 1086: "mac:WindowDidUpdateTitle", - 1087: "mac:WindowDidUpdateToolbar", - 1088: "mac:WindowDidUpdateVisibility", - 1089: "mac:WindowShouldClose!", - 1090: "mac:WindowWillBecomeKey", - 1091: "mac:WindowWillBecomeMain", - 1092: "mac:WindowWillBeginSheet", - 1093: "mac:WindowWillChangeOrderingMode", - 1094: "mac:WindowWillClose", - 1095: "mac:WindowWillDeminiaturize", - 1096: "mac:WindowWillEnterFullScreen", - 1097: "mac:WindowWillEnterVersionBrowser", - 1098: "mac:WindowWillExitFullScreen", - 1099: "mac:WindowWillExitVersionBrowser", - 1100: "mac:WindowWillFocus", - 1101: "mac:WindowWillMiniaturize", - 1102: "mac:WindowWillMove", - 1103: "mac:WindowWillOrderOffScreen", - 1104: "mac:WindowWillOrderOnScreen", - 1105: "mac:WindowWillResignMain", - 1106: "mac:WindowWillResize", - 1107: "mac:WindowWillUnfocus", - 1108: "mac:WindowWillUpdate", - 1109: "mac:WindowWillUpdateAlpha", - 1110: "mac:WindowWillUpdateCollectionBehavior", - 1111: "mac:WindowWillUpdateCollectionProperties", - 1112: "mac:WindowWillUpdateShadow", - 1113: "mac:WindowWillUpdateTitle", - 1114: "mac:WindowWillUpdateToolbar", - 1115: "mac:WindowWillUpdateVisibility", - 1116: "mac:WindowWillUseStandardFrame", - 1117: "mac:MenuWillOpen", - 1118: "mac:MenuDidOpen", - 1119: "mac:MenuDidClose", - 1120: "mac:MenuWillSendAction", - 1121: "mac:MenuDidSendAction", - 1122: "mac:MenuWillHighlightItem", - 1123: "mac:MenuDidHighlightItem", - 1124: "mac:MenuWillDisplayItem", - 1125: "mac:MenuDidDisplayItem", - 1126: "mac:MenuWillAddItem", - 1127: "mac:MenuDidAddItem", - 1128: "mac:MenuWillRemoveItem", - 1129: "mac:MenuDidRemoveItem", - 1130: "mac:MenuWillBeginTracking", - 1131: "mac:MenuDidBeginTracking", - 1132: "mac:MenuWillEndTracking", - 1133: "mac:MenuDidEndTracking", - 1134: "mac:MenuWillUpdate", - 1135: "mac:MenuDidUpdate", - 1136: "mac:MenuWillPopUp", - 1137: "mac:MenuDidPopUp", - 1138: "mac:MenuWillSendActionToItem", - 1139: "mac:MenuDidSendActionToItem", - 1140: "mac:WebViewDidStartProvisionalNavigation", - 1141: "mac:WebViewDidReceiveServerRedirectForProvisionalNavigation", - 1142: "mac:WebViewDidFinishNavigation", - 1143: "mac:WebViewDidCommitNavigation", - 1144: "mac:WindowFileDraggingEntered", - 1145: "mac:WindowFileDraggingPerformed", - 1146: "mac:WindowFileDraggingExited", - 1147: "windows:SystemThemeChanged", - 1148: "windows:APMPowerStatusChange", - 1149: "windows:APMSuspend", - 1150: "windows:APMResumeAutomatic", - 1151: "windows:APMResumeSuspend", - 1152: "windows:APMPowerSettingChange", - 1153: "windows:ApplicationStarted", - 1154: "windows:WebViewNavigationCompleted", - 1155: "windows:WindowInactive", - 1156: "windows:WindowActive", - 1157: "windows:WindowClickActive", - 1158: "windows:WindowMaximise", - 1159: "windows:WindowUnMaximise", - 1160: "windows:WindowFullscreen", - 1161: "windows:WindowUnFullscreen", - 1162: "windows:WindowRestore", - 1163: "windows:WindowMinimise", - 1164: "windows:WindowUnMinimise", - 1165: "windows:WindowClose", - 1166: "windows:WindowSetFocus", - 1167: "windows:WindowKillFocus", - 1168: "windows:WindowDragDrop", - 1169: "windows:WindowDragEnter", - 1170: "windows:WindowDragLeave", - 1171: "windows:WindowDragOver", - 1172: "common:ApplicationStarted", - 1173: "common:WindowMaximise", - 1174: "common:WindowUnMaximise", - 1175: "common:WindowFullscreen", - 1176: "common:WindowUnFullscreen", - 1177: "common:WindowRestore", - 1178: "common:WindowMinimise", - 1179: "common:WindowUnMinimise", - 1180: "common:WindowClosing", - 1181: "common:WindowZoom", - 1182: "common:WindowZoomIn", - 1183: "common:WindowZoomOut", - 1184: "common:WindowZoomReset", - 1185: "common:WindowFocus", - 1186: "common:WindowLostFocus", - 1187: "common:WindowShow", - 1188: "common:WindowHide", - 1189: "common:WindowDPIChanged", - 1190: "common:WindowFilesDropped", - 1191: "common:ThemeChanged", + 1045: "mac:ApplicationShouldHandleReopen!", + 1046: "mac:WindowDidBecomeKey", + 1047: "mac:WindowDidBecomeMain", + 1048: "mac:WindowDidBeginSheet", + 1049: "mac:WindowDidChangeAlpha", + 1050: "mac:WindowDidChangeBackingLocation", + 1051: "mac:WindowDidChangeBackingProperties", + 1052: "mac:WindowDidChangeCollectionBehavior", + 1053: "mac:WindowDidChangeEffectiveAppearance", + 1054: "mac:WindowDidChangeOcclusionState", + 1055: "mac:WindowDidChangeOrderingMode", + 1056: "mac:WindowDidChangeScreen", + 1057: "mac:WindowDidChangeScreenParameters", + 1058: "mac:WindowDidChangeScreenProfile", + 1059: "mac:WindowDidChangeScreenSpace", + 1060: "mac:WindowDidChangeScreenSpaceProperties", + 1061: "mac:WindowDidChangeSharingType", + 1062: "mac:WindowDidChangeSpace", + 1063: "mac:WindowDidChangeSpaceOrderingMode", + 1064: "mac:WindowDidChangeTitle", + 1065: "mac:WindowDidChangeToolbar", + 1066: "mac:WindowDidChangeVisibility", + 1067: "mac:WindowDidDeminiaturize", + 1068: "mac:WindowDidEndSheet", + 1069: "mac:WindowDidEnterFullScreen", + 1070: "mac:WindowDidEnterVersionBrowser", + 1071: "mac:WindowDidExitFullScreen", + 1072: "mac:WindowDidExitVersionBrowser", + 1073: "mac:WindowDidExpose", + 1074: "mac:WindowDidFocus", + 1075: "mac:WindowDidMiniaturize", + 1076: "mac:WindowDidMove", + 1077: "mac:WindowDidOrderOffScreen", + 1078: "mac:WindowDidOrderOnScreen", + 1079: "mac:WindowDidResignKey", + 1080: "mac:WindowDidResignMain", + 1081: "mac:WindowDidResize", + 1082: "mac:WindowDidUpdate", + 1083: "mac:WindowDidUpdateAlpha", + 1084: "mac:WindowDidUpdateCollectionBehavior", + 1085: "mac:WindowDidUpdateCollectionProperties", + 1086: "mac:WindowDidUpdateShadow", + 1087: "mac:WindowDidUpdateTitle", + 1088: "mac:WindowDidUpdateToolbar", + 1089: "mac:WindowDidUpdateVisibility", + 1090: "mac:WindowShouldClose!", + 1091: "mac:WindowWillBecomeKey", + 1092: "mac:WindowWillBecomeMain", + 1093: "mac:WindowWillBeginSheet", + 1094: "mac:WindowWillChangeOrderingMode", + 1095: "mac:WindowWillClose", + 1096: "mac:WindowWillDeminiaturize", + 1097: "mac:WindowWillEnterFullScreen", + 1098: "mac:WindowWillEnterVersionBrowser", + 1099: "mac:WindowWillExitFullScreen", + 1100: "mac:WindowWillExitVersionBrowser", + 1101: "mac:WindowWillFocus", + 1102: "mac:WindowWillMiniaturize", + 1103: "mac:WindowWillMove", + 1104: "mac:WindowWillOrderOffScreen", + 1105: "mac:WindowWillOrderOnScreen", + 1106: "mac:WindowWillResignMain", + 1107: "mac:WindowWillResize", + 1108: "mac:WindowWillUnfocus", + 1109: "mac:WindowWillUpdate", + 1110: "mac:WindowWillUpdateAlpha", + 1111: "mac:WindowWillUpdateCollectionBehavior", + 1112: "mac:WindowWillUpdateCollectionProperties", + 1113: "mac:WindowWillUpdateShadow", + 1114: "mac:WindowWillUpdateTitle", + 1115: "mac:WindowWillUpdateToolbar", + 1116: "mac:WindowWillUpdateVisibility", + 1117: "mac:WindowWillUseStandardFrame", + 1118: "mac:MenuWillOpen", + 1119: "mac:MenuDidOpen", + 1120: "mac:MenuDidClose", + 1121: "mac:MenuWillSendAction", + 1122: "mac:MenuDidSendAction", + 1123: "mac:MenuWillHighlightItem", + 1124: "mac:MenuDidHighlightItem", + 1125: "mac:MenuWillDisplayItem", + 1126: "mac:MenuDidDisplayItem", + 1127: "mac:MenuWillAddItem", + 1128: "mac:MenuDidAddItem", + 1129: "mac:MenuWillRemoveItem", + 1130: "mac:MenuDidRemoveItem", + 1131: "mac:MenuWillBeginTracking", + 1132: "mac:MenuDidBeginTracking", + 1133: "mac:MenuWillEndTracking", + 1134: "mac:MenuDidEndTracking", + 1135: "mac:MenuWillUpdate", + 1136: "mac:MenuDidUpdate", + 1137: "mac:MenuWillPopUp", + 1138: "mac:MenuDidPopUp", + 1139: "mac:MenuWillSendActionToItem", + 1140: "mac:MenuDidSendActionToItem", + 1141: "mac:WebViewDidStartProvisionalNavigation", + 1142: "mac:WebViewDidReceiveServerRedirectForProvisionalNavigation", + 1143: "mac:WebViewDidFinishNavigation", + 1144: "mac:WebViewDidCommitNavigation", + 1145: "mac:WindowFileDraggingEntered", + 1146: "mac:WindowFileDraggingPerformed", + 1147: "mac:WindowFileDraggingExited", + 1148: "windows:SystemThemeChanged", + 1149: "windows:APMPowerStatusChange", + 1150: "windows:APMSuspend", + 1151: "windows:APMResumeAutomatic", + 1152: "windows:APMResumeSuspend", + 1153: "windows:APMPowerSettingChange", + 1154: "windows:ApplicationStarted", + 1155: "windows:WebViewNavigationCompleted", + 1156: "windows:WindowInactive", + 1157: "windows:WindowActive", + 1158: "windows:WindowClickActive", + 1159: "windows:WindowMaximise", + 1160: "windows:WindowUnMaximise", + 1161: "windows:WindowFullscreen", + 1162: "windows:WindowUnFullscreen", + 1163: "windows:WindowRestore", + 1164: "windows:WindowMinimise", + 1165: "windows:WindowUnMinimise", + 1166: "windows:WindowClose", + 1167: "windows:WindowSetFocus", + 1168: "windows:WindowKillFocus", + 1169: "windows:WindowDragDrop", + 1170: "windows:WindowDragEnter", + 1171: "windows:WindowDragLeave", + 1172: "windows:WindowDragOver", + 1173: "common:ApplicationStarted", + 1174: "common:WindowMaximise", + 1175: "common:WindowUnMaximise", + 1176: "common:WindowFullscreen", + 1177: "common:WindowUnFullscreen", + 1178: "common:WindowRestore", + 1179: "common:WindowMinimise", + 1180: "common:WindowUnMinimise", + 1181: "common:WindowClosing", + 1182: "common:WindowZoom", + 1183: "common:WindowZoomIn", + 1184: "common:WindowZoomOut", + 1185: "common:WindowZoomReset", + 1186: "common:WindowFocus", + 1187: "common:WindowLostFocus", + 1188: "common:WindowShow", + 1189: "common:WindowHide", + 1190: "common:WindowDPIChanged", + 1191: "common:WindowFilesDropped", + 1192: "common:ThemeChanged", } diff --git a/v3/pkg/events/events.h b/v3/pkg/events/events.h index 60f25f5a..3eb09f93 100644 --- a/v3/pkg/events/events.h +++ b/v3/pkg/events/events.h @@ -27,110 +27,111 @@ extern void processWindowEvent(unsigned int, unsigned int); #define EventApplicationWillUnhide 1042 #define EventApplicationWillUpdate 1043 #define EventApplicationDidChangeTheme 1044 -#define EventWindowDidBecomeKey 1045 -#define EventWindowDidBecomeMain 1046 -#define EventWindowDidBeginSheet 1047 -#define EventWindowDidChangeAlpha 1048 -#define EventWindowDidChangeBackingLocation 1049 -#define EventWindowDidChangeBackingProperties 1050 -#define EventWindowDidChangeCollectionBehavior 1051 -#define EventWindowDidChangeEffectiveAppearance 1052 -#define EventWindowDidChangeOcclusionState 1053 -#define EventWindowDidChangeOrderingMode 1054 -#define EventWindowDidChangeScreen 1055 -#define EventWindowDidChangeScreenParameters 1056 -#define EventWindowDidChangeScreenProfile 1057 -#define EventWindowDidChangeScreenSpace 1058 -#define EventWindowDidChangeScreenSpaceProperties 1059 -#define EventWindowDidChangeSharingType 1060 -#define EventWindowDidChangeSpace 1061 -#define EventWindowDidChangeSpaceOrderingMode 1062 -#define EventWindowDidChangeTitle 1063 -#define EventWindowDidChangeToolbar 1064 -#define EventWindowDidChangeVisibility 1065 -#define EventWindowDidDeminiaturize 1066 -#define EventWindowDidEndSheet 1067 -#define EventWindowDidEnterFullScreen 1068 -#define EventWindowDidEnterVersionBrowser 1069 -#define EventWindowDidExitFullScreen 1070 -#define EventWindowDidExitVersionBrowser 1071 -#define EventWindowDidExpose 1072 -#define EventWindowDidFocus 1073 -#define EventWindowDidMiniaturize 1074 -#define EventWindowDidMove 1075 -#define EventWindowDidOrderOffScreen 1076 -#define EventWindowDidOrderOnScreen 1077 -#define EventWindowDidResignKey 1078 -#define EventWindowDidResignMain 1079 -#define EventWindowDidResize 1080 -#define EventWindowDidUpdate 1081 -#define EventWindowDidUpdateAlpha 1082 -#define EventWindowDidUpdateCollectionBehavior 1083 -#define EventWindowDidUpdateCollectionProperties 1084 -#define EventWindowDidUpdateShadow 1085 -#define EventWindowDidUpdateTitle 1086 -#define EventWindowDidUpdateToolbar 1087 -#define EventWindowDidUpdateVisibility 1088 -#define EventWindowShouldClose 1089 -#define EventWindowWillBecomeKey 1090 -#define EventWindowWillBecomeMain 1091 -#define EventWindowWillBeginSheet 1092 -#define EventWindowWillChangeOrderingMode 1093 -#define EventWindowWillClose 1094 -#define EventWindowWillDeminiaturize 1095 -#define EventWindowWillEnterFullScreen 1096 -#define EventWindowWillEnterVersionBrowser 1097 -#define EventWindowWillExitFullScreen 1098 -#define EventWindowWillExitVersionBrowser 1099 -#define EventWindowWillFocus 1100 -#define EventWindowWillMiniaturize 1101 -#define EventWindowWillMove 1102 -#define EventWindowWillOrderOffScreen 1103 -#define EventWindowWillOrderOnScreen 1104 -#define EventWindowWillResignMain 1105 -#define EventWindowWillResize 1106 -#define EventWindowWillUnfocus 1107 -#define EventWindowWillUpdate 1108 -#define EventWindowWillUpdateAlpha 1109 -#define EventWindowWillUpdateCollectionBehavior 1110 -#define EventWindowWillUpdateCollectionProperties 1111 -#define EventWindowWillUpdateShadow 1112 -#define EventWindowWillUpdateTitle 1113 -#define EventWindowWillUpdateToolbar 1114 -#define EventWindowWillUpdateVisibility 1115 -#define EventWindowWillUseStandardFrame 1116 -#define EventMenuWillOpen 1117 -#define EventMenuDidOpen 1118 -#define EventMenuDidClose 1119 -#define EventMenuWillSendAction 1120 -#define EventMenuDidSendAction 1121 -#define EventMenuWillHighlightItem 1122 -#define EventMenuDidHighlightItem 1123 -#define EventMenuWillDisplayItem 1124 -#define EventMenuDidDisplayItem 1125 -#define EventMenuWillAddItem 1126 -#define EventMenuDidAddItem 1127 -#define EventMenuWillRemoveItem 1128 -#define EventMenuDidRemoveItem 1129 -#define EventMenuWillBeginTracking 1130 -#define EventMenuDidBeginTracking 1131 -#define EventMenuWillEndTracking 1132 -#define EventMenuDidEndTracking 1133 -#define EventMenuWillUpdate 1134 -#define EventMenuDidUpdate 1135 -#define EventMenuWillPopUp 1136 -#define EventMenuDidPopUp 1137 -#define EventMenuWillSendActionToItem 1138 -#define EventMenuDidSendActionToItem 1139 -#define EventWebViewDidStartProvisionalNavigation 1140 -#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1141 -#define EventWebViewDidFinishNavigation 1142 -#define EventWebViewDidCommitNavigation 1143 -#define EventWindowFileDraggingEntered 1144 -#define EventWindowFileDraggingPerformed 1145 -#define EventWindowFileDraggingExited 1146 +#define EventApplicationShouldHandleReopen 1045 +#define EventWindowDidBecomeKey 1046 +#define EventWindowDidBecomeMain 1047 +#define EventWindowDidBeginSheet 1048 +#define EventWindowDidChangeAlpha 1049 +#define EventWindowDidChangeBackingLocation 1050 +#define EventWindowDidChangeBackingProperties 1051 +#define EventWindowDidChangeCollectionBehavior 1052 +#define EventWindowDidChangeEffectiveAppearance 1053 +#define EventWindowDidChangeOcclusionState 1054 +#define EventWindowDidChangeOrderingMode 1055 +#define EventWindowDidChangeScreen 1056 +#define EventWindowDidChangeScreenParameters 1057 +#define EventWindowDidChangeScreenProfile 1058 +#define EventWindowDidChangeScreenSpace 1059 +#define EventWindowDidChangeScreenSpaceProperties 1060 +#define EventWindowDidChangeSharingType 1061 +#define EventWindowDidChangeSpace 1062 +#define EventWindowDidChangeSpaceOrderingMode 1063 +#define EventWindowDidChangeTitle 1064 +#define EventWindowDidChangeToolbar 1065 +#define EventWindowDidChangeVisibility 1066 +#define EventWindowDidDeminiaturize 1067 +#define EventWindowDidEndSheet 1068 +#define EventWindowDidEnterFullScreen 1069 +#define EventWindowDidEnterVersionBrowser 1070 +#define EventWindowDidExitFullScreen 1071 +#define EventWindowDidExitVersionBrowser 1072 +#define EventWindowDidExpose 1073 +#define EventWindowDidFocus 1074 +#define EventWindowDidMiniaturize 1075 +#define EventWindowDidMove 1076 +#define EventWindowDidOrderOffScreen 1077 +#define EventWindowDidOrderOnScreen 1078 +#define EventWindowDidResignKey 1079 +#define EventWindowDidResignMain 1080 +#define EventWindowDidResize 1081 +#define EventWindowDidUpdate 1082 +#define EventWindowDidUpdateAlpha 1083 +#define EventWindowDidUpdateCollectionBehavior 1084 +#define EventWindowDidUpdateCollectionProperties 1085 +#define EventWindowDidUpdateShadow 1086 +#define EventWindowDidUpdateTitle 1087 +#define EventWindowDidUpdateToolbar 1088 +#define EventWindowDidUpdateVisibility 1089 +#define EventWindowShouldClose 1090 +#define EventWindowWillBecomeKey 1091 +#define EventWindowWillBecomeMain 1092 +#define EventWindowWillBeginSheet 1093 +#define EventWindowWillChangeOrderingMode 1094 +#define EventWindowWillClose 1095 +#define EventWindowWillDeminiaturize 1096 +#define EventWindowWillEnterFullScreen 1097 +#define EventWindowWillEnterVersionBrowser 1098 +#define EventWindowWillExitFullScreen 1099 +#define EventWindowWillExitVersionBrowser 1100 +#define EventWindowWillFocus 1101 +#define EventWindowWillMiniaturize 1102 +#define EventWindowWillMove 1103 +#define EventWindowWillOrderOffScreen 1104 +#define EventWindowWillOrderOnScreen 1105 +#define EventWindowWillResignMain 1106 +#define EventWindowWillResize 1107 +#define EventWindowWillUnfocus 1108 +#define EventWindowWillUpdate 1109 +#define EventWindowWillUpdateAlpha 1110 +#define EventWindowWillUpdateCollectionBehavior 1111 +#define EventWindowWillUpdateCollectionProperties 1112 +#define EventWindowWillUpdateShadow 1113 +#define EventWindowWillUpdateTitle 1114 +#define EventWindowWillUpdateToolbar 1115 +#define EventWindowWillUpdateVisibility 1116 +#define EventWindowWillUseStandardFrame 1117 +#define EventMenuWillOpen 1118 +#define EventMenuDidOpen 1119 +#define EventMenuDidClose 1120 +#define EventMenuWillSendAction 1121 +#define EventMenuDidSendAction 1122 +#define EventMenuWillHighlightItem 1123 +#define EventMenuDidHighlightItem 1124 +#define EventMenuWillDisplayItem 1125 +#define EventMenuDidDisplayItem 1126 +#define EventMenuWillAddItem 1127 +#define EventMenuDidAddItem 1128 +#define EventMenuWillRemoveItem 1129 +#define EventMenuDidRemoveItem 1130 +#define EventMenuWillBeginTracking 1131 +#define EventMenuDidBeginTracking 1132 +#define EventMenuWillEndTracking 1133 +#define EventMenuDidEndTracking 1134 +#define EventMenuWillUpdate 1135 +#define EventMenuDidUpdate 1136 +#define EventMenuWillPopUp 1137 +#define EventMenuDidPopUp 1138 +#define EventMenuWillSendActionToItem 1139 +#define EventMenuDidSendActionToItem 1140 +#define EventWebViewDidStartProvisionalNavigation 1141 +#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1142 +#define EventWebViewDidFinishNavigation 1143 +#define EventWebViewDidCommitNavigation 1144 +#define EventWindowFileDraggingEntered 1145 +#define EventWindowFileDraggingPerformed 1146 +#define EventWindowFileDraggingExited 1147 -#define MAX_EVENTS 1147 +#define MAX_EVENTS 1148 #endif \ No newline at end of file diff --git a/v3/pkg/events/events.txt b/v3/pkg/events/events.txt index 9b22a3c4..73c52bff 100644 --- a/v3/pkg/events/events.txt +++ b/v3/pkg/events/events.txt @@ -19,6 +19,7 @@ mac:ApplicationWillTerminate mac:ApplicationWillUnhide mac:ApplicationWillUpdate mac:ApplicationDidChangeTheme! +mac:ApplicationShouldHandleReopen! mac:WindowDidBecomeKey mac:WindowDidBecomeMain mac:WindowDidBeginSheet diff --git a/v3/pkg/events/events_darwin.h b/v3/pkg/events/events_darwin.h index 2b54a44a..6150307a 100644 --- a/v3/pkg/events/events_darwin.h +++ b/v3/pkg/events/events_darwin.h @@ -27,110 +27,111 @@ extern void processWindowEvent(unsigned int, unsigned int); #define EventApplicationWillUnhide 1042 #define EventApplicationWillUpdate 1043 #define EventApplicationDidChangeTheme 1044 -#define EventWindowDidBecomeKey 1045 -#define EventWindowDidBecomeMain 1046 -#define EventWindowDidBeginSheet 1047 -#define EventWindowDidChangeAlpha 1048 -#define EventWindowDidChangeBackingLocation 1049 -#define EventWindowDidChangeBackingProperties 1050 -#define EventWindowDidChangeCollectionBehavior 1051 -#define EventWindowDidChangeEffectiveAppearance 1052 -#define EventWindowDidChangeOcclusionState 1053 -#define EventWindowDidChangeOrderingMode 1054 -#define EventWindowDidChangeScreen 1055 -#define EventWindowDidChangeScreenParameters 1056 -#define EventWindowDidChangeScreenProfile 1057 -#define EventWindowDidChangeScreenSpace 1058 -#define EventWindowDidChangeScreenSpaceProperties 1059 -#define EventWindowDidChangeSharingType 1060 -#define EventWindowDidChangeSpace 1061 -#define EventWindowDidChangeSpaceOrderingMode 1062 -#define EventWindowDidChangeTitle 1063 -#define EventWindowDidChangeToolbar 1064 -#define EventWindowDidChangeVisibility 1065 -#define EventWindowDidDeminiaturize 1066 -#define EventWindowDidEndSheet 1067 -#define EventWindowDidEnterFullScreen 1068 -#define EventWindowDidEnterVersionBrowser 1069 -#define EventWindowDidExitFullScreen 1070 -#define EventWindowDidExitVersionBrowser 1071 -#define EventWindowDidExpose 1072 -#define EventWindowDidFocus 1073 -#define EventWindowDidMiniaturize 1074 -#define EventWindowDidMove 1075 -#define EventWindowDidOrderOffScreen 1076 -#define EventWindowDidOrderOnScreen 1077 -#define EventWindowDidResignKey 1078 -#define EventWindowDidResignMain 1079 -#define EventWindowDidResize 1080 -#define EventWindowDidUpdate 1081 -#define EventWindowDidUpdateAlpha 1082 -#define EventWindowDidUpdateCollectionBehavior 1083 -#define EventWindowDidUpdateCollectionProperties 1084 -#define EventWindowDidUpdateShadow 1085 -#define EventWindowDidUpdateTitle 1086 -#define EventWindowDidUpdateToolbar 1087 -#define EventWindowDidUpdateVisibility 1088 -#define EventWindowShouldClose 1089 -#define EventWindowWillBecomeKey 1090 -#define EventWindowWillBecomeMain 1091 -#define EventWindowWillBeginSheet 1092 -#define EventWindowWillChangeOrderingMode 1093 -#define EventWindowWillClose 1094 -#define EventWindowWillDeminiaturize 1095 -#define EventWindowWillEnterFullScreen 1096 -#define EventWindowWillEnterVersionBrowser 1097 -#define EventWindowWillExitFullScreen 1098 -#define EventWindowWillExitVersionBrowser 1099 -#define EventWindowWillFocus 1100 -#define EventWindowWillMiniaturize 1101 -#define EventWindowWillMove 1102 -#define EventWindowWillOrderOffScreen 1103 -#define EventWindowWillOrderOnScreen 1104 -#define EventWindowWillResignMain 1105 -#define EventWindowWillResize 1106 -#define EventWindowWillUnfocus 1107 -#define EventWindowWillUpdate 1108 -#define EventWindowWillUpdateAlpha 1109 -#define EventWindowWillUpdateCollectionBehavior 1110 -#define EventWindowWillUpdateCollectionProperties 1111 -#define EventWindowWillUpdateShadow 1112 -#define EventWindowWillUpdateTitle 1113 -#define EventWindowWillUpdateToolbar 1114 -#define EventWindowWillUpdateVisibility 1115 -#define EventWindowWillUseStandardFrame 1116 -#define EventMenuWillOpen 1117 -#define EventMenuDidOpen 1118 -#define EventMenuDidClose 1119 -#define EventMenuWillSendAction 1120 -#define EventMenuDidSendAction 1121 -#define EventMenuWillHighlightItem 1122 -#define EventMenuDidHighlightItem 1123 -#define EventMenuWillDisplayItem 1124 -#define EventMenuDidDisplayItem 1125 -#define EventMenuWillAddItem 1126 -#define EventMenuDidAddItem 1127 -#define EventMenuWillRemoveItem 1128 -#define EventMenuDidRemoveItem 1129 -#define EventMenuWillBeginTracking 1130 -#define EventMenuDidBeginTracking 1131 -#define EventMenuWillEndTracking 1132 -#define EventMenuDidEndTracking 1133 -#define EventMenuWillUpdate 1134 -#define EventMenuDidUpdate 1135 -#define EventMenuWillPopUp 1136 -#define EventMenuDidPopUp 1137 -#define EventMenuWillSendActionToItem 1138 -#define EventMenuDidSendActionToItem 1139 -#define EventWebViewDidStartProvisionalNavigation 1140 -#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1141 -#define EventWebViewDidFinishNavigation 1142 -#define EventWebViewDidCommitNavigation 1143 -#define EventWindowFileDraggingEntered 1144 -#define EventWindowFileDraggingPerformed 1145 -#define EventWindowFileDraggingExited 1146 +#define EventApplicationShouldHandleReopen 1045 +#define EventWindowDidBecomeKey 1046 +#define EventWindowDidBecomeMain 1047 +#define EventWindowDidBeginSheet 1048 +#define EventWindowDidChangeAlpha 1049 +#define EventWindowDidChangeBackingLocation 1050 +#define EventWindowDidChangeBackingProperties 1051 +#define EventWindowDidChangeCollectionBehavior 1052 +#define EventWindowDidChangeEffectiveAppearance 1053 +#define EventWindowDidChangeOcclusionState 1054 +#define EventWindowDidChangeOrderingMode 1055 +#define EventWindowDidChangeScreen 1056 +#define EventWindowDidChangeScreenParameters 1057 +#define EventWindowDidChangeScreenProfile 1058 +#define EventWindowDidChangeScreenSpace 1059 +#define EventWindowDidChangeScreenSpaceProperties 1060 +#define EventWindowDidChangeSharingType 1061 +#define EventWindowDidChangeSpace 1062 +#define EventWindowDidChangeSpaceOrderingMode 1063 +#define EventWindowDidChangeTitle 1064 +#define EventWindowDidChangeToolbar 1065 +#define EventWindowDidChangeVisibility 1066 +#define EventWindowDidDeminiaturize 1067 +#define EventWindowDidEndSheet 1068 +#define EventWindowDidEnterFullScreen 1069 +#define EventWindowDidEnterVersionBrowser 1070 +#define EventWindowDidExitFullScreen 1071 +#define EventWindowDidExitVersionBrowser 1072 +#define EventWindowDidExpose 1073 +#define EventWindowDidFocus 1074 +#define EventWindowDidMiniaturize 1075 +#define EventWindowDidMove 1076 +#define EventWindowDidOrderOffScreen 1077 +#define EventWindowDidOrderOnScreen 1078 +#define EventWindowDidResignKey 1079 +#define EventWindowDidResignMain 1080 +#define EventWindowDidResize 1081 +#define EventWindowDidUpdate 1082 +#define EventWindowDidUpdateAlpha 1083 +#define EventWindowDidUpdateCollectionBehavior 1084 +#define EventWindowDidUpdateCollectionProperties 1085 +#define EventWindowDidUpdateShadow 1086 +#define EventWindowDidUpdateTitle 1087 +#define EventWindowDidUpdateToolbar 1088 +#define EventWindowDidUpdateVisibility 1089 +#define EventWindowShouldClose 1090 +#define EventWindowWillBecomeKey 1091 +#define EventWindowWillBecomeMain 1092 +#define EventWindowWillBeginSheet 1093 +#define EventWindowWillChangeOrderingMode 1094 +#define EventWindowWillClose 1095 +#define EventWindowWillDeminiaturize 1096 +#define EventWindowWillEnterFullScreen 1097 +#define EventWindowWillEnterVersionBrowser 1098 +#define EventWindowWillExitFullScreen 1099 +#define EventWindowWillExitVersionBrowser 1100 +#define EventWindowWillFocus 1101 +#define EventWindowWillMiniaturize 1102 +#define EventWindowWillMove 1103 +#define EventWindowWillOrderOffScreen 1104 +#define EventWindowWillOrderOnScreen 1105 +#define EventWindowWillResignMain 1106 +#define EventWindowWillResize 1107 +#define EventWindowWillUnfocus 1108 +#define EventWindowWillUpdate 1109 +#define EventWindowWillUpdateAlpha 1110 +#define EventWindowWillUpdateCollectionBehavior 1111 +#define EventWindowWillUpdateCollectionProperties 1112 +#define EventWindowWillUpdateShadow 1113 +#define EventWindowWillUpdateTitle 1114 +#define EventWindowWillUpdateToolbar 1115 +#define EventWindowWillUpdateVisibility 1116 +#define EventWindowWillUseStandardFrame 1117 +#define EventMenuWillOpen 1118 +#define EventMenuDidOpen 1119 +#define EventMenuDidClose 1120 +#define EventMenuWillSendAction 1121 +#define EventMenuDidSendAction 1122 +#define EventMenuWillHighlightItem 1123 +#define EventMenuDidHighlightItem 1124 +#define EventMenuWillDisplayItem 1125 +#define EventMenuDidDisplayItem 1126 +#define EventMenuWillAddItem 1127 +#define EventMenuDidAddItem 1128 +#define EventMenuWillRemoveItem 1129 +#define EventMenuDidRemoveItem 1130 +#define EventMenuWillBeginTracking 1131 +#define EventMenuDidBeginTracking 1132 +#define EventMenuWillEndTracking 1133 +#define EventMenuDidEndTracking 1134 +#define EventMenuWillUpdate 1135 +#define EventMenuDidUpdate 1136 +#define EventMenuWillPopUp 1137 +#define EventMenuDidPopUp 1138 +#define EventMenuWillSendActionToItem 1139 +#define EventMenuDidSendActionToItem 1140 +#define EventWebViewDidStartProvisionalNavigation 1141 +#define EventWebViewDidReceiveServerRedirectForProvisionalNavigation 1142 +#define EventWebViewDidFinishNavigation 1143 +#define EventWebViewDidCommitNavigation 1144 +#define EventWindowFileDraggingEntered 1145 +#define EventWindowFileDraggingPerformed 1146 +#define EventWindowFileDraggingExited 1147 -#define MAX_EVENTS 1147 +#define MAX_EVENTS 1148 #endif \ No newline at end of file