From 527cff9ec342d7978f734c6b33c36c965aaf3540 Mon Sep 17 00:00:00 2001 From: stffabi Date: Fri, 12 May 2023 09:21:45 +0200 Subject: [PATCH] [v3 darwin] Add darwin identifier to all C files of darwin --- v3/pkg/application/application_darwin.go | 6 +++--- v3/pkg/application/{application.h => application_darwin.h} | 0 .../{app_delegate.h => application_darwin_delegate.h} | 0 .../{app_delegate.m => application_darwin_delegate.m} | 2 +- v3/pkg/application/dialogs_darwin.go | 2 +- .../{dialogs_delegate.h => dialogs_darwin_delegate.h} | 0 .../{dialogs_delegate.m => dialogs_darwin_delegate.m} | 2 +- v3/pkg/application/menu_darwin.go | 2 +- v3/pkg/application/menuitem_darwin.go | 4 ++-- v3/pkg/application/{menuitem.h => menuitem_darwin.h} | 0 v3/pkg/application/{menuitem.m => menuitem_darwin.m} | 2 +- v3/pkg/application/systemtray_darwin.go | 2 +- v3/pkg/application/webview_window_darwin.go | 6 +++--- .../{webview_window.h => webview_window_darwin.h} | 0 .../{webview_window.m => webview_window_darwin.m} | 2 +- .../{webview_drag.h => webview_window_darwin_drag.h} | 0 .../{webview_drag.m => webview_window_darwin_drag.m} | 2 +- v3/pkg/application/webview_window_devtools.go | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename v3/pkg/application/{application.h => application_darwin.h} (100%) rename v3/pkg/application/{app_delegate.h => application_darwin_delegate.h} (100%) rename v3/pkg/application/{app_delegate.m => application_darwin_delegate.m} (99%) rename v3/pkg/application/{dialogs_delegate.h => dialogs_darwin_delegate.h} (100%) rename v3/pkg/application/{dialogs_delegate.m => dialogs_darwin_delegate.m} (95%) rename v3/pkg/application/{menuitem.h => menuitem_darwin.h} (100%) rename v3/pkg/application/{menuitem.m => menuitem_darwin.m} (84%) rename v3/pkg/application/{webview_window.h => webview_window_darwin.h} (100%) rename v3/pkg/application/{webview_window.m => webview_window_darwin.m} (99%) rename v3/pkg/application/{webview_drag.h => webview_window_darwin_drag.h} (100%) rename v3/pkg/application/{webview_drag.m => webview_window_darwin_drag.m} (97%) diff --git a/v3/pkg/application/application_darwin.go b/v3/pkg/application/application_darwin.go index a5127c2ea..124a82539 100644 --- a/v3/pkg/application/application_darwin.go +++ b/v3/pkg/application/application_darwin.go @@ -7,9 +7,9 @@ package application #cgo CFLAGS: -mmacosx-version-min=10.13 -x objective-c #cgo LDFLAGS: -framework Cocoa -mmacosx-version-min=10.13 -#include "application.h" -#include "app_delegate.h" -#include "webview_window.h" +#include "application_darwin.h" +#include "application_darwin_delegate.h" +#include "webview_window_darwin.h" #include extern void registerListener(unsigned int event); diff --git a/v3/pkg/application/application.h b/v3/pkg/application/application_darwin.h similarity index 100% rename from v3/pkg/application/application.h rename to v3/pkg/application/application_darwin.h diff --git a/v3/pkg/application/app_delegate.h b/v3/pkg/application/application_darwin_delegate.h similarity index 100% rename from v3/pkg/application/app_delegate.h rename to v3/pkg/application/application_darwin_delegate.h diff --git a/v3/pkg/application/app_delegate.m b/v3/pkg/application/application_darwin_delegate.m similarity index 99% rename from v3/pkg/application/app_delegate.m rename to v3/pkg/application/application_darwin_delegate.m index d20a48fda..5c6b10c25 100644 --- a/v3/pkg/application/app_delegate.m +++ b/v3/pkg/application/application_darwin_delegate.m @@ -1,5 +1,5 @@ //go:build darwin -#import "app_delegate.h" +#import "application_darwin_delegate.h" #import "../events/events.h" extern bool hasListeners(unsigned int); @implementation AppDelegate diff --git a/v3/pkg/application/dialogs_darwin.go b/v3/pkg/application/dialogs_darwin.go index ca27e7da6..03ae25c2d 100644 --- a/v3/pkg/application/dialogs_darwin.go +++ b/v3/pkg/application/dialogs_darwin.go @@ -9,7 +9,7 @@ package application #import #import -#import "dialogs_delegate.h" +#import "dialogs_darwin_delegate.h" extern void openFileDialogCallback(uint id, char* path); extern void openFileDialogCallbackEnd(uint id); diff --git a/v3/pkg/application/dialogs_delegate.h b/v3/pkg/application/dialogs_darwin_delegate.h similarity index 100% rename from v3/pkg/application/dialogs_delegate.h rename to v3/pkg/application/dialogs_darwin_delegate.h diff --git a/v3/pkg/application/dialogs_delegate.m b/v3/pkg/application/dialogs_darwin_delegate.m similarity index 95% rename from v3/pkg/application/dialogs_delegate.m rename to v3/pkg/application/dialogs_darwin_delegate.m index 67f34e2eb..5cbd46a2b 100644 --- a/v3/pkg/application/dialogs_delegate.m +++ b/v3/pkg/application/dialogs_darwin_delegate.m @@ -1,6 +1,6 @@ //go:build darwin -#import "dialogs_delegate.h" +#import "dialogs_darwin_delegate.h" // Override shouldEnableURL @implementation OpenPanelDelegate diff --git a/v3/pkg/application/menu_darwin.go b/v3/pkg/application/menu_darwin.go index dc6493ad2..250172f20 100644 --- a/v3/pkg/application/menu_darwin.go +++ b/v3/pkg/application/menu_darwin.go @@ -6,7 +6,7 @@ package application #cgo CFLAGS: -mmacosx-version-min=10.10 -x objective-c #cgo LDFLAGS: -framework Cocoa -#include "menuitem.h" +#include "menuitem_darwin.h" extern void setMenuItemChecked(void*, unsigned int, bool); diff --git a/v3/pkg/application/menuitem_darwin.go b/v3/pkg/application/menuitem_darwin.go index 7ca50db41..e8303e131 100644 --- a/v3/pkg/application/menuitem_darwin.go +++ b/v3/pkg/application/menuitem_darwin.go @@ -7,8 +7,8 @@ package application #cgo LDFLAGS: -framework Cocoa -framework WebKit #include "Cocoa/Cocoa.h" -#include "menuitem.h" -#include "application.h" +#include "menuitem_darwin.h" +#include "application_darwin.h" #define unicode(input) [NSString stringWithFormat:@"%C", input] diff --git a/v3/pkg/application/menuitem.h b/v3/pkg/application/menuitem_darwin.h similarity index 100% rename from v3/pkg/application/menuitem.h rename to v3/pkg/application/menuitem_darwin.h diff --git a/v3/pkg/application/menuitem.m b/v3/pkg/application/menuitem_darwin.m similarity index 84% rename from v3/pkg/application/menuitem.m rename to v3/pkg/application/menuitem_darwin.m index f875d0de5..39369502d 100644 --- a/v3/pkg/application/menuitem.m +++ b/v3/pkg/application/menuitem_darwin.m @@ -2,7 +2,7 @@ #import -#import "menuitem.h" +#import "menuitem_darwin.h" @implementation MenuItem diff --git a/v3/pkg/application/systemtray_darwin.go b/v3/pkg/application/systemtray_darwin.go index 1c6750185..b176ab6b2 100644 --- a/v3/pkg/application/systemtray_darwin.go +++ b/v3/pkg/application/systemtray_darwin.go @@ -7,7 +7,7 @@ package application #cgo LDFLAGS: -framework Cocoa -framework WebKit #include "Cocoa/Cocoa.h" -#include "menuitem.h" +#include "menuitem_darwin.h" // Create a new system tray void* systemTrayNew() { diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go index ed39aa927..92f5b9253 100644 --- a/v3/pkg/application/webview_window_darwin.go +++ b/v3/pkg/application/webview_window_darwin.go @@ -6,13 +6,13 @@ package application #cgo CFLAGS: -mmacosx-version-min=10.13 -x objective-c #cgo LDFLAGS: -framework Cocoa -framework WebKit -#include "application.h" -#include "webview_window.h" +#include "application_darwin.h" +#include "webview_window_darwin.h" #include #include "Cocoa/Cocoa.h" #import #import -#import "webview_drag.h" +#import "webview_window_darwin_drag.h" extern void registerListener(unsigned int event); diff --git a/v3/pkg/application/webview_window.h b/v3/pkg/application/webview_window_darwin.h similarity index 100% rename from v3/pkg/application/webview_window.h rename to v3/pkg/application/webview_window_darwin.h diff --git a/v3/pkg/application/webview_window.m b/v3/pkg/application/webview_window_darwin.m similarity index 99% rename from v3/pkg/application/webview_window.m rename to v3/pkg/application/webview_window_darwin.m index 70636fc47..9dd79d510 100644 --- a/v3/pkg/application/webview_window.m +++ b/v3/pkg/application/webview_window_darwin.m @@ -1,7 +1,7 @@ //go:build darwin #import #import -#import "webview_window.h" +#import "webview_window_darwin.h" #import "../events/events.h" extern void processMessage(unsigned int, const char*); extern void processURLRequest(unsigned int, void *); diff --git a/v3/pkg/application/webview_drag.h b/v3/pkg/application/webview_window_darwin_drag.h similarity index 100% rename from v3/pkg/application/webview_drag.h rename to v3/pkg/application/webview_window_darwin_drag.h diff --git a/v3/pkg/application/webview_drag.m b/v3/pkg/application/webview_window_darwin_drag.m similarity index 97% rename from v3/pkg/application/webview_drag.m rename to v3/pkg/application/webview_window_darwin_drag.m index 057e68d95..345c5ee37 100644 --- a/v3/pkg/application/webview_drag.m +++ b/v3/pkg/application/webview_window_darwin_drag.m @@ -2,7 +2,7 @@ #import #import -#import "webview_drag.h" +#import "webview_window_darwin_drag.h" #import "../events/events.h" diff --git a/v3/pkg/application/webview_window_devtools.go b/v3/pkg/application/webview_window_devtools.go index 7dce43c52..2a6442156 100644 --- a/v3/pkg/application/webview_window_devtools.go +++ b/v3/pkg/application/webview_window_devtools.go @@ -8,7 +8,7 @@ package application #import -#include "webview_window.h" +#include "webview_window_darwin.h" @interface _WKInspector : NSObject - (void)show;