From ab06920e74473cb0e34bf2dfffdd8bda023f3ddc Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sun, 9 Jun 2024 08:28:38 +1000
Subject: [PATCH] Fix non-windows build issues

---
 v3/examples/build/main.go                       |  4 ++--
 v3/examples/window/main.go                      |  8 ++++++--
 v3/examples/window/windows.go                   | 11 +++++++++++
 v3/internal/commands/appimage_testfiles/main.go |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 v3/examples/window/windows.go

diff --git a/v3/examples/build/main.go b/v3/examples/build/main.go
index eb46479c1..cbfd0a58e 100755
--- a/v3/examples/build/main.go
+++ b/v3/examples/build/main.go
@@ -135,7 +135,7 @@ func main() {
 	})
 	sizeMenu.Add("Set Max Size (600,600)").OnClick(func(ctx *application.Context) {
 		currentWindow(func(w *application.WebviewWindow) {
-			w.SetFullscreenButtonEnabled(false)
+			w.SetMaximiseButtonState(application.ButtonDisabled)
 			w.SetMaxSize(600, 600)
 		})
 	})
@@ -155,7 +155,7 @@ func main() {
 	sizeMenu.Add("Reset Max Size").OnClick(func(ctx *application.Context) {
 		currentWindow(func(w *application.WebviewWindow) {
 			w.SetMaxSize(0, 0)
-			w.SetFullscreenButtonEnabled(true)
+			w.SetMaximiseButtonState(application.ButtonEnabled)
 		})
 	})
 	positionMenu := menu.AddSubmenu("Position")
diff --git a/v3/examples/window/main.go b/v3/examples/window/main.go
index 4b705ac5b..c0c003784 100644
--- a/v3/examples/window/main.go
+++ b/v3/examples/window/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	_ "embed"
 	"fmt"
-	"github.com/wailsapp/wails/v3/pkg/w32"
 	"log"
 	"math/rand"
 	"runtime"
@@ -16,6 +15,11 @@ import (
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 
+// This is a stub for non-windows platforms
+var getExStyle = func() int {
+	return 0
+}
+
 func main() {
 	app := application.New(application.Options{
 		Name:        "WebviewWindow Demo",
@@ -138,7 +142,7 @@ func main() {
 				app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{
 					Windows: application.WindowsWindow{
 						DisableMenu: true,
-						ExStyle:     w32.WS_EX_TOOLWINDOW | w32.WS_EX_NOREDIRECTIONBITMAP | w32.WS_EX_TOPMOST,
+						ExStyle:     getExStyle(),
 					},
 				}).
 					SetTitle("WebviewWindow "+strconv.Itoa(windowCounter)).
diff --git a/v3/examples/window/windows.go b/v3/examples/window/windows.go
new file mode 100644
index 000000000..d66984d18
--- /dev/null
+++ b/v3/examples/window/windows.go
@@ -0,0 +1,11 @@
+//go:build windows
+
+package main
+
+import "github.com/wailsapp/wails/v3/pkg/w32"
+
+func init() {
+	getExStyle = func() int {
+		return w32.WS_EX_TOOLWINDOW | w32.WS_EX_NOREDIRECTIONBITMAP | w32.WS_EX_TOPMOST
+	}
+}
diff --git a/v3/internal/commands/appimage_testfiles/main.go b/v3/internal/commands/appimage_testfiles/main.go
index 609051bc0..81e76b3fd 100644
--- a/v3/internal/commands/appimage_testfiles/main.go
+++ b/v3/internal/commands/appimage_testfiles/main.go
@@ -224,7 +224,7 @@ func main() {
 	})
 	sizeMenu.Add("Set Max Size (600,600)").OnClick(func(ctx *application.Context) {
 		currentWindow(func(w *application.WebviewWindow) {
-			w.SetFullscreenButtonEnabled(false)
+			w.SetMaximiseButtonState(application.ButtonDisabled)
 			w.SetMaxSize(600, 600)
 		})
 	})
@@ -244,7 +244,7 @@ func main() {
 	sizeMenu.Add("Reset Max Size").OnClick(func(ctx *application.Context) {
 		currentWindow(func(w *application.WebviewWindow) {
 			w.SetMaxSize(0, 0)
-			w.SetFullscreenButtonEnabled(true)
+			w.SetMaximiseButtonState(application.ButtonEnabled)
 		})
 	})
 	positionMenu := menu.AddSubmenu("Position")