Fix merge conflicts

fyne-io · Feb 1, 2025 · 221abeb · 221abeb
1 parent a8cf5d0
commit 221abeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/internal/driver/common/canvas.go b/internal/driver/common/canvas.go
@@ -492,11 +492,6 @@ type RenderCacheNode struct {
 	parent      *RenderCacheNode
 	// cache data
 	minSize fyne.Size
-	// painterData is some data from the painter associated with the drawn node
-	// it may for instance point to a GL texture
-	// it should free all associated resources when released
-	// i.e. it should not simply be a texture reference integer
-	painterData any
 }
 
 // Obj returns the node object.

diff --git a/internal/driver/glfw/clipboard_wasm.go b/internal/driver/glfw/clipboard_wasm.go
@@ -7,10 +7,10 @@ import (
 )
 
 // Declare conformity with Clipboard interface
-var _ fyne.Clipboard = clipboard{}
+var _ fyne.Clipboard = &clipboard{}
 
 func NewClipboard() fyne.Clipboard {
-	return clipboard{}
+	return &clipboard{}
 }
 
 // clipboard represents the system clipboard