Changeset 642 for trunk

Timestamp:

Oct 17, 2008, 12:45:59 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

CheckBoxとButtonBaseクラスを追加。

Location:

trunk/ab5.0/ablib

Files:

• TestCase/UI_Sample/mouse_watcher.ab (modified) (5 diffs)
• src/Classes/ActiveBasic/Windows/UI/Button.ab (modified) (2 diffs)
• src/Classes/ActiveBasic/Windows/UI/ButtonBase.ab (added)
• src/Classes/ActiveBasic/Windows/UI/CheckBox.ab (added)

trunk/ab5.0/ablib/TestCase/UI_Sample/mouse_watcher.ab

@@ -2 +2 @@
 #require <Classes/ActiveBasic/Windows/UI/ListBox.ab>
 #require <Classes/ActiveBasic/Windows/UI/Application.ab>
+#require <Classes/ActiveBasic/Windows/UI/CheckBox.ab>
 
 #resource "UI_Sample.rc"
@@ -43 +44 @@
         End With
 
+        checkBoxShowMoveEvent = New CheckBox
+        With checkBoxShowMoveEvent
+            .Create(This, 0, 0, 0)
+            .Move(320, 60, 200, 20)
+            .Text = "Moveイベントを表示する"
+            .SendMessage(WM_SETFONT, wpFont, 0)
+        End With
+
         Show(SW_SHOWDEFAULT)
     End Sub
@@ -51 +60 @@
         list.Items.Clear()
         LockWindowUpdate(0)
+        checkBoxShowMoveEvent.AutoCheck = False
     End Sub
 
@@ -66 +76 @@
 
     Sub OnMouseMove(sender As Object, e As MouseArgs)
-        OnMouseEvent("Move", e)
+        If checkBoxShowMoveEvent.Checked Then
+            OnMouseEvent("Move", e)
+        End If
     End Sub
 
@@ -98 +110 @@
     list As ListBox
     buttonClear As Button
+    checkBoxShowMoveEvent As CheckBox
 End Class
 

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

@@ -1 +1 @@
 'Classes/ActiveBasic/Windows/UI/Button.ab
 
-#require <Classes/ActiveBasic/Windows/UI/Control.ab>
+#require <Classes/ActiveBasic/Windows/UI/ButtonBase.ab>
 
 Namespace ActiveBasic
@@ -13 +13 @@
 */
 Class Button
-    Inherits WmCommandControl
+    Inherits ButtonBase
 Protected
     Override Sub GetCreateStruct(ByRef cs As CREATESTRUCT)
-        With cs
-            .lpszClass = "BUTTON"
-            .style Or= BS_PUSHBUTTON
-        End With
+        Super.GetCreateStruct(cs)
+        cs.style Or= BS_PUSHBUTTON
     End Sub
 Public
-    Sub RaiseClick()
-        OnClick(Args.Empty)
-    End Sub
-
-    Override Function RaiseCommandEvent(notificationCode As Word) As Boolean
-        Dim lr As LRESULT
-        RaiseCommandEvent = False
-        Select Case notificationCode
-            Case BN_CLICKED
-                RaiseCommandEvent = OnClick(Args.Empty)
-            Case BN_DBLCLK
-                RaiseCommandEvent = OnDoubleClick(Args.Empty)
-            Case BN_SETFOCUS
-                RaiseCommandEvent = ProcessMessage(WM_SETFOCUS, 0, 0, lr)
-            Case BN_KILLFOCUS
-                RaiseCommandEvent = ProcessMessage(WM_KILLFOCUS, 0, 0, lr)
-            'ここに挙げられなかったBNメッセージは、16ビットWindowsとの互換性のためとされているもの。
-        End Select
-    End Function
 
 End Class