Changeset 635 for trunk/ab5.0/ablib/src/Classes/System/Drawing/Color.ab

Timestamp:

Sep 27, 2008, 6:31:26 AM (16 years ago)

Author:

NoWest

Message:

名前空間への入れ忘れの修正と
ConsoleクラスのResetColorのバグへ対応。
正しい動作かご確認ください。

File:

• trunk/ab5.0/ablib/src/Classes/System/Drawing/Color.ab (modified) (5 diffs)

trunk/ab5.0/ablib/src/Classes/System/Drawing/Color.ab

@@ -1 +1 @@
 ' Classes/System/Drawing/Color.ab
 
-#require <Classes/System/Drawing/Imaging/misc.ab>
+Namespace System
+Namespace Drawing
 
 Class Color
@@ -21 +22 @@
     End Sub
 
-    Sub Color(newArgb As ARGB)
+    Sub Color(newArgb As System.Drawing.Imaging.ARGB)
         argb = newArgb
     End Sub
@@ -34 +35 @@
 
     Function A() As Byte
-        A = (argb >> ALPHA_SHIFT) As Byte
+        A = (argb >> System.Drawing.Imaging.ALPHA_SHIFT) As Byte
     End Function
 
     Function R() As Byte
-        R = (argb >> RED_SHIFT) As Byte
+        R = (argb >> System.Drawing.Imaging.RED_SHIFT) As Byte
     End Function
 
     Function G() As Byte
-        G = (argb >> GREEN_SHIFT) As Byte
+        G = (argb >> System.Drawing.Imaging.GREEN_SHIFT) As Byte
     End Function
 
     Function B() As Byte
-        B = (argb >> BLUE_SHIFT) As Byte
-    End Function
-
-    Function Value() As ARGB
+        B = (argb >> System.Drawing.Imaging.BLUE_SHIFT) As Byte
+    End Function
+
+    Function Value() As System.Drawing.Imaging.ARGB
         Value = argb
     End Function
 
-    Sub Value(value As ARGB)
+    Sub Value(value As System.Drawing.Imaging.ARGB)
         argb = value
     End Sub
@@ -73 +74 @@
     End Function
 */
-    Static Function FromArgb(argb As ARGB) As Color
+    Static Function FromArgb(argb As System.Drawing.Imaging.ARGB) As Color
         Return New Color(argb)
     End Function
@@ -296 +297 @@
     End Enum
 */
-    Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As ARGB
-        MakeARGB = (((b As ARGB) <<  BLUE_SHIFT) Or _
-                    ((g As ARGB) << GREEN_SHIFT) Or _
-                    ((r As ARGB) <<   RED_SHIFT) Or _
-                    ((a As ARGB) << ALPHA_SHIFT))
+    Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As System.Drawing.Imaging.ARGB
+        MakeARGB = (((b As System.Drawing.Imaging.ARGB) <<  System.Drawing.Imaging.BLUE_SHIFT) Or _
+                    ((g As System.Drawing.Imaging.ARGB) << System.Drawing.Imaging.GREEN_SHIFT) Or _
+                    ((r As System.Drawing.Imaging.ARGB) <<   System.Drawing.Imaging.RED_SHIFT) Or _
+                    ((a As System.Drawing.Imaging.ARGB) << System.Drawing.Imaging.ALPHA_SHIFT))
     End Function
 
 Protected
-    argb As ARGB
+    argb As System.Drawing.Imaging.ARGB
 End Class
+
+End Namespace
+End Namespace