Changeset 473 for trunk/Include/Classes/System/Drawing/Font.ab

Timestamp:

Mar 12, 2008, 9:54:46 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

実験として書いていたControlクラスを追加（せめてコミット前に既存のContorolに混ぜようとしたがコンパイルできなかった）。
ほかForms, Drawing及びGDI+の修正。

File:

• trunk/Include/Classes/System/Drawing/Font.ab (modified) (8 diffs)

trunk/Include/Classes/System/Drawing/Font.ab

@@ -1 @@
-#ifndef _GDIPLUSFONT_H
-#define _GDIPLUSFONT_H
-
-#require <GdiPlus.ab>
-#require <Classes/System/Drawing/misc.ab>
+/**
+@file Classes/System/Drawing/Font.ab
+@brief Fontクラスなどの実装。
+*/
+
 #require <Classes/System/Drawing/Graphics.ab>
 
@@ -10 +10 @@
 
 Class Font
+    Implements System.IDisposable
 Public
 '    friend class Graphics
@@ -130 +131 @@
         /*IN*/ style As Long, /*IN*/ unit As GraphicsUnit,
         /*IN const*/ fontCollection As FontCollection)
-#ifdef __STRING_IS_NOT_UNICODE
-        Dim oldAlloc = _System_AllocForConvertedString
-        _System_AllocForConvertedString = AddressOf (_System_malloc)
-        Dim name = ToWCStr(familyName)
-        Font(name, emSize, style, unit, fontCollection)
-        _System_free(name)
-        _System_AllocForConvertedString = oldAlloc
-#else
-        Font(familyName.Chars, emSize, style, unit, fontCollection)
-#endif
+        Font(ToWCStr(familyName), emSize, style, unit, fontCollection)
     End Sub
 
     Const Function GetLogFontA(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONTA) As Status
         Dim nativeGraphics As *GpGraphics
-        If VarPtr(g) <> 0 Then
+        If Not ActiveBasic.IsNothing(g) Then
             nativeGraphics = g.nativeGraphics
         End If
@@ -152 +144 @@
     Const Function GetLogFontW(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONTW) As Status
         Dim nativeGraphics As *GpGraphics
-        If VarPtr(g) <> 0 Then
+        If Not ActiveBasic.IsNothing(g) Then
             nativeGraphics = g.nativeGraphics
         End If
@@ -160 +152 @@
     Const Function GetLogFont(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONT) As Status
         Dim nativeGraphics As *GpGraphics
-        If VarPtr(g) <> 0 Then
+        If Not ActiveBasic.IsNothing(g) Then
             nativeGraphics = g.nativeGraphics
         End If
@@ -212 +204 @@
     Const Function GetHeight(/*IN const*/ g As Graphics) As Single
         Dim nativeGraphics As *GpGraphics
-        If VarPtr(g) <> 0 Then
+        If Not ActiveBasic.IsNothing(g) Then
             nativeGraphics = g.NativeGraphics
         End If
@@ -270 +262 @@
     'Const Function SizeInPoint() As Boolean
 
-    Const Function NativeFont() As *GpFont
-        Return nativeFont
-    End Function
-
     Const Function StrikeOut() As Boolean
         Dim lf As LOGFONT
@@ -341 +329 @@
     /*mutable*/ lastResult As Status
 End Class
-
-#endif