Fix merge conflict

fyne-io · Jan 9, 2025 · 7d5fb07 · 7d5fb07
1 parent 4c0458c
commit 7d5fb07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/data/binding/pref_helper.go b/data/binding/pref_helper.go
@@ -1,6 +1,8 @@
 package binding
 
 import (
+	"sync"
+
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/internal/async"
 )

diff --git a/internal/driver/glfw/canvas_other_test.go b/internal/driver/glfw/canvas_other_test.go
@@ -20,7 +20,7 @@ func TestGlCanvas_FocusHandlingWhenActivatingOrDeactivatingTheMenu(t *testing.T)
 			fyne.NewMenu("other", fyne.NewMenuItem("item", func() {})),
 		),
 	)
-	c := w.Canvas().(*glCanvas)
+	c := w.Canvas()
 
 	ce1 := &focusable{id: "ce1"}
 	ce2 := &focusable{id: "ce2"}