diff --git a/v3/pkg/application/application_linux.go b/v3/pkg/application/application_linux.go index ba18a443..a82dcf9a 100644 --- a/v3/pkg/application/application_linux.go +++ b/v3/pkg/application/application_linux.go @@ -199,9 +199,7 @@ func (m *linuxApp) executeStartupActions() { //export activateLinux func activateLinux(data unsafe.Pointer) { - // globalApplication.activate() - app := (globalApplication.impl).(*linuxApp) - app.executeStartupActions() + getNativeApplication().executeStartupActions() } //export processApplicationEvent diff --git a/v3/pkg/application/menu_linux_purego.go b/v3/pkg/application/menu_linux_purego.go index 8f22a89c..601d09b5 100644 --- a/v3/pkg/application/menu_linux_purego.go +++ b/v3/pkg/application/menu_linux_purego.go @@ -117,7 +117,7 @@ func (m *linuxMenu) addSubMenuToItem(menu *Menu, item *MenuItem) { menu.impl = &linuxMenu{ menu: menu, native: newMenu(), - } +N } } var itemSetSubmenu func(uintptr, uintptr) purego.RegisterLibFunc(&itemSetSubmenu, gtk, "gtk_menu_item_set_submenu") diff --git a/v3/pkg/application/webview_window_linux.go b/v3/pkg/application/webview_window_linux.go index 86e0a0cf..359ff138 100644 --- a/v3/pkg/application/webview_window_linux.go +++ b/v3/pkg/application/webview_window_linux.go @@ -527,7 +527,7 @@ func newWindowImpl(parent *WebviewWindow) *linuxWebviewWindow { // (*C.struct__GtkWidget)(m.native) //var menubar *C.struct__GtkWidget return &linuxWebviewWindow{ - application: (globalApplication.impl).(*linuxApp).application, + application: getNativeApplication(), parent: parent, // menubar: menubar, } @@ -631,7 +631,7 @@ func (w *linuxWebviewWindow) run() { w.on(eventId) } - app := (globalApplication.impl).(*linuxApp) + app := getNativeApplication() menu := app.applicationMenu globalApplication.dispatchOnMainThread(func() { diff --git a/v3/pkg/application/webview_window_linux_purego.go b/v3/pkg/application/webview_window_linux_purego.go index 5a6f7bea..bbca7752 100644 --- a/v3/pkg/application/webview_window_linux_purego.go +++ b/v3/pkg/application/webview_window_linux_purego.go @@ -442,7 +442,7 @@ func (w *linuxWebviewWindow) setAlwaysOnTop(alwaysOnTop bool) { func newWindowImpl(parent *WebviewWindow) *linuxWebviewWindow { return &linuxWebviewWindow{ - application: (globalApplication.impl).(*linuxApp).application, + application: getNativeApplication(), parent: parent, } } @@ -558,7 +558,7 @@ func (w *linuxWebviewWindow) run() { } globalApplication.dispatchOnMainThread(func() { - app := (globalApplication.impl).(*linuxApp) + app := getNativeApplication() menu := app.applicationMenu var newWindow func(uintptr) uintptr purego.RegisterLibFunc(&newWindow, gtk, "gtk_application_window_new")