Changeset 241 for branch/egtra-gdiplus/Classes/System/Drawing/Color.ab

Timestamp:

May 9, 2007, 10:26:36 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

GDI+に対して名前空間で囲ったものの、現在コンパイルできないため分岐させておく

Location:

branch/egtra-gdiplus

Files:

• . (copied) (copied from Include )
• Classes/System/Drawing/Color.ab (modified) (5 diffs)

branch/egtra-gdiplus/Classes/System/Drawing/Color.ab

@@ -4 +4 @@
 #define __SYSTEM_DRAWING_COLOR_AB__
 
+#include <GdiplusTypes.ab>
 #include <Classes/System/Math.ab>
 #include <Classes/System/Drawing/Imaging/misc.ab>
+
+Namespace System
+Namespace Drawing
 
 Class Color
 Public
     Sub Color()
-        argb = MakeARGB(255, 0, 0, 0) ' Black
-    End Sub
-
-    Sub Color(ByRef c As Color)
-        argb = c.argb
+        argb = MakeARGB(255, 0, 0, 0) 'Black
     End Sub
 
@@ -25 +25 @@
     End Sub
 
-    Sub Color(newArgb As ARGB)
+    Sub Color(newArgb As Gdiplus.ARGB)
         argb = newArgb
     End Sub
-/*
-    Sub Operator =(c As Color)
-        argb = c.argb
-    End Sub
-*/
+
     Function Operator ==(c As Color) As Boolean
         Return Equals(c)
@@ -57 +53 @@
     End Function
 
-    Function Value() As ARGB
+    Function Value() As Gdiplus.ARGB
         Return argb
     End Function
 
-    Sub Value(value As ARGB)
+    Sub Value(value As Gdiplus.ARGB)
         argb = value
     End Sub
@@ -77 +73 @@
     End Function
 
-    Function ToArgb() As ARGB
+    Function ToArgb() As Gdiplus.ARGB
         Return argb
     End Function
 
-    Static Function FromArgb(argb As ARGB) As Color
+    Static Function FromArgb(argb As Gdiplus.ARGB) As Color
         Dim c As Color(argb)
         Rteurn c
@@ -301 +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 Gdiplus.ARGB
+        MakeARGB = (((b As Gdiplus.ARGB) <<  Gdiplus.BLUE_SHIFT) Or _
+                    ((g As Gdiplus.ARGB) << Gdiplus.GREEN_SHIFT) Or _
+                    ((r As Gdiplus.ARGB) <<   Gdiplus.RED_SHIFT) Or _
+                    ((a As Gdiplus.ARGB) << Gdiplus.ALPHA_SHIFT))
     End Function
 
 Protected
-    argb As ARGB
+    argb As Gdiplus.ARGB
 End Class
 
+End Namespace 'Drawing
+End Namespace 'System
+
 #endif '__SYSTEM_DRAWING_COLOR_AB__