Changeset 559 for trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/MakeControlEventHandler.ab

Timestamp:

Jul 21, 2008, 1:26:05 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

UI_Sampleの追加。イベントのコメントアウト解除。Form.abからテスト部分を除去。Application.DoEventsを実装。MakeControlEventHandlerを静的メンバのイベント対応へ。WindowsExceptionの追加。

File:

• trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/MakeControlEventHandler.ab (modified) (7 diffs)

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/MakeControlEventHandler.ab

@@ -17 +17 @@
 End Function
 
-Sub OutputEventHandlerCode(out As TextWriter, eventName As String, argBase As String, comment As String)
+Sub OutputEventHandlerCode(out As TextWriter, eventName As String, argBase As String, comment As String, isStatic As Boolean)
     Dim eventMember = EventNameToMemberVariableName(eventName)
     Dim handlerType = argBase & "Handler"
     Dim argsType = argBase & "Args"
+    Dim staticKeyword = Nothing As String
+    If isStatic Then staticKeyword = "Static "
     out.WriteLine("Public")
 '   out.WriteLine(Ex"\t/*!")
 '   out.WriteLine(Ex"\t@brief " & eventName & "イベントハンドラを追加する")
 '   out.WriteLine(Ex"\t*/")
-    out.WriteLine(Ex"\tSub Add" & eventName & "(h As " & handlerType & ")")
+    out.WriteLine(Ex"\t" & staticKeyword & "Sub Add" & eventName & "(h As " & handlerType & ")")
     out.WriteLine(Ex"\t\tIf IsNothing(" & eventMember & ") Then")
     out.WriteLine(Ex"\t\t\t" & eventMember & " = h")
@@ -35 +37 @@
 '   out.WriteLine(Ex"\t@brief " & eventName & "イベントハンドラを削除する")
 '   out.WriteLine(Ex"\t*/")
-    out.WriteLine(Ex"\tSub Remove" & eventName & "(h As " & handlerType & ")")
+    out.WriteLine(Ex"\t" & staticKeyword & "Sub Remove" & eventName & "(h As " & handlerType & ")")
     out.WriteLine(Ex"\t\tIf Not IsNothing(" & eventMember & ") Then")
     out.WriteLine(Ex"\t\t\t" & eventMember & " -= h")
@@ -44 +46 @@
 '   out.WriteLine(Ex"\t@brief " & comment)
 '   out.WriteLine(Ex"\t*/")
-    out.WriteLine(Ex"\tSub On" & eventName & "(e As " & argsType & ")")
+    out.WriteLine(Ex"\t" & staticKeyword & "Sub On" & eventName & "(e As " & argsType & ")")
     out.WriteLine(Ex"\t\tIf Not IsNothing(" & eventMember & ") Then")
     out.WriteLine(Ex"\t\t\t" & eventMember & "(This, e)")
@@ -50 +52 @@
     out.WriteLine(Ex"\tEnd Sub")
     out.WriteLine("Private")
-    out.WriteLine(Ex"\t" & eventMember & " As " & handlerType)
+    out.WriteLine(Ex"\t" & staticKeyword & eventMember & " As " & handlerType)
     out.WriteLine()
 End Sub
@@ -57 +59 @@
 '   "ウィンドウの描画が必要なときに呼び出されます。")
 
-Sub MakeControlEvent(t As String)
+Sub MakeControlEvent(t As String, isStatic = False As Boolean)
     Dim event As String, handler As String, comment As String
     Dim n As DWord, i As DWord
@@ -70 +72 @@
                 Dim a = ActiveBasic.Strings.Detail.Split(s, 9) 'Tab
                 If a.Count >= 3 Then
-                    OutputEventHandlerCode(out, a[0], a[1], a[2])
+                    OutputEventHandlerCode(out, a[0], a[1], a[2], isStatic)
                 End If
             Loop
@@ -79 +81 @@
 MakeControlEvent("Control")
 MakeControlEvent("Form")
-MakeControlEvent("Application")
+MakeControlEvent("Application", True)
 End