diff --git a/v2/internal/app/default.go b/v2/internal/app/default.go index 287a432e..1fcf357d 100644 --- a/v2/internal/app/default.go +++ b/v2/internal/app/default.go @@ -9,8 +9,6 @@ package app import ( "os" - - "github.com/wailsapp/wails/v2/internal/features" ) // App defines a Wails application structure @@ -22,8 +20,6 @@ type App struct { // Indicates if the app is running in debug mode debug bool - - Features *features.Features } // CreateApp returns a null application diff --git a/v2/internal/app/desktop.go b/v2/internal/app/desktop.go index e94a504c..c0a6e13f 100644 --- a/v2/internal/app/desktop.go +++ b/v2/internal/app/desktop.go @@ -6,7 +6,6 @@ import ( "os" "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/internal/features" "github.com/wailsapp/wails/v2/internal/ffenestri" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" @@ -35,9 +34,6 @@ type App struct { // This is our binding DB bindings *binding.Bindings - - // Feature flags - Features *features.Features } // Create App @@ -73,7 +69,6 @@ func CreateApp(options *Options) *App { servicebus: servicebus.New(myLogger), logger: myLogger, bindings: binding.NewBindings(myLogger), - Features: features.New(), } // Initialise the app @@ -152,7 +147,7 @@ func (a *App) Run() error { return err } - result := a.window.Run(dispatcher, bindingDump, a.Features) + result := a.window.Run(dispatcher, bindingDump) a.logger.Trace("Ffenestri.Run() exited") a.servicebus.Stop() diff --git a/v2/internal/app/hybrid.go b/v2/internal/app/hybrid.go index 7d45f3f9..80cc7778 100644 --- a/v2/internal/app/hybrid.go +++ b/v2/internal/app/hybrid.go @@ -8,7 +8,6 @@ import ( "github.com/leaanthony/clir" "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/internal/features" "github.com/wailsapp/wails/v2/internal/ffenestri" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" @@ -44,9 +43,6 @@ type App struct { servicebus *servicebus.ServiceBus debug bool - - // Feature flags - Features *features.Features } // Create App @@ -191,7 +187,7 @@ func (a *App) Run() error { } }() - result := a.window.Run(dispatcher, bindingDump, a.Features) + result := a.window.Run(dispatcher, bindingDump) a.servicebus.Stop() return result diff --git a/v2/internal/features/features_darwin.go b/v2/internal/features/features_darwin.go deleted file mode 100644 index 70868d66..00000000 --- a/v2/internal/features/features_darwin.go +++ /dev/null @@ -1,10 +0,0 @@ -package features - -type Features struct { -} - -// New creates a new Features object -func New() *Features { - return &Features{ - } -} diff --git a/v2/internal/features/features_linux.go b/v2/internal/features/features_linux.go deleted file mode 100644 index 70868d66..00000000 --- a/v2/internal/features/features_linux.go +++ /dev/null @@ -1,10 +0,0 @@ -package features - -type Features struct { -} - -// New creates a new Features object -func New() *Features { - return &Features{ - } -} diff --git a/v2/internal/ffenestri/ffenestri.go b/v2/internal/ffenestri/ffenestri.go index 3d29df6c..2fddc3af 100644 --- a/v2/internal/ffenestri/ffenestri.go +++ b/v2/internal/ffenestri/ffenestri.go @@ -5,7 +5,6 @@ import ( "strings" "unsafe" - "github.com/wailsapp/wails/v2/internal/features" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" ) @@ -127,7 +126,7 @@ type DispatchClient interface { } // Run the application -func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, features *features.Features) error { +func (a *Application) Run(incomingDispatcher Dispatcher, bindings string) error { title := a.string2CString(a.config.Title) width := C.int(a.config.Width) height := C.int(a.config.Height)