From 31d35df3d876f5d7900a102959a94ecf1d408014 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 15 Jun 2019 14:53:29 -0500 Subject: [PATCH 1/4] WindowsFormsApplicationBase's OnCreateMainForm does nothing. --- .../WindowsFormsApplicationBase.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb index 6a533073..4b0b727b 100644 --- a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb +++ b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb @@ -170,7 +170,6 @@ Namespace Microsoft.VisualBasic.ApplicationServices _ Protected Overridable Sub OnCreateMainForm() - Throw New NotImplementedException End Sub _ From 0746fe0769b3874d4890bac74df977f7a769f795 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 15 Jun 2019 15:38:55 -0500 Subject: [PATCH 2/4] Implement WindowsFormsApplicationBase.OnInitialize. --- .../WindowsFormsApplicationBase.vb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb index 4b0b727b..f15b22aa 100644 --- a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb +++ b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb @@ -74,6 +74,12 @@ Namespace Microsoft.VisualBasic.ApplicationServices Public Sub Run(ByVal commandLine() As String) #If TARGET_JVM = False Then 'Not Supported by Grasshopper + Dim args As ReadOnlyCollection(Of String) + + args = new ReadOnlyCollection(Of String)(commandLine) + + OnInitialize(args) + OnRun() 'Throw New Exception("Visual Basic 2005 applications are not currently supported (try disabling 'Enable Application Framework')") 'Application.Run() @@ -179,7 +185,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices _ Protected Overridable Function OnInitialize(ByVal commandLineArgs As ReadOnlyCollection(Of String)) As Boolean - Throw New NotImplementedException + 'FIXME: call OnCreateSplashScreen End Function _ From 7b840b2aa4013c6b543ce4ccd49d952e463b7293 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 15 Jun 2019 15:51:08 -0500 Subject: [PATCH 3/4] Implement WindowsFormsApplicationBase.OnStartup. --- .../WindowsFormsApplicationBase.vb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb index f15b22aa..46a2c216 100644 --- a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb +++ b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb @@ -80,6 +80,14 @@ Namespace Microsoft.VisualBasic.ApplicationServices OnInitialize(args) + Dim startup as StartupEventArgs + + startup = New StartupEventArgs(args) + + If Not OnStartup(startup) Then + Exit Sub + End If + OnRun() 'Throw New Exception("Visual Basic 2005 applications are not currently supported (try disabling 'Enable Application Framework')") 'Application.Run() @@ -208,7 +216,8 @@ Namespace Microsoft.VisualBasic.ApplicationServices _ Protected Overridable Function OnStartup(ByVal eventArgs As StartupEventArgs) As Boolean - Throw New NotImplementedException + RaiseEvent Startup(eventArgs) + OnStartup = Not eventArgs.Cancel End Function _ From faacb04296ef2c22d66c299c8a4c5456c6f95510 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Sat, 15 Jun 2019 15:57:56 -0500 Subject: [PATCH 4/4] Implement WindowsFormsApplicationBase.OnShutdown. --- .../WindowsFormsApplicationBase.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb index 46a2c216..d3947516 100644 --- a/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb +++ b/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb @@ -91,6 +91,8 @@ Namespace Microsoft.VisualBasic.ApplicationServices OnRun() 'Throw New Exception("Visual Basic 2005 applications are not currently supported (try disabling 'Enable Application Framework')") 'Application.Run() + + OnShutdown() #Else Throw New NotImplementedException #End If @@ -211,7 +213,7 @@ Namespace Microsoft.VisualBasic.ApplicationServices _ Protected Overridable Sub OnShutdown() - Throw New NotImplementedException + RaiseEvent Shutdown(new EventArgs()) End Sub _