Changeset 545

Timestamp:

Jul 13, 2008, 2:09:01 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

ActiveBasic.Windows.UI.FormsをUIへ移動。UI以下にForms以外置くものが思い浮かばないので。

Location:

trunk/ab5.0/ablib

Files:

• TestCase/SimpleTestCase/SimpleTestCase.ab (modified) (2 diffs)
• src/Classes/ActiveBasic/Windows/UI/Control.ab (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Forms/Control.ab ) (5 diffs)
• src/Classes/ActiveBasic/Windows/UI/ControlEvent.sbp (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Forms/ControlEvent.sbp )
• src/Classes/ActiveBasic/Windows/UI/ControlEventList.txt (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Forms/ControlEventList.txt )
• src/Classes/ActiveBasic/Windows/UI/EventArgs.ab (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Forms/EventArgs.ab ) (2 diffs)
• src/Classes/ActiveBasic/Windows/UI/FormEvent.sbp (added)
• src/Classes/ActiveBasic/Windows/UI/MakeControlEventHandler.ab (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Forms/MakeControlEventHandler.ab ) (1 diff)
• src/Classes/ActiveBasic/Windows/UI/WindowHandle.sbp (moved) (moved from trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/WindowHandle.sbp ) (3 diffs)
• src/Classes/System/Windows (deleted)
• src/Classes/index.ab (modified) (2 diffs)

trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.ab

@@ -6 +6 @@
 
 Function GetTempDirectory() As String
-    Return System.IO.Path.GetDirectoryName( System.Windows.Forms.Application.ExecutablePath ) + "\temp\"
-'   Return System.IO.Path.GetTempPath()
+'   Return System.IO.Path.GetDirectoryName( System.Windows.Forms.Application.ExecutablePath ) + "\temp\"
+    Return System.IO.Path.GetTempPath()
 End Function
 
@@ -26 +26 @@
 End Sub
 
-Initialize()
+'Initialize()
 
 Dim csbi As CONSOLE_SCREEN_BUFFER_INFO

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

@@ -1 +1 @@
 'Classes/ActiveBasic/Windows/UI/Control.ab
 
-#require <Classes/ActiveBasic/Windows/UI/Forms/EventArgs.ab>
+#require <Classes/ActiveBasic/Windows/UI/EventArgs.ab>
 
 Namespace ActiveBasic
 Namespace Windows
 Namespace UI
-Namespace Forms
 
 'Namespace Detail
@@ -252 +251 @@
         If Not IsNothing(a) Then
             If Not IsNothing(messageMap) Then
-                Dim msg = Nothing As Object : msg = New System.UInt32(message)
+                Dim msg = Hex$(message)
                 Dim m = messageMap.Item[msg]
                 If Not IsNothing(m) Then
@@ -439 +438 @@
 End Class
 
-End Namespace 'Forms
 End Namespace 'UI
 End Namespace 'Widnows
 End Namespace 'ActiveBasic
 
-
 '----------
 'テスト実行用
 
-Imports ActiveBasic.Windows.UI.Forms
+Imports ActiveBasic.Windows.UI
 
 'OleInitialize()
@@ -456 +453 @@
     Inherits Form
 Public
-    Sub t()
+    Sub MyForm()
         Dim f = This
         f.AddMessageEvent(WM_DESTROY, AddressOf (f.Destory))
@@ -473 +470 @@
 
 Dim f = New MyForm
-f.t()
 f.Create()
 ShowWindow(f.Handle, SW_SHOW)

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

@@ -7 +7 @@
 Namespace Windows
 Namespace UI
-Namespace Forms
 
 TypeDef EventArgs = System.EventArgs
@@ -511 +510 @@
 Delegate Sub FormClosingEventHandler(sender As Object, e As FormClosingEventArgs)
 
-End Namespace 'Forms
 End Namespace 'UI
 End Namespace 'Widnows

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

@@ -78 +78 @@
 
 MakeControlEvent("Control")
+MakeControlEvent("Form")
 End

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/WindowHandle.sbp

@@ -1 @@
-'Classes/ActiveBasic/Windows/WindowHandle.sbp
+'Classes/ActiveBasic/Windows/UI/WindowHandle.sbp
 
 #ifdef _WIN64
@@ -49 +49 @@
 Namespace ActiveBasic
 Namespace Windows
+Namespace UI
 
 Class WindowHandle
@@ -797 +798 @@
 End Class
 
+End Namespace 'UI
 End Namespace 'Widnows
 End Namespace 'ActiveBasic

trunk/ab5.0/ablib/src/Classes/index.ab

@@ -7 +7 @@
 #require "./ActiveBasic/Strings/Strings.ab"
 #require "./ActiveBasic/Windows/CriticalSection.ab"
-#require "./ActiveBasic/Windows/WindowHandle.sbp"
 #require "./ActiveBasic/Windows/Windows.ab"
+#require "./ActiveBasic/Windows/UI/WindowHandle.sbp"
 #require "./ActiveBasic/Xml/Parser.ab"
 #require "./System/Blittable.ab"
@@ -91 +91 @@
 #require "./System/Threading/Timeout.ab"
 #require "./System/Threading/WaitHandle.ab"
-#require "./System/Windows/Forms/Application.ab"
-#require "./System/Windows/Forms/ContainerControl.ab"
-#require "./System/Windows/Forms/Control.ab"
-#require "./System/Windows/Forms/CreateParams.ab"
-#require "./System/Windows/Forms/Form.ab"
-#require "./System/Windows/Forms/Message.ab"
-#require "./System/Windows/Forms/MessageBox.ab"
-#require "./System/Windows/Forms/misc.ab"
-#require "./System/Windows/Forms/PaintEventArgs.ab"
-#require "./System/Windows/Forms/ScrollableControl.ab"
-#require "./System/Windows/Forms/WebBrowser.ab"
-#require "./System/Windows/Forms/WebBrowserBase.ab"
 #require "./System/Xml/XmlAttribute.ab"
 #require "./System/Xml/XmlCharacterData.ab"