Merge commit '414134629530baca6fc6628b4eebe9823c167228'
@@ -4,7 +4,7 @@
|
||||
|
||||
Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
|
||||
|
||||
Private Shadows DialogResult As Boolean
|
||||
Private Shadows DialogResult As MessageBoxResult
|
||||
|
||||
#End Region ' FIELDS & PROPERTIES
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
#Region "EVENTS"
|
||||
|
||||
Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtMessageBoxVM.OnCloseWindow
|
||||
Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.OnCloseWindow
|
||||
Me.DialogResult = DialogResult
|
||||
Me.Close()
|
||||
End Sub
|
||||
|
||||
@@ -5,7 +5,7 @@ Public Class EgtMessageBoxVM
|
||||
|
||||
#Region "FIELDS & PROPERTIES"
|
||||
|
||||
Public Event OnCloseWindow(DialogResult As Boolean)
|
||||
Public Event OnCloseWindow(DialogResult As MessageBoxResult)
|
||||
|
||||
Private m_sTitle As String = ""
|
||||
Public ReadOnly Property sTitle As String
|
||||
@@ -118,7 +118,7 @@ Public Class EgtMessageBoxVM
|
||||
|
||||
#Region "METHODS"
|
||||
|
||||
Friend Sub CloseWindow(DialogResult As Boolean)
|
||||
Friend Sub CloseWindow(DialogResult As MessageBoxResult)
|
||||
RaiseEvent OnCloseWindow(DialogResult)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -62,5 +62,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.1.2.1")>
|
||||
<Assembly: AssemblyFileVersion("3.1.2.1")>
|
||||
<Assembly: AssemblyVersion("3.1.2.2")>
|
||||
<Assembly: AssemblyFileVersion("3.1.2.2")>
|
||||
|
||||
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1007 B |
|
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 616 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.3 KiB |