Changeset 212 for Include/Classes/System


Ignore:
Timestamp:
Apr 13, 2007, 5:12:31 PM (18 years ago)
Author:
イグトランス (egtra)
Message:

Object.ReferenceEqualsを追加

Location:
Include/Classes/System
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • Include/Classes/System/Drawing/Color.ab

    r166 r212  
    66#include <Classes/System/Math.ab>
    77#include <Classes/System/Drawing/Imaging/misc.ab>
    8 
    9 Const Enum ColorChannelFlags
    10     ColorChannelFlagsC = 0
    11     ColorChannelFlagsM
    12     ColorChannelFlagsY
    13     ColorChannelFlagsK
    14     ColorChannelFlagsLast
    15 End Enum
    168
    179Class Color
    … …  
    3628        argb = newArgb
    3729    End Sub
    38 
     30/*
    3931    Sub Operator =(c As Color)
    4032        argb = c.argb
    4133    End Sub
    42 
     34*/
    4335    Function Operator ==(c As Color) As Boolean
    4436        Return Equals(c)

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

    r142 r212  
    4646    End Sub
    4747
    48     Sub Font(/*IN const*/ ByRef family As FontFamily, /*IN*/ emSize As Single)
     48    Sub Font(/*IN const*/ family As FontFamily, /*IN*/ emSize As Single)
    4949        Font(family, emSize, FontStyleRegular, UnitPoint)
    5050    End Sub
    5151
    52     Sub Font(/*IN const*/ ByRef family As FontFamily,
     52    Sub Font(/*IN const*/ family As FontFamily,
    5353        /*IN*/ emSize As Single, /*IN*/ style As Long)
    5454
    … …  
    5656    End Sub
    5757
    58     Sub Font(/*IN const*/ ByRef family As FontFamily, /*IN*/ emSize As Single,
     58    Sub Font(/*IN const*/ family As FontFamily, /*IN*/ emSize As Single,
    5959        /*IN*/ style As Long, /*IN*/ unit As GraphicsUnit)
    6060
    … …  
    129129    Sub Font(/*IN const*/ familyName As String, /*IN*/ emSize As Single,
    130130        /*IN*/ style As Long, /*IN*/ unit As GraphicsUnit,
    131         /*IN const*/ ByRef fontCollection As FontCollection)
     131        /*IN const*/ fontCollection As FontCollection)
    132132#ifdef __STRING_IS_NOT_UNICODE
    133133        Dim oldAlloc = _System_AllocForConvertedString
    … …  
    142142    End Sub
    143143
    144     Const Function GetLogFontA(/*IN const*/ ByRef g As Graphics, /*OUT*/ ByRef lf As LOGFONTA) As Status
     144    Const Function GetLogFontA(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONTA) As Status
    145145        Dim nativeGraphics As *GpGraphics
    146146        If VarPtr(g) <> 0 Then
    … …  
    150150    End Function
    151151
    152     Const Function GetLogFontW(/*IN const*/ ByRef g As Graphics, /*OUT*/ ByRef lf As LOGFONTW) As Status
     152    Const Function GetLogFontW(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONTW) As Status
    153153        Dim nativeGraphics As *GpGraphics
    154154        If VarPtr(g) <> 0 Then
    … …  
    158158    End Function
    159159
    160     Const Function GetLogFont(/*IN const*/ ByRef g As Graphics, /*OUT*/ ByRef lf As LOGFONTA) As Status
     160    Const Function GetLogFont(/*IN const*/ g As Graphics, /*OUT*/ ByRef lf As LOGFONT) As Status
    161161        Dim nativeGraphics As *GpGraphics
    162162        If VarPtr(g) <> 0 Then
    … …  
    170170    End Function
    171171
    172     Const Function Clone() As *Font
     172    Const Function Clone() As Font
    173173        Dim cloneFont = 0 As *GpFont
    174174        SetStatus(GdipCloneFont(nativeFont, cloneFont))
    … …  
    210210    End Function
    211211
    212     Const Function GetHeight(/*IN const*/ ByRef g As Graphics) As Single
     212    Const Function GetHeight(/*IN const*/ g As Graphics) As Single
    213213        Dim nativeGraphics As *GpGraphics
    214214        If VarPtr(g) <> 0 Then
    … …  
    311311    End Sub
    312312
    313     Const Sub ToLogFont(ByRef lf As LOGFONT, ByRef g As Graphics)
     313    Const Sub ToLogFont(ByRef lf As LOGFONT, g As Graphics)
    314314        GetLogFont(g, lf)
    315315    End Sub
    316 
    317316
    318317Private
    319318'   Sub Font(ByRef f As Font)
    320     Sub Operator =(ByRef f As Font)
    321         Debug
    322     End Sub
    323319
    324320Protected

  • Include/Classes/System/Drawing/Graphics.ab

    r104 r212  
    3737    '=========================================================================
    3838    Const Function Clip() As Region
    39         Dim r As Regino
     39        Dim r As Region
    4040        GetClip(r)
    4141        Return r
    4242    End Function
    4343
    44     Sub Clip(ByRef region As /*Const*/ Region)
     44    Sub Clip(region As /*Const*/ Region)
    4545        SetClip(region, CombineMode.Replace)
    4646    End Sub
    … …  
    172172    End Function
    173173
    174     Sub Transform(ByRef matrix As Matrix)
     174    Sub Transform(matrix As Matrix)
    175175        SetTransform(matirx)
    176176    End Sub
    … …  
    185185    ' Methods
    186186    '=========================================================================
    187     Static Function FromHDC(hdc As HDC) As *Graphics
     187    Static Function FromHDC(hdc As HDC) As Graphics
    188188        Return New Graphics(hdc)
    189189    End Function
    190190
    191     Static Function FromHDC(hdc As HDC, hdevice As HANDLE) As *Graphics
     191    Static Function FromHDC(hdc As HDC, hdevice As HANDLE) As Graphics
    192192        Return New Graphics(hdc, hdevice)
    193193    End Function
    194194
    195     Static Function FromHWND(hwnd As HWND) As *Graphics
     195    Static Function FromHWND(hwnd As HWND) As Graphics
    196196        Return New Graphics(hwnd, FALSE)
    197197    End Function
    198198
    199     Static Function FromHWND(hwnd As DWord, icm As BOOL) As *Graphics
     199    Static Function FromHWND(hwnd As DWord, icm As BOOL) As Graphics
    200200        Return New Graphics(hwnd, icm)
    201201    End Function
    202202
    203     Static Function FromImage(image As *Image) As *Graphics
     203    Static Function FromImage(image As Image) As Graphics
    204204        Return New Graphics(image)
    205205    End Function
    206206
    207207    Sub Graphics(hdc As HDC)
    208         Dim graphics = 0 As *GpGraphics
     208        Dim graphics = 0 As GpGraphics
    209209        lastResult = GdipCreateFromHDC(hdc, graphics)
    210210        SetNativeGraphics(graphics)
    … …  
    233233    End Sub
    234234
    235     Sub Graphics(image As *Image)
     235    Sub Graphics(image As Image)
    236236        Dim graphics = 0 As *GpGraphics
    237237        If (image != 0)
    … …  
    277277    End Function
    278278
    279     Const Function GetRenderingOrigin(ByRef x As Long, ByRef y As Long) As Status
     279    Const Function GetRenderingOrigin(x As Long, y As Long) As Status
    280280        Return SetStatus(GdipGetRenderingOrigin(nativeGraphics, x, y))
    281281    End Function
    … …  
    355355    '------------------------------------------------------------------------
    356356
    357     Function SetTransform(ByRef matrix As /*Const*/ *Matrix) As Status
     357    Function SetTransform(matrix As /*Const*/ *Matrix) As Status
    358358        Return SetStatus(GdipSetWorldTransform(nativeGraphics, matrix->nativeMatrix))
    359359    End Function
    … …  
    363363    End Function
    364364
    365     Function MultiplyTransform(ByRef matrix As /*Const*/ Matrix) As Status
     365    Function MultiplyTransform(matrix As /*Const*/ Matrix) As Status
    366366        Return SetStatus(GdipMultiplyWorldTransform(nativeGraphics, matrix->nativeMatrix, MatrixOrder.Prepend))
    367367    End Function
    368368
    369     Function MultiplyTransform(ByRef matrix As /*Const*/ Matrix, order As MatrixOrder) As Status
     369    Function MultiplyTransform(matrix As /*Const*/ Matrix, order As MatrixOrder) As Status
    370370        Return SetStatus(GdipMultiplyWorldTransform(nativeGraphics, matrix->nativeMatrix, order))
    371371    End Function
    … …  
    395395    End Function
    396396
    397     Const Function GetTransform(ByRef matrix As Matrix) As Status
     397    Const Function GetTransform(matrix As Matrix) As Status
    398398        Return SetStatus(GdipGetWorldTransform(nativeGraphics, matrix->nativeMatrix))
    399399    End Function
    … …  
    411411    '------------------------------------------------------------------------
    412412
    413     Const Function GetNearestColor(ByRef color As Color) As Status
     413    Const Function GetNearestColor(color As Color) As Status
    414414        Dim argb = color->Value
    415415        Dim status = SetStatus(GdipGetNearestColor(nativeGraphics, argb))
    … …  
    418418    End Function
    419419
    420     Function DrawLine(ByRef pen As /*Const*/ Pen, x1 As Single, y1 As Single, x2 As Single, y2 As Single) As Status
     420    Function DrawLine(pen As /*Const*/ Pen, x1 As Single, y1 As Single, x2 As Single, y2 As Single) As Status
    421421        Return SetStatus(GdipDrawLine(nativeGraphics, pen->nativePen, x1, y1, x2, y2))
    422422    End Function
    423423
    424     Function DrawLine(ByRef pen As /*Const*/ Pen, ByRef pt1 As /*Const*/ PointF, ByRef pt2 As /*Const*/ PointF) As Status
     424    Function DrawLine(pen As /*Const*/ Pen, pt1 As /*Const*/ PointF, pt2 As /*Const*/ PointF) As Status
    425425        Return DrawLine(pen, pt1.X, pt1.Y, pt2.X, pt2.Y)
    426426    End Function
    427427
    428     Function DrawLines(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
     428    Function DrawLines(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
    429429        Return SetStatus(GdipDrawLines(nativeGraphics, pen->nativePen, points, count))
    430430    End Function
    431431
    432     Function DrawLine(ByRef pen As /*Const*/ Pen, x1 As Long, y1 As Long, x2 As Long, y2 As Long) As Status
     432    Function DrawLine(pen As /*Const*/ Pen, x1 As Long, y1 As Long, x2 As Long, y2 As Long) As Status
    433433        Return SetStatus(GdipDrawLineI(nativeGraphics, pen->nativePen, x1, y1, x2, y2))
    434434    End Function
    435435
    436     Function DrawLine(ByRef pen As /*Const*/ Pen, ByRef pt1 As /*Const*/ Point, ByRef pt2 As /*Const*/ Point) As Status
     436    Function DrawLine(pen As /*Const*/ Pen, pt1 As /*Const*/ Point, pt2 As /*Const*/ Point) As Status
    437437        Return DrawLine(pen, pt1.X, pt1.Y, pt2.X, pt2.Y)
    438438    End Function
    439439
    440     Function DrawLines(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
     440    Function DrawLines(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
    441441        Return SetStatus(GdipDrawLinesI(nativeGraphics, pen->nativePen, points, count))
    442442    End Function
    443443
    444     Function DrawArc(ByRef pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
     444    Function DrawArc(pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
    445445        Return SetStatus(GdipDrawArc(nativeGraphics, pen->nativePen, x, y, width, height, startAngle, sweepAngle))
    446446    End Function
    447447
    448     Function DrawArc(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
     448    Function DrawArc(pen As /*Const*/ Pen, rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
    449449        Return DrawArc(pen, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    450450    End Function
    451451
    452     Function DrawArc(ByRef pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
     452    Function DrawArc(pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
    453453        Return SetStatus(GdipDrawArcI(nativeGraphics, pen->nativePen, x, y, width, height, startAngle, sweepAngle))
    454454    End Function
    455455
    456     Function DrawArc(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
     456    Function DrawArc(pen As /*Const*/ Pen, rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
    457457        Return DrawArc(pen, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    458458    End Function
    459459
    460     Function DrawBezier(ByRef pen As /*Const*/ Pen, x1 As Single, y1 As Single, x2 As Single, y2 As Single, x3 As Single, y3 As Single, x4 As Single, y4 As Single) As Status
     460    Function DrawBezier(pen As /*Const*/ Pen, x1 As Single, y1 As Single, x2 As Single, y2 As Single, x3 As Single, y3 As Single, x4 As Single, y4 As Single) As Status
    461461        Return SetStatus(GdipDrawBezier(nativeGraphics, pen->nativePen, x1, y1,x2, y2, x3, y3, x4, y4))
    462462    End Function
    463463
    464     Function DrawBezier(ByRef pen As /*Const*/ Pen, ByRef pt1 As /*Const*/ PointF, ByRef pt2 As /*Const*/ PointF, ByRef pt3 As /*Const*/ PointF, ByRef pt4 As /*Const*/ PointF) As Status
     464    Function DrawBezier(pen As /*Const*/ Pen, pt1 As /*Const*/ PointF, pt2 As /*Const*/ PointF, pt3 As /*Const*/ PointF, pt4 As /*Const*/ PointF) As Status
    465465        Return DrawBezier(pen, pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)
    466466    End Function
    467467
    468     Function DrawBeziers(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
     468    Function DrawBeziers(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
    469469        Return SetStatus(GdipDrawBeziers(nativeGraphics, pen->nativePen, points, count))
    470470    End Function
    471471
    472     Function DrawBezier(ByRef pen As /*Const*/ Pen, x1 As Long, y1 As Long, x2 As Long, y2 As Long, x3 As Long, y3 As Long, x4 As Long, y4 As Long) As Status
     472    Function DrawBezier(pen As /*Const*/ Pen, x1 As Long, y1 As Long, x2 As Long, y2 As Long, x3 As Long, y3 As Long, x4 As Long, y4 As Long) As Status
    473473        Return SetStatus(GdipDrawBezierI(nativeGraphics, pen->nativePen, x1, y1, x2, y2, x3, y3, x4, y4))
    474474    End Function
    475475
    476     Function DrawBezier(ByRef pen As /*Const*/ Pen, ByRef pt1 As /*Const*/ Point, ByRef pt2 As /*Const*/ Point, ByRef pt3 As /*Const*/ Point, ByRef pt4 As /*Const*/ Point) As Status
     476    Function DrawBezier(pen As /*Const*/ Pen, pt1 As /*Const*/ Point, pt2 As /*Const*/ Point, pt3 As /*Const*/ Point, pt4 As /*Const*/ Point) As Status
    477477        Return DrawBezier(pen pt1.X, pt1.Y, pt2.X, pt2.Y, pt3.X, pt3.Y, pt4.X, pt4.Y)
    478478    End Function
    479479
    480     Function DrawBeziers(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
     480    Function DrawBeziers(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
    481481        Return SetStatus(GdipDrawBeziersI(nativeGraphics, pen->nativePen, points, count))
    482482    End Function
    483483
    484     Function DrawRectangle(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ RectangleF) As Status
     484    Function DrawRectangle(pen As /*Const*/ Pen, rect As /*Const*/ RectangleF) As Status
    485485        Return DrawRectangle(pen, rect.X, rect.Y, rect.Width, rect.Height)
    486486    End Function
    487487
    488     Function DrawRectangle(ByRef pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single) As Status
     488    Function DrawRectangle(pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single) As Status
    489489        Return SetStatus(GdipDrawRectangle(nativeGraphics, pen->nativePen, x, y, width, height))
    490490    End Function
    491491
    492     Function DrawRectangles(ByRef pen As /*Const*/ Pen, rects As /*Const*/ *RectangleF, count As Long) As Status
     492    Function DrawRectangles(pen As /*Const*/ Pen, rects As /*Const*/ *RectangleF, count As Long) As Status
    493493        Return SetStatus(GdipDrawRectangles(nativeGraphics, pen->nativePen, rects, count))
    494494    End Function
    495495
    496     Function DrawRectangle(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ Rectangle) As Status
     496    Function DrawRectangle(pen As /*Const*/ Pen, rect As /*Const*/ Rectangle) As Status
    497497        Return DrawRectangle(pen, rect.X, rect.Y, rect.Width, rect.Height)
    498498    End Function
    499499
    500     Function DrawRectangle(ByRef pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long) As Status
     500    Function DrawRectangle(pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long) As Status
    501501        Return SetStatus(GdipDrawRectangleI(nativeGraphics, pen->nativePen, x, y, width, height))
    502502    End Function
    503503
    504     Function DrawRectangles(ByRef pen As /*Const*/ Pen, rects As /*Const*/ *Rectangle,  count As Long) As Status
     504    Function DrawRectangles(pen As /*Const*/ Pen, rects As /*Const*/ *Rectangle,  count As Long) As Status
    505505        Return SetStatus(GdipDrawRectanglesI(nativeGraphics, pen->nativePen, rects, count))
    506506    End Function
    507507
    508     Function DrawEllipse(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ RectangleF) As Status
     508    Function DrawEllipse(pen As /*Const*/ Pen, rect As /*Const*/ RectangleF) As Status
    509509        Return DrawEllipse(pen, rect.X, rect.Y, rect.Width, rect.Height)
    510510    End Function
    511511
    512     Function DrawEllipse(ByRef pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single) As Status
     512    Function DrawEllipse(pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single) As Status
    513513        Return SetStatus(GdipDrawEllipse(nativeGraphics, pen->nativePen, x, y, width, height))
    514514    End Function
    515515
    516     Function DrawEllipse(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ Rectangle) As Status
     516    Function DrawEllipse(pen As /*Const*/ Pen, rect As /*Const*/ Rectangle) As Status
    517517        Return DrawEllipse(pen, rect.X, rect.Y, rect.Width, rect.Height)
    518518    End Function
    519519
    520     Function DrawEllipse(ByRef pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long) As Status
     520    Function DrawEllipse(pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long) As Status
    521521        Return SetStatus(GdipDrawEllipseI(nativeGraphics, pen->nativePen, x, y, width, height))
    522522    End Function
    523523
    524     Function DrawPie(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
     524    Function DrawPie(pen As /*Const*/ Pen, rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
    525525        Return DrawPie(pen, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    526526    End Function
    527527
    528     Function DrawPie(ByRef pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
     528    Function DrawPie(pen As /*Const*/ Pen, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
    529529        Return SetStatus(GdipDrawPie(nativeGraphics, pen->nativePen, x, y, width, height, startAngle, sweepAngle))
    530530    End Function
    531531
    532     Function DrawPie(ByRef pen As /*Const*/ Pen, ByRef rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
     532    Function DrawPie(pen As /*Const*/ Pen, rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
    533533        Return DrawPie(pen, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    534534    End Function
    535535
    536     Function DrawPie(ByRef pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
     536    Function DrawPie(pen As /*Const*/ Pen, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
    537537        Return SetStatus(GdipDrawPieI(nativeGraphics, pen->nativePen, x, y, width, height, startAngle, sweepAngle))
    538538    End Function
    539539
    540     Function DrawPolygon(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
     540    Function DrawPolygon(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
    541541        Return SetStatus(GdipDrawPolygon(nativeGraphics, pen->nativePen, points, count))
    542542    End Function
    543543
    544     Function DrawPolygon(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
     544    Function DrawPolygon(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
    545545        Return SetStatus(GdipDrawPolygonI(nativeGraphics, pen->nativePen, points, count))
    546546    End Function
    547547
    548     Function DrawPath(ByRef pen As /*Const*/ Pen, ByRef path As /*Const*/ GraphicsPath) As Status
     548    Function DrawPath(pen As /*Const*/ Pen, path As /*Const*/ GraphicsPath) As Status
    549549        Return SetStatus(GdipDrawPath(nativeGraphics, pen->nativePen, path->nativePath))
    550550'       Return SetStatus(GdipDrawPath(nativeGraphics, pen ? pen->nativePen : NULL, path ? path->nativePath : NULL))
    551551    End Function
    552552
    553     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
     553    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
    554554        Return SetStatus(GdipDrawCurve(nativeGraphics, pen->nativePen, points, count))
    555555    End Function
    556556
    557     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, tension As Single) As Status
     557    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, tension As Single) As Status
    558558        Return SetStatus(GdipDrawCurve2(nativeGraphics, pen->nativePen, points,count, tension))
    559559    End Function
    560560
    561     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, offset As Long, numberOfSegments As Long) As Status
     561    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, offset As Long, numberOfSegments As Long) As Status
    562562        Return SetStatus(GdipDrawCurve3(nativeGraphics, pen->nativePen, points, count, offset,numberOfSegments, 0.5))
    563563    End Function
    564564
    565     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, offset As Long, numberOfSegments As Long, tension As Single) As Status
     565    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, offset As Long, numberOfSegments As Long, tension As Single) As Status
    566566        Return SetStatus(GdipDrawCurve3(nativeGraphics, pen->nativePen, points, count, offset,numberOfSegments, tension))
    567567    End Function
    568568
    569     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
     569    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
    570570        Return SetStatus(GdipDrawCurveI(nativeGraphics, pen->nativePen, points, count))
    571571    End Function
    572572
    573     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, tension As Single) As Status
     573    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, tension As Single) As Status
    574574        Return SetStatus(GdipDrawCurve2I(nativeGraphics, pen->nativePen, points, count, tension))
    575575    End Function
    576576
    577     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, offset As Long, numberOfSegments As Long) As Status
     577    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, offset As Long, numberOfSegments As Long) As Status
    578578        Return SetStatus(GdipDrawCurve3I(nativeGraphics, pen->nativePen, points, count, offset, numberOfSegments, 0.5))
    579579    End Function
    580580
    581     Function DrawCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, offset As Long, numberOfSegments As Long, tension As Single) As Status
     581    Function DrawCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, offset As Long, numberOfSegments As Long, tension As Single) As Status
    582582        Return SetStatus(GdipDrawCurve3I(nativeGraphics, pen->nativePen, points, count, offset, numberOfSegments, tension))
    583583    End Function
    584584
    585     Function DrawClosedCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
     585    Function DrawClosedCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long) As Status
    586586        Return SetStatus(GdipDrawClosedCurve(nativeGraphics, pen->nativePen, points, count))
    587587    End Function
    588588
    589     Function DrawClosedCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, tension As Single) As Status
     589    Function DrawClosedCurve(pen As /*Const*/ Pen, points As /*Const*/ *PointF, count As Long, tension As Single) As Status
    590590        Return SetStatus(GdipDrawClosedCurve2(nativeGraphics, pen->nativePen, points, count, tension))
    591591    End Function
    592592
    593     Function DrawClosedCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
     593    Function DrawClosedCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long) As Status
    594594        Return SetStatus(GdipDrawClosedCurveI(nativeGraphics, pen->nativePen, points, count))
    595595    End Function
    596596
    597     Function DrawClosedCurve(ByRef pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, tension As Single) As Status
     597    Function DrawClosedCurve(pen As /*Const*/ Pen, points As /*Const*/ *Point, count As Long, tension As Single) As Status
    598598        Return SetStatus(GdipDrawClosedCurve2I(nativeGraphics, pen->nativePen, points, count, tension))
    599599    End Function
    600600
    601     Function Clear(ByRef color As /*Const*/ Color) As Status
     601    Function Clear(color As /*Const*/ Color) As Status
    602602        Return SetStatus(GdipGraphicsClear(nativeGraphics, color.Value))
    603603    End Function
    604604
    605     Function FillRectangle(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ RectangleF) As Status
     605    Function FillRectangle(brush As /*Const*/ Brush, rect As /*Const*/ RectangleF) As Status
    606606        Return FillRectangle(brush, rect.X, rect.Y, rect.Width, rect.Height)
    607607    End Function
    608608
    609     Function FillRectangle(ByRef brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single) As Status
     609    Function FillRectangle(brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single) As Status
    610610        Return SetStatus(GdipFillRectangle(nativeGraphics, brush->nativeBrush, x, y, width, height))
    611611    End Function
    612612
    613     Function FillRectangles(ByRef brush As /*Const*/ Brush, rects As /*Const*/ *RectangleF, count As Long) As Status
     613    Function FillRectangles(brush As /*Const*/ Brush, rects As /*Const*/ *RectangleF, count As Long) As Status
    614614        Return SetStatus(GdipFillRectangles(nativeGraphics,brush->nativeBrush,rects, count))
    615615    End Function
    616616
    617     Function FillRectangle(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ Rectangle) As Status
     617    Function FillRectangle(brush As /*Const*/ Brush, rect As /*Const*/ Rectangle) As Status
    618618        Return FillRectangle(brush, rect.X, rect.Y, rect.Width, rect.Height)
    619619    End Function
    620620
    621     Function FillRectangle(ByRef brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long) As Status
     621    Function FillRectangle(brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long) As Status
    622622        Return SetStatus(GdipFillRectangleI(nativeGraphics, brush->nativeBrush, x, y, width, height))
    623623    End Function
    624624
    625     Function FillRectangles(ByRef brush As /*Const*/ Brush, rects As /*Const*/ *Rectangle, count As Long) As Status
     625    Function FillRectangles(brush As /*Const*/ Brush, rects As /*Const*/ *Rectangle, count As Long) As Status
    626626        Return SetStatus(GdipFillRectanglesI(nativeGraphics, brush->nativeBrush, rects, count))
    627627    End Function
    628628
    629     Function FillPolygon(ByRef brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long) As Status
     629    Function FillPolygon(brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long) As Status
    630630        Return FillPolygon(brush, points, count, FillModeAlternate)
    631631    End Function
    632632
    633     Function FillPolygon(ByRef brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode) As Status
     633    Function FillPolygon(brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode) As Status
    634634        Return SetStatus(GdipFillPolygon(nativeGraphics, brush->nativeBrush, points, count, fillMode))
    635635    End Function
    636636
    637     Function FillPolygon(ByRef brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long) As Status
     637    Function FillPolygon(brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long) As Status
    638638        Return FillPolygon(brush, points, count, FillModeAlternate)
    639639    End Function
    640640
    641     Function FillPolygon(ByRef brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode) As Status
     641    Function FillPolygon(brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode) As Status
    642642        Return SetStatus(GdipFillPolygonI(nativeGraphics, brush->nativeBrush, points, count, fillMode))
    643643    End Function
    644644
    645     Function FillEllipse(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ RectangleF) As Status
     645    Function FillEllipse(brush As /*Const*/ Brush, rect As /*Const*/ RectangleF) As Status
    646646        Return FillEllipse(brush, rect.X, rect.Y, rect.Width, rect.Height)
    647647    End Function
    648648
    649     Function FillEllipse(ByRef brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single) As Status
     649    Function FillEllipse(brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single) As Status
    650650        Return SetStatus(GdipFillEllipse(nativeGraphics, brush->nativeBrush, x, y, width, height))
    651651    End Function
    652652
    653     Function FillEllipse(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ Rectangle) As Status
     653    Function FillEllipse(brush As /*Const*/ Brush, rect As /*Const*/ Rectangle) As Status
    654654        Return FillEllipse(brush, rect.X, rect.Y, rect.Width, rect.Height)
    655655    End Function
    656656
    657     Function FillEllipse(ByRef brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long) As Status
     657    Function FillEllipse(brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long) As Status
    658658        Return SetStatus(GdipFillEllipseI(nativeGraphics, brush->nativeBrush, x, y, width, height))
    659659    End Function
    660660
    661     Function FillPie(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
     661    Function FillPie(brush As /*Const*/ Brush, rect As /*Const*/ RectangleF, startAngle As Single, sweepAngle As Single) As Status
    662662        Return FillPie(brush, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    663663    End Function
    664664
    665     Function FillPie(ByRef brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
     665    Function FillPie(brush As /*Const*/ Brush, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single) As Status
    666666        Return SetStatus(GdipFillPie(nativeGraphics, brush->nativeBrush, x, y, width, height, startAngle, sweepAngle))
    667667    End Function
    668668
    669     Function FillPie(ByRef brush As /*Const*/ Brush, ByRef rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
     669    Function FillPie(brush As /*Const*/ Brush, rect As /*Const*/ Rectangle, startAngle As Single, sweepAngle As Single) As Status
    670670        Return FillPie(brush, rect.X, rect.Y, rect.Width, rect.Height, startAngle, sweepAngle)
    671671    End Function
    672672
    673     Function FillPie(ByRef brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
     673    Function FillPie(brush As /*Const*/ Brush, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single) As Status
    674674        Return SetStatus(GdipFillPieI(nativeGraphics, brush->nativeBrush, x, y, width, height, startAngle, sweepAngle))
    675675    End Function
    676676
    677     Function FillPath(ByRef brush As /*Const*/ Brush, ByRef path As /*Const*/ GraphicsPath) As Status
     677    Function FillPath(brush As /*Const*/ Brush, path As /*Const*/ GraphicsPath) As Status
    678678        Return SetStatus(GdipFillPath(nativeGraphics, brush->nativeBrush, path->nativePath))
    679679    End Function
    680680
    681     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long) As Status
     681    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long) As Status
    682682        Return SetStatus(GdipFillClosedCurve(nativeGraphics, brush->nativeBrush, points, count))
    683683    End Function
    684684
    685     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode) As Status
     685    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode) As Status
    686686        Return SetStatus(GdipFillClosedCurve2(nativeGraphics, brush->nativeBrush, points, count, 0.5, fillMode))
    687687    End Function
    688688
    689     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode, tension As Single) As Status
     689    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *PointF, count As Long, fillMode As FillMode, tension As Single) As Status
    690690        Return SetStatus(GdipFillClosedCurve2(nativeGraphics, brush->nativeBrush, points, count, tension, fillMode))
    691691    End Function
    692692
    693     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long) As Status
     693    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long) As Status
    694694        Return SetStatus(GdipFillClosedCurveI(nativeGraphics, brush->nativeBrush, points, count))
    695695    End Function
    696696
    697     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode) As Status
     697    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode) As Status
    698698        Return SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush->nativeBrush, points, count, 0.5, fillMode))
    699699    End Function
    700700
    701     Function FillClosedCurve(ByRef brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode, tension As Single) As Status
     701    Function FillClosedCurve(brush As /*Const*/ Brush, points As /*Const*/ *Point, count As Long, fillMode As FillMode, tension As Single) As Status
    702702        Return SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush->nativeBrush, points, count, tension, fillMode))
    703703    End Function
    704704
    705     Function FillRegion(ByRef brush As /*Const*/ Brush, ByRef region As /*Const*/ Region) As Status
     705    Function FillRegion(brush As /*Const*/ Brush, region As /*Const*/ Region) As Status
    706706        Return SetStatus(GdipFillRegion(nativeGraphics, brush->nativeBrush, region->nativeRegion))
    707707    End Function
    708708
    709     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ RectangleF) As Status
     709    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ RectangleF) As Status
    710710        Dim nativeFont As *GpFont
    711711        If VarPtr(font) <> 0 Then
    … …  
    717717    End Function
    718718
    719     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ Rectangle,
    720         ByRef stringFormat As /*Const*/ StringFormat, ByRef brush As /*Const*/ Brush) As Status
     719    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ Rectangle,
     720        stringFormat As /*Const*/ StringFormat, brush As /*Const*/ Brush) As Status
    721721
    722722        Dim nativeFont As *GpFont
    … …  
    735735    End Function
    736736
    737     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ RectangleF,
    738         ByRef stringFormat As /*Const*/ StringFormat, ByRef brush As /*Const*/ Brush) As Status
     737    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ RectangleF,
     738        stringFormat As /*Const*/ StringFormat, brush As /*Const*/ Brush) As Status
    739739
    740740        Dim nativeFont As *GpFont
    … …  
    759759    End Function
    760760
    761     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef origin As /*Const*/ Point) As Status
     761    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, origin As /*Const*/ Point) As Status
    762762        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    763763        Dim nativeFont As *GpFont
    … …  
    770770    End Function
    771771
    772     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef origin As /*Const*/ PointF,
    773         ByRef brush As /*Const*/ Brush) As Status
     772    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, origin As /*Const*/ PointF,
     773        brush As /*Const*/ Brush) As Status
    774774
    775775        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    … …  
    789789    End Function
    790790
    791     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef origin As /*Const*/ PointF) As Status
     791    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, origin As /*Const*/ PointF) As Status
    792792        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    793793        Dim nativeFont As *GpFont
    … …  
    800800    End Function
    801801
    802     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef origin As /*Const*/ PointF,
    803         ByRef stringFormat As /*Const*/ StringFormat) As Status
     802    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, origin As /*Const*/ PointF,
     803        stringFormat As /*Const*/ StringFormat) As Status
    804804
    805805        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    … …  
    819819    End Function
    820820
    821     Function DrawString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef origin As /*Const*/ PointF,
    822         ByRef stringFormat As /*Const*/ StringFormat, ByRef brush As /*Const*/ Brush) As Status
     821    Function DrawString(str As PCWSTR, length As Long, font As /*Const*/ Font, origin As /*Const*/ PointF,
     822        stringFormat As /*Const*/ StringFormat, brush As /*Const*/ Brush) As Status
    823823
    824824        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    … …  
    843843    End Function
    844844
    845     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ RectangleF,
    846         ByRef stringFormat As /*Const*/ StringFormat, ByRef boundingBox As RectangleF) As Status
     845    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ RectangleF,
     846        stringFormat As /*Const*/ StringFormat, boundingBox As RectangleF) As Status
    847847
    848848        Return MeasureString(str, length, font, layoutRect, stringFormat, boundingBox, ByVal 0, ByVal 0)
    849849    End Function
    850850
    851     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ RectangleF,
    852         ByRef stringFormat As /*Const*/ StringFormat, ByRef boundingBox As RectangleF,
    853         ByRef codepointsFitted As Long) As Status
     851    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ RectangleF,
     852        stringFormat As /*Const*/ StringFormat, boundingBox As RectangleF,
     853        codepointsFitted As Long) As Status
    854854
    855855        Return MeasureString(str, length, font, layoutRect, stringFormat, boundingBox, codepointsFitted, ByVal 0)
    856856    End Function
    857857
    858     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font, ByRef layoutRect As /*Const*/ RectangleF,
    859         ByRef stringFormat As /*Const*/ StringFormat, ByRef boundingBox As RectangleF,
    860         ByRef codepointsFitted As Long, ByRef linesFilled As Long) As Status
     858    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font, layoutRect As /*Const*/ RectangleF,
     859        stringFormat As /*Const*/ StringFormat, boundingBox As RectangleF,
     860        codepointsFitted As Long, linesFilled As Long) As Status
    861861
    862862        Dim nativeFont As *GpFont
    … …  
    876876    End Function
    877877
    878     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    879         ByRef layoutRectSize As /*Const*/ SizeF, ByRef stringFormat As /*Const*/ StringFormat,
    880         ByRef size As SizeF) As Status
     878    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     879        layoutRectSize As /*Const*/ SizeF, stringFormat As /*Const*/ StringFormat,
     880        size As SizeF) As Status
    881881
    882882            Return MeasureString(str, length, font, layoutRectSize, stringFormat, size, ByVal 0, ByVal 0)
    883883    End Function
    884884
    885     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    886         ByRef layoutRectSize As /*Const*/ SizeF, ByRef stringFormat As /*Const*/ StringFormat,
    887         ByRef size As SizeF, ByRef codepointsFitted As Long) As Status
     885    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     886        layoutRectSize As /*Const*/ SizeF, stringFormat As /*Const*/ StringFormat,
     887        size As SizeF, codepointsFitted As Long) As Status
    888888
    889889            Return MeasureString(str, length, font, layoutRectSize, stringFormat, size, codepointsFitted, ByVal 0)
    890890    End Function
    891891
    892     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    893         ByRef layoutRectSize As /*Const*/ SizeF, ByRef stringFormat As /*Const*/ StringFormat,
    894         ByRef size As SizeF, ByRef codepointsFitted As Long, ByRef linesFilled As Long) As Status
     892    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     893        layoutRectSize As /*Const*/ SizeF, stringFormat As /*Const*/ StringFormat,
     894        size As SizeF, codepointsFitted As Long, linesFilled As Long) As Status
    895895
    896896        Dim layoutRect As RectangleF(0, 0, layoutRectSize.Width, layoutRectSize.Height)
    … …  
    925925    End Function
    926926
    927     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    928         ByRef origin As /*Const*/ PointF, ByRef stringFormat As /*Const*/ StringFormat,
    929         ByRef boundingBox As RectangleF) As Status
     927    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     928        origin As /*Const*/ PointF, stringFormat As /*Const*/ StringFormat,
     929        boundingBox As RectangleF) As Status
    930930
    931931        Dim rect As RectangleF(origin.X, origin.Y, 0.0f, 0.0f)
    … …  
    946946    End Function
    947947
    948     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    949         ByRef layoutRect As /*Const*/ RectangleF, ByRef boundingBox As RectangleF) As Status
     948    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     949        layoutRect As /*Const*/ RectangleF, boundingBox As RectangleF) As Status
    950950
    951951        Dim nativeFont As *GpFont
    … …  
    959959    End Function
    960960
    961     Const Function MeasureString(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    962         ByRef origin As /*Const*/ PointF, ByRef boundingBox As RectangleF) As Status
     961    Const Function MeasureString(str As PCWSTR, length As Long, font As /*Const*/ Font,
     962        origin As /*Const*/ PointF, boundingBox As RectangleF) As Status
    963963        Dim rect As RectangleF(origin.X, origin.Y, 0.0, 0.0)
    964964
    … …  
    972972    End Function
    973973
    974     Const Function MeasureCharacterRanges(str As PCWSTR, length As Long, ByRef font As /*Const*/ Font,
    975         ByRef layoutRect As /*Const*/ RectangleF, ByRef stringFormat As /*Const*/ StringFormat,
     974    Const Function MeasureCharacterRanges(str As PCWSTR, length As Long, font As /*Const*/ Font,
     975        layoutRect As /*Const*/ RectangleF, stringFormat As /*Const*/ StringFormat,
    976976        regionCount As Long, regions As *Region) As Status
    977977        If regions = 0 Or regionCount <= 0 Then
    … …  
    10091009    End Function
    10101010
    1011     Function DrawDriverString(text As /*Const*/ Word, length As Long, ByRef font As /*Const*/ Font,
    1012         ByRef brush As /*Const*/ Brush, positions As /*Const*/ *PointF, flags As Long) As Status
     1011    Function DrawDriverString(text As /*Const*/ Word, length As Long, font As /*Const*/ Font,
     1012        brush As /*Const*/ Brush, positions As /*Const*/ *PointF, flags As Long) As Status
    10131013
    10141014        Return DrawDriverString(text, length, font, brush, positions, flags, ByVal 0)
    10151015    End Function
    10161016
    1017     Function DrawDriverString(text As /*Const*/ Word, length As Long, ByRef font As /*Const*/ Font,
    1018         ByRef brush As /*Const*/ Brush, positions As /*Const*/ *PointF, flags As Long, ByRef matrix As /*Const*/ Matrix) As Status
     1017    Function DrawDriverString(text As /*Const*/ Word, length As Long, font As /*Const*/ Font,
     1018        brush As /*Const*/ Brush, positions As /*Const*/ *PointF, flags As Long, matrix As /*Const*/ Matrix) As Status
    10191019
    10201020        Dim nativeFont As *GpFont
    … …  
    10391039    End Function
    10401040
    1041     Const Function MeasureDriverString(text As /*Const*/ Word, length As Long, ByRef font As /*Const*/ Font,
    1042         positions As /*Const*/ *PointF, flags As Long, ByRef matrix As /*Const*/ Matrix, ByRef boundingBox As RectangleF) As Status
     1041    Const Function MeasureDriverString(text As /*Const*/ Word, length As Long, font As /*Const*/ Font,
     1042        positions As /*Const*/ *PointF, flags As Long, matrix As /*Const*/ Matrix, boundingBox As RectangleF) As Status
    10431043
    10441044        Dim nativeFont As *GpFont
    … …  
    10611061    ' native format differs from this Graphics.
    10621062
    1063     Function DrawCachedBitmap(ByRef cb As CachedBitmap, x As Long, y As Long) As Status
     1063    Function DrawCachedBitmap(cb As CachedBitmap, x As Long, y As Long) As Status
    10641064        Return SetStatus(GdipDrawCachedBitmap(nativeGraphics, cb->nativeCachedBitmap, x, y))
    10651065    End Function
    10661066
    1067     Function DrawImage(ByRef image As Image, ByRef point As /*Const*/ PointF) As Status
     1067    Function DrawImage(image As Image, point As /*Const*/ PointF) As Status
    10681068        Return DrawImage(image, point.X, point.Y)
    10691069    End Function
    10701070
    1071     Function DrawImage(ByRef image As Image, x As Single, y As Single) As Status
     1071    Function DrawImage(image As Image, x As Single, y As Single) As Status
    10721072        Dim nativeImage As *GpImage
    10731073        If VarPtr(image) <> 0 Then
    … …  
    10791079    End Function
    10801080
    1081     Function DrawImage(ByRef image As Image, ByRef rect As /*Const*/ RectangleF) As Status
     1081    Function DrawImage(image As Image, rect As /*Const*/ RectangleF) As Status
    10821082        Return DrawImage(image, rect.X, rect.Y, rect.Width, rect.Height)
    10831083    End Function
    10841084
    1085     Function DrawImage(ByRef image As Image, x As Single, y As Single, width As Single, height As Single) As Status
     1085    Function DrawImage(image As Image, x As Single, y As Single, width As Single, height As Single) As Status
    10861086        Dim nativeImage As *GpImage
    10871087        If VarPtr(image) <> 0 Then
    … …  
    10931093    End Function
    10941094
    1095     Function DrawImage(ByRef image As Image, ByRef point As /*Const*/ Point) As Status
     1095    Function DrawImage(image As Image, point As /*Const*/ Point) As Status
    10961096        Return DrawImage(image, point.X, point.Y) As Status
    10971097    End Function
    10981098
    1099     Function DrawImage(ByRef image As Image, x As Long, y As Long) As Status
     1099    Function DrawImage(image As Image, x As Long, y As Long) As Status
    11001100        Dim nativeImage As *GpImage
    11011101        If VarPtr(image) <> 0 Then
    … …  
    11071107    End Function
    11081108
    1109     Function DrawImage(ByRef image As Image, ByRef rect As /*Const*/ Rectangle) As Status
     1109    Function DrawImage(image As Image, rect As /*Const*/ Rectangle) As Status
    11101110        Return DrawImage(image, rect.X, rect.Y, rect.Width, rect.Height)
    11111111    End Function
    11121112
    1113     Function DrawImage(ByRef image As Image, x As Long, y As Long, width As Long, height As Long) As Status
     1113    Function DrawImage(image As Image, x As Long, y As Long, width As Long, height As Long) As Status
    11141114        Dim nativeImage As *GpImage
    11151115        If VarPtr(image) <> 0 Then
    … …  
    11291129    '      destPoints[3] <=> bottom-right corner
    11301130
    1131     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ PointF, count As Long) As Status
     1131    Function DrawImage(image As Image, destPoints As /*Const*/ PointF, count As Long) As Status
    11321132        If count <> 3 And count <> 4 Then
    11331133            Return SetStatus(InvalidParameter)
    … …  
    11431143    End Function
    11441144
    1145     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ Point, count As Long) As Status
     1145    Function DrawImage(image As Image, destPoints As /*Const*/ Point, count As Long) As Status
    11461146        If count <> 3 And count <> 4 Then
    11471147            Return SetStatus(InvalidParameter)
    … …  
    11571157    End Function
    11581158
    1159     Function DrawImage(ByRef image As Image, x As Single, y As Single,
     1159    Function DrawImage(image As Image, x As Single, y As Single,
    11601160        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit) As Status
    11611161
    … …  
    11691169    End Function
    11701170
    1171     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ RectangleF,
     1171    Function DrawImage(image As Image, destRect As /*Const*/ RectangleF,
    11721172        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit) As Status
    11731173
    … …  
    11751175    End Function
    11761176
    1177     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ RectangleF,
     1177    Function DrawImage(image As Image, destRect As /*Const*/ RectangleF,
    11781178        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1179         ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1179        imageAttributes As /*Const*/ ImageAttributes) As Status
    11801180
    11811181        Return DrawImage(image, destRect, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, 0, 0)
    11821182    End Function
    11831183
    1184     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ RectangleF,
     1184    Function DrawImage(image As Image, destRect As /*Const*/ RectangleF,
    11851185        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1186         ByRef imageAttributes As /*Const*/ ImageAttributes,
     1186        imageAttributes As /*Const*/ ImageAttributes,
    11871187        callback As DrawImageAbort) As Status
    11881188
    … …  
    11901190    End Function
    11911191
    1192     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ RectangleF,
     1192    Function DrawImage(image As Image, destRect As /*Const*/ RectangleF,
    11931193        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1194         ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1194        imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    11951195
    11961196        Dim nativeImage As *GpImage
    … …  
    12121212    End Function
    12131213
    1214     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ PointF, count As Long,
     1214    Function DrawImage(image As Image, destPoints As /*Const*/ PointF, count As Long,
    12151215        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit) As Status
    12161216
    … …  
    12181218    End Function
    12191219
    1220     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ PointF, count As Long,
     1220    Function DrawImage(image As Image, destPoints As /*Const*/ PointF, count As Long,
    12211221        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1222         ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1222        imageAttributes As /*Const*/ ImageAttributes) As Status
    12231223
    12241224        Return DrawImage(image, destPoints, count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, 0, 0)
    12251225    End Function
    12261226
    1227     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ PointF, count As Long,
     1227    Function DrawImage(image As Image, destPoints As /*Const*/ PointF, count As Long,
    12281228        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1229         ByRef imageAttributes As /*Const*/ ImageAttributes,
     1229        imageAttributes As /*Const*/ ImageAttributes,
    12301230        callback As DrawImageAbort) As Status
    12311231
    … …  
    12331233    End Function
    12341234
    1235     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ PointF, count As Long,
     1235    Function DrawImage(image As Image, destPoints As /*Const*/ PointF, count As Long,
    12361236        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1237         ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1237        imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    12381238
    12391239        Dim nativeImage As *GpImage
    … …  
    12541254    End Function
    12551255
    1256     Function DrawImage(ByRef image As Image, x As Long, y As Long,
     1256    Function DrawImage(image As Image, x As Long, y As Long,
    12571257        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit) As Status
    12581258
    … …  
    12661266    End Function
    12671267
    1268     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ Rectangle,
     1268    Function DrawImage(image As Image, destRect As /*Const*/ Rectangle,
    12691269        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit) As Status
    12701270
    … …  
    12721272    End Function
    12731273
    1274     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ Rectangle,
     1274    Function DrawImage(image As Image, destRect As /*Const*/ Rectangle,
    12751275        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1276         ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1276        imageAttributes As /*Const*/ ImageAttributes) As Status
    12771277
    12781278        Return DrawImage(image, destRect, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, 0, 0)
    12791279    End Function
    12801280
    1281     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ Rectangle,
     1281    Function DrawImage(image As Image, destRect As /*Const*/ Rectangle,
    12821282        srcx As Single, srcy As Single, srcwidth As Single, srcheight As Single, srcUnit As GraphicsUnit,
    1283         ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
     1283        imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
    12841284
    12851285        Return DrawImage(image, destRect, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, 0)
    12861286    End Function
    12871287
    1288     Function DrawImage(ByRef image As Image, ByRef destRect As /*Const*/ Rectangle,
     1288    Function DrawImage(image As Image, destRect As /*Const*/ Rectangle,
    12891289        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit,
    1290         ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1290        imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    12911291
    12921292        Dim nativeImage As *GpImage
    … …  
    13081308    End Function
    13091309
    1310     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ Point, count As Long,
     1310    Function DrawImage(image As Image, destPoints As /*Const*/ Point, count As Long,
    13111311        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit) As Status
    13121312
    … …  
    13141314    End Function
    13151315
    1316     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ Point, count As Long,
     1316    Function DrawImage(image As Image, destPoints As /*Const*/ Point, count As Long,
    13171317        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit,
    1318         ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1318        imageAttributes As /*Const*/ ImageAttributes) As Status
    13191319
    13201320        Return DrawImage(image, destPoints, count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, 0, 0)
    13211321    End Function
    13221322
    1323     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ Point, count As Long, _
     1323    Function DrawImage(image As Image, destPoints As /*Const*/ Point, count As Long, _
    13241324        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit, _
    1325         ByRef imageAttributes As /*Const*/ ImageAttributes,
     1325        imageAttributes As /*Const*/ ImageAttributes,
    13261326        callback As DrawImageAbort) As Status
    13271327
    … …  
    13291329    End Function
    13301330
    1331     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ Point, count As Long,
     1331    Function DrawImage(image As Image, destPoints As /*Const*/ Point, count As Long,
    13321332        srcx As Long, srcy As Long, srcwidth As Long, srcheight As Long, srcUnit As GraphicsUnit,
    1333         ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1333        imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    13341334
    13351335        Dim nativeImage As *GpImage
    … …  
    13501350    End Function
    13511351
    1352     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As Rectangle, srcUnit As GraphicsUnit) As Status
     1352    Function DrawImage(image As Image, destPoints As /*Const*/ *Point, count As Long, srcRect As Rectangle, srcUnit As GraphicsUnit) As Status
    13531353        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit)
    13541354    End Function
    13551355
    1356     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As RectangleF, srcUnit As GraphicsUnit) As Status
     1356    Function DrawImage(image As Image, destPoints As /*Const*/ *PointF, count As Long, srcRect As RectangleF, srcUnit As GraphicsUnit) As Status
    13571357        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit)
    13581358    End Function
    13591359
    1360     Function DrawImage(ByRef image As Image, x As Long, y As Long, ByRef srcRect As Rectangle, srcUnit As GraphicsUnit) As Status
     1360    Function DrawImage(image As Image, x As Long, y As Long, srcRect As Rectangle, srcUnit As GraphicsUnit) As Status
    13611361        Return DrawImage(image, x, y, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit)
    13621362    End Function
    13631363
    1364     Function DrawImage(ByRef image As Image, x As Single, y As Single, ByRef srcRect As RectangleF, srcUnit As GraphicsUnit) As Status
     1364    Function DrawImage(image As Image, x As Single, y As Single, srcRect As RectangleF, srcUnit As GraphicsUnit) As Status
    13651365        Return DrawImage(image, x, y, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit)
    13661366    End Function
    13671367
    1368     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As Rectangle, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1368    Function DrawImage(image As Image, destPoints As /*Const*/ *Point, count As Long, srcRect As Rectangle, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes) As Status
    13691369        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes)
    13701370    End Function
    13711371
    1372     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As RectangleF, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1372    Function DrawImage(image As Image, destPoints As /*Const*/ *PointF, count As Long, srcRect As RectangleF, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes) As Status
    13731373        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes)
    13741374    End Function
    13751375
    1376     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As Rectangle, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
     1376    Function DrawImage(image As Image, destPoints As /*Const*/ *Point, count As Long, srcRect As Rectangle, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
    13771377        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes, callback)
    13781378    End Function
    13791379
    1380     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As RectangleF, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
     1380    Function DrawImage(image As Image, destPoints As /*Const*/ *PointF, count As Long, srcRect As RectangleF, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort) As Status
    13811381        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes, callback)
    13821382    End Function
    13831383
    1384     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As Rectangle, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1384    Function DrawImage(image As Image, destPoints As /*Const*/ *Point, count As Long, srcRect As Rectangle, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    13851385        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes, callback, callbackData)
    13861386    End Function
    13871387
    1388     Function DrawImage(ByRef image As Image, destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As RectangleF, srcUnit As GraphicsUnit, ByRef imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
     1388    Function DrawImage(image As Image, destPoints As /*Const*/ *PointF, count As Long, srcRect As RectangleF, srcUnit As GraphicsUnit, imageAttributes As /*Const*/ ImageAttributes, callback As DrawImageAbort, callbackData As VoidPtr) As Status
    13891389        Return DrawImage(image, destPoints, count, srcRect.X, srcRect.Y, srcRect.Width, srcRect.Height, srcUnit, imageAttributes, callback, callbackData)
    13901390    End Function
    … …  
    13961396    ' to play the particular record.
    13971397
    1398     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ PointF,
     1398    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ PointF,
    13991399        callback As EnumerateMetafileProc) As Status
    14001400
    … …  
    14021402    End Function
    14031403
    1404     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ PointF,
     1404    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ PointF,
    14051405        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    14061406
    … …  
    14081408    End Function
    14091409
    1410     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ PointF,
    1411         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1410    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ PointF,
     1411        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    14121412
    14131413        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    14281428    End Function
    14291429
    1430     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ Point,
     1430    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ Point,
    14311431        callback As EnumerateMetafileProc) As Status
    14321432
    … …  
    14341434    End Function
    14351435
    1436     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ Point,
     1436    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ Point,
    14371437        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    14381438
    … …  
    14401440    End Function
    14411441
    1442     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destPoint As /*Const*/ Point,
    1443         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1442    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoint As /*Const*/ Point,
     1443        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    14441444
    14451445        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    14601460    End Function
    14611461
    1462     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ RectangleF,
     1462    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ RectangleF,
    14631463        callback As EnumerateMetafileProc) As Status
    14641464
    … …  
    14661466    End Function
    14671467
    1468     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ RectangleF,
     1468    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ RectangleF,
    14691469        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    14701470
    … …  
    14721472    End Function
    14731473
    1474     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ RectangleF,
    1475         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1474    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ RectangleF,
     1475        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    14761476
    14771477        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    14921492    End Function
    14931493
    1494     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ Rectangle,
     1494    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ Rectangle,
    14951495        callback As EnumerateMetafileProc) As Status
    14961496
    … …  
    14981498    End Function
    14991499
    1500     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ Rectangle,
     1500    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ Rectangle,
    15011501        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    15021502
    … …  
    15041504    End Function
    15051505
    1506     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, ByRef destRect As /*Const*/ Rectangle,
    1507         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1506    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destRect As /*Const*/ Rectangle,
     1507        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    15081508
    15091509        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    15241524    End Function
    15251525
    1526     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
     1526    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
    15271527        callback As EnumerateMetafileProc) As Status
    15281528
    … …  
    15301530    End Function
    15311531
    1532     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
     1532    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
    15331533        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    15341534
    … …  
    15361536    End Function
    15371537
    1538     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
    1539         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1538    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *PointF, count As Long,
     1539        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    15401540
    15411541        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    15561556    End Function
    15571557
    1558     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
     1558    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
    15591559        callback As EnumerateMetafileProc) As Status
    15601560
    … …  
    15621562    End Function
    15631563
    1564     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
     1564    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
    15651565        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    15661566
    … …  
    15681568    End Function
    15691569
    1570     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
    1571         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1570    Function EnumerateMetafile(metafile As /*Const*/ Metafile, destPoints As /*Const*/ *Point, count As Long,
     1571        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    15721572
    15731573        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    15881588    End Function
    15891589
    1590     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile,
    1591         ByRef destPoint As /*Const*/ PointF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
     1590    Function EnumerateMetafile(metafile As /*Const*/ Metafile,
     1591        destPoint As /*Const*/ PointF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
    15921592        callback As EnumerateMetafileProc) As Status
    15931593
    … …  
    15951595    End Function
    15961596
    1597     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile,
    1598         ByRef destPoint As /*Const*/ PointF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
     1597    Function EnumerateMetafile(metafile As /*Const*/ Metafile,
     1598        destPoint As /*Const*/ PointF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
    15991599        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    16001600
    … …  
    16021602    End Function
    16031603
    1604     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile,
    1605         ByRef destPoint As /*Const*/ PointF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
    1606         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1604    Function EnumerateMetafile(metafile As /*Const*/ Metafile,
     1605        destPoint As /*Const*/ PointF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit,
     1606        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    16071607
    16081608        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    16231623    End Function
    16241624
    1625     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1626         ByRef destPoint As /*Const*/ Point, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1625    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1626        destPoint As /*Const*/ Point, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    16271627        callback As EnumerateMetafileProc) As Status
    16281628
    … …  
    16301630    End Function
    16311631
    1632     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1633         ByRef destPoint As /*Const*/ Point, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1632    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1633        destPoint As /*Const*/ Point, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    16341634        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    16351635
    … …  
    16371637    End Function
    16381638
    1639     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1640         ByRef destPoint As /*Const*/ Point, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    1641         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1639    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1640        destPoint As /*Const*/ Point, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1641        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    16421642
    16431643        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    16581658    End Function
    16591659
    1660     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1661         ByRef destRect As /*Const*/ RectangleF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1660    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1661        destRect As /*Const*/ RectangleF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    16621662        callback As EnumerateMetafileProc) As Status
    16631663
    … …  
    16651665    End Function
    16661666
    1667     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1668         ByRef destRect As /*Const*/ RectangleF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1667    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1668        destRect As /*Const*/ RectangleF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    16691669        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    16701670
    … …  
    16721672    End Function
    16731673
    1674     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1675         ByRef destRect As /*Const*/ RectangleF, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    1676         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1674    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1675        destRect As /*Const*/ RectangleF, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1676        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    16771677
    16781678        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    16931693    End Function
    16941694
    1695     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1696         ByRef destRect As /*Const*/ Rectangle, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1695    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1696        destRect As /*Const*/ Rectangle, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    16971697        callback As EnumerateMetafileProc) As Status
    16981698
    … …  
    17001700    End Function
    17011701
    1702     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1703         ByRef destRect As /*Const*/ Rectangle, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1702    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1703        destRect As /*Const*/ Rectangle, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    17041704        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    17051705
    … …  
    17071707    End Function
    17081708
    1709     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1710         ByRef destRect As /*Const*/ Rectangle, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    1711         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1709    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1710        destRect As /*Const*/ Rectangle, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1711        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    17121712
    17131713        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    17281728    End Function
    17291729
    1730     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1731         destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1730    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1731        destPoints As /*Const*/ *PointF, count As Long, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    17321732        callback As EnumerateMetafileProc) As Status
    17331733
    … …  
    17351735    End Function
    17361736
    1737     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1738         destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1737    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1738        destPoints As /*Const*/ *PointF, count As Long, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    17391739        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    17401740
    … …  
    17421742    End Function
    17431743
    1744     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1745         destPoints As /*Const*/ *PointF, count As Long, ByRef srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
    1746         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1744    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1745        destPoints As /*Const*/ *PointF, count As Long, srcRect As /*Const*/ RectangleF, srcUnit As GraphicsUnit, _
     1746        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    17471747
    17481748        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    17631763    End Function
    17641764
    1765     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1766         destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1765    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1766        destPoints As /*Const*/ *Point, count As Long, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    17671767        callback As EnumerateMetafileProc) As Status
    17681768
    … …  
    17701770    End Function
    17711771
    1772     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1773         destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1772    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1773        destPoints As /*Const*/ *Point, count As Long, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    17741774        callback As EnumerateMetafileProc, callbackData As VoidPtr) As Status
    17751775
    … …  
    17771777    End Function
    17781778
    1779     Function EnumerateMetafile(ByRef metafile As /*Const*/ Metafile, _
    1780         destPoints As /*Const*/ *Point, count As Long, ByRef srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
    1781         callback As EnumerateMetafileProc, callbackData As VoidPtr, ByRef imageAttributes As /*Const*/ ImageAttributes) As Status
     1779    Function EnumerateMetafile(metafile As /*Const*/ Metafile, _
     1780        destPoints As /*Const*/ *Point, count As Long, srcRect As /*Const*/ Rectangle, srcUnit As GraphicsUnit, _
     1781        callback As EnumerateMetafileProc, callbackData As VoidPtr, imageAttributes As /*Const*/ ImageAttributes) As Status
    17821782
    17831783        Dim nativeImage As /*Const*/ *GpMetafile
    … …  
    17981798    End Function
    17991799
    1800     Function SetClip(ByRef g As /*Const*/ Graphics) As Status
     1800    Function SetClip(g As /*Const*/ Graphics) As Status
    18011801        Return SetClip(g, CombineMode.Replace)
    18021802    End Function
    18031803
    1804     Function SetClip(ByRef rc As /*Const*/ RectangleF) As Status
     1804    Function SetClip(rc As /*Const*/ RectangleF) As Status
    18051805        Return SetStatus(GdipSetClipRect(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Replace))
    18061806    End Function
    18071807
    1808     Function SetClip(ByRef rc As /*Const*/ Rectangle) As Status
     1808    Function SetClip(rc As /*Const*/ Rectangle) As Status
    18091809        Return SetStatus(GdipSetClipRectI(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Replace))
    18101810    End Function
    18111811
    1812     Function SetClip(ByRef path As /*Const*/ GraphicsPath) As Status
     1812    Function SetClip(path As /*Const*/ GraphicsPath) As Status
    18131813        Return SetStatus(GdipSetClipPath(nativeGraphics, path->nativePath, CombineMode.Replace))
    18141814    End Function
    18151815
    1816     Function SetClip(ByRef region As /*Const*/ Region) As Status
     1816    Function SetClip(region As /*Const*/ Region) As Status
    18171817        Return SetStatus(GdipSetClipRegion(nativeGraphics, region->nativeRegion, CombineMode.Replace))
    18181818    End Function
    18191819
    1820     Function SetClip(ByRef g As /*Const*/ Graphics, combineMode As CombineMode) As Status
     1820    Function SetClip(g As /*Const*/ Graphics, combineMode As CombineMode) As Status
    18211821        Return SetStatus(GdipSetClipGraphics(nativeGraphics, g->nativeGraphics, combineMode))
    18221822    End Function
    18231823
    1824     Function SetClip(ByRef rc As /*Const*/ RectangleF, combineMode As CombineMode) As Status
     1824    Function SetClip(rc As /*Const*/ RectangleF, combineMode As CombineMode) As Status
    18251825        Return SetStatus(GdipSetClipRect(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, combineMode))
    18261826    End Function
    18271827
    1828     Function SetClip(ByRef rc As /*Const*/ Rectangle, combineMode As CombineMode) As Status
     1828    Function SetClip(rc As /*Const*/ Rectangle, combineMode As CombineMode) As Status
    18291829        Return SetStatus(GdipSetClipRectI(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, combineMode))
    18301830    End Function
    18311831
    1832     Function SetClip(ByRef path As /*Const*/ GraphicsPath, combineMode As CombineMode) As Status
     1832    Function SetClip(path As /*Const*/ GraphicsPath, combineMode As CombineMode) As Status
    18331833        Return SetStatus(GdipSetClipPath(nativeGraphics, path->nativePath, combineMode))
    18341834    End Function
    18351835
    1836     Function SetClip(ByRef region As /*Const*/ Region, combineMode As CombineMode) As Status
     1836    Function SetClip(region As /*Const*/ Region, combineMode As CombineMode) As Status
    18371837        Return SetStatus(GdipSetClipRegion(nativeGraphics, region->nativeRegion, combineMode))
    18381838    End Function
    … …  
    18461846    End Function
    18471847
    1848     Function IntersectClip(ByRef rc As /*Const*/ RectangleF) As Status
     1848    Function IntersectClip(rc As /*Const*/ RectangleF) As Status
    18491849        Return SetStatus(GdipSetClipRect(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Intersect))
    18501850    End Function
    18511851
    1852     Function IntersectClip(ByRef rc As /*Const*/ Rectangle) As Status
     1852    Function IntersectClip(rc As /*Const*/ Rectangle) As Status
    18531853        Return SetStatus(GdipSetClipRectI(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Intersect))
    18541854    End Function
    18551855
    1856     Function IntersectClip(ByRef region As /*Const*/ Region) As Status
     1856    Function IntersectClip(region As /*Const*/ Region) As Status
    18571857        Return SetStatus(GdipSetClipRegion(nativeGraphics, region->nativeRegion, CombineMode.Intersect))
    18581858    End Function
    18591859
    1860     Function ExcludeClip(ByRef rc As /*Const*/ RectangleF) As Status
     1860    Function ExcludeClip(rc As /*Const*/ RectangleF) As Status
    18611861        Return SetStatus(GdipSetClipRect(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Exclude))
    18621862    End Function
    18631863
    1864     Function ExcludeClip(ByRef rc As /*Const*/ Rectangle) As Status
     1864    Function ExcludeClip(rc As /*Const*/ Rectangle) As Status
    18651865        Return SetStatus(GdipSetClipRectI(nativeGraphics, rc.X, rc.Y, rc.Width, rc.Height, CombineMode.Exclude))
    18661866    End Function
    18671867
    1868     Function ExcludeClip(ByRef region As /*Const*/ Region) As Status
     1868    Function ExcludeClip(region As /*Const*/ Region) As Status
    18691869        Return SetStatus(GdipSetClipRegion(nativeGraphics, region->nativeRegion, CombineMode.Exclude))
    18701870    End Function
    … …  
    18821882    End Function
    18831883
    1884     Const Function GetClip(ByRef region As Region) As Status
     1884    Const Function GetClip(region As Region) As Status
    18851885        Return SetStatus(GdipGetClip(nativeGraphics, region->nativeRegion))
    18861886    End Function
    18871887
    1888     Const Function GetClipBounds(ByRef rc As RectangleF) As Status
     1888    Const Function GetClipBounds(rc As RectangleF) As Status
    18891889        Return SetStatus(GdipGetClipBounds(nativeGraphics, rc))
    18901890    End Function
    18911891
    1892     Const Function GetClipBounds(ByRef rc As Rectangle) As Status
     1892    Const Function GetClipBounds(rc As Rectangle) As Status
    18931893        Return SetStatus(GdipGetClipBoundsI(nativeGraphics, rc))
    18941894    End Function
    18951895
    1896     Const Function GetVisibleClipBounds(ByRef rc As RectangleF) As Status
     1896    Const Function GetVisibleClipBounds(rc As RectangleF) As Status
    18971897        Return SetStatus(GdipGetVisibleClipBounds(nativeGraphics, rc))
    18981898    End Function
    18991899
    1900     Const Function GetVisibleClipBounds(ByRef rc As Rectangle) As Status
     1900    Const Function GetVisibleClipBounds(rc As Rectangle) As Status
    19011901        Return SetStatus(GdipGetVisibleClipBoundsI(nativeGraphics, rc))
    19021902    End Function
    … …  
    19081908    End Function
    19091909
    1910     Const Function IsVisible(ByRef pt As /*Const*/ Point) As BOOL
     1910    Const Function IsVisible(pt As /*Const*/ Point) As BOOL
    19111911        Return IsVisible(pt.X, pt.Y)
    19121912    End Function
    … …  
    19181918    End Function
    19191919
    1920     Const Function IsVisible(ByRef rc As /*Const*/ Rectangle) As BOOL
     1920    Const Function IsVisible(rc As /*Const*/ Rectangle) As BOOL
    19211921        Return IsVisible(rc.X, rc.Y, rc.Width, rc.Height)
    19221922    End Function
    … …  
    19281928    End Function
    19291929
    1930     Const Function IsVisible(ByRef point As /*Const*/ PointF) As BOOL
     1930    Const Function IsVisible(point As /*Const*/ PointF) As BOOL
    19311931        Return IsVisible(pt.X, pt.Y)
    19321932    End Function
    … …  
    19381938    End Function
    19391939
    1940     Const Function IsVisible(ByRef rect As /*Const*/ RectangleF) As BOOL
     1940    Const Function IsVisible(rect As /*Const*/ RectangleF) As BOOL
    19411941        Return IsVisible(rc.X, rc.Y, rc.Width, rc.Height)
    19421942    End Function
    … …  
    19521952    End Function
    19531953
    1954     Function BeginContainer(ByRef dstrect As /*Const*/ RectangleF, ByRef srcrect As /*Const*/ RectangleF, unit As GraphicsUnit) As GraphicsContainer
     1954    Function BeginContainer(dstrect As /*Const*/ RectangleF, srcrect As /*Const*/ RectangleF, unit As GraphicsUnit) As GraphicsContainer
    19551955        Dim state As GraphicsContainer
    19561956        SetStatus(GdipBeginContainer(nativeGraphics, dstrect, srcrect, unit, state))
    … …  
    19581958    End Function
    19591959
    1960     Function BeginContainer(ByRef dstrect As /*Const*/ Rectangle, ByRef srcrect As /*Const*/ Rectangle, unit As GraphicsUnit) As GraphicsContainer
     1960    Function BeginContainer(dstrect As /*Const*/ Rectangle, srcrect As /*Const*/ Rectangle, unit As GraphicsUnit) As GraphicsContainer
    19611961        Dim state As GraphicsContainer
    19621962        SetStatus(GdipBeginContainerI(nativeGraphics, dstrect, srcrect, unit, state))
    … …  
    19911991
    19921992Private
    1993 '   Sub Graphics(ByRef gr As Graphics)
     1993'   Sub Graphics(gr As Graphics)
    19941994'       Debug
    19951995'   End Sub
    1996     Sub Operator =(ByRef gr As Graphics)
     1996    Sub Operator =(gr As Graphics)
    19971997        Debug
    19981998    End Sub

  • Include/Classes/System/Drawing/Imaging/misc.ab

    r77 r212  
    429429End Type
    430430
     431Enum ColorChannelFlag
     432    ColorChannelC = 0
     433    ColorChannelM
     434    ColorChannelY
     435    ColorChannelK
     436    ColorChannelLast
     437End Enum
     438
    431439#endif '__SYSTEM_DRAWING_IMAGING_MISC_AB__

  • Include/Classes/System/Drawing/Point.ab

    r166 r212  
    2020    End Sub
    2121
    22     Sub Point(ByRef pt As Point)
     22    Sub Point(pt As Point)
    2323        x = pt.x
    2424        y = pt.y
    … …  
    5252
    5353    Function IsEmpty() As Boolean
    54         If x = 0 And y = 0 Then
    55             Return _System_TRUE
    56         Else
    57             Return _System_FALSE
    58         End If
     54        Return x = 0 And y = 0
    5955    End Function
    60 
     56/*
    6157    Sub Operator = (ByRef pt As Point)
    6258        x = pt.x
    6359        y = pt.y
    6460    End Sub
    65 
     61*/
    6662    Function Operator + (pt As Point) As Point
    6763        Return Add(This, pt)
    … …  
    119115
    120116    Function Equals(pt As Point) As Boolean
    121         If x = pt.x And y = pt.y Then
    122             Equals = _System_TRUE
    123         Else
    124             Equals = _System_FALSE
    125         End If
     117        Return x = pt.x And y = pt.y
    126118    End Function
    127119
    … …  
    145137    End Function
    146138
     139    Function Operator () As PointF
     140        Return Return PointF(X, Y)
     141    End Function
     142
    147143Private
    148144    x As Long

  • Include/Classes/System/Drawing/PointF.ab

    r166 r212  
    1919    End Sub
    2020
    21     Sub PointF(ByRef pt As PointF)
     21    Sub PointF(pt As PointF)
    2222        x = pt.x
    2323        y = pt.y
    2424    End Sub
    2525
    26     Sub PointF(ByRef sz As SizeF)
     26    Sub PointF(sz As SizeF)
    2727        x = sz.Width
    2828        y = sz.Height
    … …  
    4646
    4747    Function IsEmpty() As Boolean
    48         If x = 0 And y = 0 Then
    49             Return _System_TRUE
    50         Else
    51             Return _System_FALSE
    52         End If
     48        Return x = 0 And y = 0
    5349    End Function
    54 
     50/*
    5551    Sub Operator = (ByRef pt As PointF)
    5652        x = pt.x
    5753        y = pt.y
    5854    End Sub
    59 
    60     Function Operator () As PointF
    61         Dim ptf As PointF(X, Y)
    62         Return ptf
    63     End Function
    64 
     55*/
    6556    Function Operator + (pt As PointF) As PointF
    6657        Return Add(This, pt)
    … …  
    126117
    127118    Function Equals(pt As PointF) As Boolean
    128         If x = pt.x And y = pt.y Then
    129             Equals = _System_TRUE
    130         Else
    131             Equals = _System_FALSE
    132         End If
     119        Return x = pt.x And y = pt.y
    133120    End Function
    134121
    135122    Override Function GetHashCode() As Long
    136         Return GetDWord(VarPtr(x)) Xor _System_BSwap(GetDWord(VarPtr(x)))
     123        Return (GetDWord(VarPtr(x)) Xor _System_BSwap(GetDWord(VarPtr(x)))) As Long
    137124    End Function
    138125

  • Include/Classes/System/Drawing/Rectangle.ab

    r166 r212  
    4848    End Function
    4949
    50     Sub Location(ByRef point As Point)
     50    Sub Location(point As Point)
    5151        x = point.X
    5252        y = point.Y
    … …  
    5757    End Function
    5858
    59     Sub Size(ByRef size As Size)
     59    Sub Size(size As Size)
    6060        width = size.Width
    6161        height = size.Height
    … …  
    117117        End If
    118118    End Function
    119 
    120     Function Operator = (ByRef rc As Rectangle)
     119/*
     120    Function Operator = (rc As Rectangle)
    121121        With rc
    122122            x = .x
    … …  
    126126        End With
    127127    End Function
    128 
    129     Function Operator == (ByRef rc As Rectangle)
     128*/
     129    Function Operator == (rc As Rectangle)
    130130        Return Equals(rc)
    131131    End Function
    132132
    133     Function Operator <> (ByRef rc As Rectangle)
     133    Function Operator <> (rc As Rectangle)
    134134        Return Not Equals(rc)
    135135    End Function
    136136
    137137    Function Operator () As RectangleF
    138         Dim r As RectangleF(x, y, width, height)
    139         Return r
    140     End Function
    141 
    142     Function Equals(ByRef rc As Rectangle) As Boolean
     138        Return New RectangleF(x, y, width, height)
     139    End Function
     140
     141    Function Equals(rc As Rectangle) As Boolean
    143142        If X = rc.X And Y = rc.Y And Width = rc.Width And Height = rc.Height Then
    144             Equals = _System_TRUE
    145         Else
    146             Equals = _System_FALSE
     143            Return True
     144        Else
     145            Return False
    147146        End If
    148147    End Function
    … …  
    153152
    154153    Static Function FromLTRB(l As Long, t As Long, r As Long, b As Long) As Rectangle
    155         Dim rect As Rectangle(l, t, r - l, r - b)
    156         return rect
     154        return New Rectangle(l, t, r - l, r - b)
    157155    End Function
    158156
    159157    Function Contains(x As Long, y As Long) As Boolean
    160158        If x >= X And x < X + Width And y >= Y And y < Y + Height Then
    161             Contains = _System_TRUE
    162         Else
    163             Contains = _System_FALSE
    164         End If
    165     End Function
    166 
    167     Function Contains(ByRef pt As Point) As Boolean
    168         ContainsPTF = Contains(pt.X, pt.Y)
    169     End Function
    170 
    171     Function Contains(ByRef rc As Rectangle) As Boolean
     159            Return True
     160        Else
     161            Return False
     162        End If
     163    End Function
     164
     165    Function Contains(pt As Point) As Boolean
     166        Return Contains(pt.X, pt.Y)
     167    End Function
     168
     169    Function Contains(rc As Rectangle) As Boolean
    172170        If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
    173             ContainsRCF = _System_TRUE
    174         Else
    175             ContainsRCF = _System_FALSE
     171            Return True
     172        Else
     173            Return False
    176174        End If
    177175    End Function
    … …  
    188186    End Sub
    189187
    190     Static Function Inflate(ByRef rc As Rectangle, x As Long, y As Long) As Rectangle
    191         Inflate = rc
     188    Static Function Inflate(rc As Rectangle, x As Long, y As Long) As Rectangle
     189        Inflate = New Rectangle(rc)
    192190        Inflate.Inflate(x, y)
    193191    End Function
    194192
    195     Sub Intersect(ByRef rect As Rectangle)
     193    Sub Intersect(rect As Rectangle)
    196194        This = Rectangle.Intersect(This, rect)
    197195    End Sub
    198196
    199     Static Function Intersect(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
     197    Static Function Intersect(a As Rectangle, ByRef b As Rectangle) As Rectangle
    200198        Dim right As Long, bottom As Long, left As Long, top As Long
    201199        right = Math.Min(a.Right, b.Right)
    … …  
    206204    End Function
    207205
    208     Function IntersectsWith(ByRef rc As Rectangle) As Boolean
     206    Function IntersectsWith(rc As Rectangle) As Boolean
    209207        If Left < rc.Right And _
    210208            Top < rc.Bottom And _
    211209            Right > rc.Left And _
    212210            Bottom > rc.Top Then
    213             IntersectsWith = _System_TRUE
    214         Else
    215             IntersectsWith = _System_FALSE
    216         End If
    217     End Function
    218 
    219     Static Function Union(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
     211            Return True
     212        Else
     213            Return False
     214        End If
     215    End Function
     216
     217    Static Function Union(a As Rectangle, b As Rectangle) As Rectangle
    220218        Dim right As Long, bottom As Long, left As Long, top As Long
    221219        right = Math.Max(a.Right(), b.Right())

  • Include/Classes/System/Drawing/RectangleF.ab

    r166 r212  
    3131    End Sub
    3232
    33     Sub RectangleF(ByRef rc As RectangleF)
     33    Sub RectangleF(rc As RectangleF)
    3434        x = rc.x
    3535        y = rc.y
    … …  
    4343    End Function
    4444
    45     Sub Location(ByRef point As PointF)
     45    Sub Location(point As PointF)
    4646        x = point.X
    4747        y = point.Y
    … …  
    5252    End Function
    5353
    54     Sub Size(ByRef size As SizeF)
     54    Sub Size(size As SizeF)
    5555        width = size.Width
    5656        height = size.Height
    … …  
    112112        End If
    113113    End Function
    114 
     114/*
    115115    Function Operator =(ByRef rc As RectangleF)
    116116        With rc
    … …  
    121121        End With
    122122    End Function
    123 
    124     Function Operator ==(ByRef rc As RectangleF)
     123*/
     124    Function Operator ==(rc As RectangleF)
    125125        Return Equals(rc)
    126126    End Function
    127127
    128     Function Operator <>(ByRef rc As RectangleF)
     128    Function Operator <>(rc As RectangleF)
    129129        Return Not Equals(rc)
    130130    End Function
    131131
    132     Function Equals(ByRef rc As RectangleF) As Boolean
     132    Function Equals(rc As RectangleF) As Boolean
    133133        If X = rc.X And Y = rc.Y And Width = rc.Width And Height = rc.Height Then
    134             Equals = _System_TRUE
    135         Else
    136             Equals = _System_FALSE
     134            Return True
     135        Else
     136            Return False
    137137        End If
    138138    End Function
    … …  
    143143
    144144    Static Function FromLTRB(l As Single, t As Single, r As Single, b As Single) As RectangleF
    145         Dim rect As RectangleF(l, t, r - l, b - t)
    146         return rect
     145        return New RectangleF(l, t, r - l, b - t)
    147146    End Function
    148147
    … …  
    155154    End Function
    156155
    157     Function Contains(ByRef pt As PointF) As Boolean
    158         ContainsPTF = Contains(pt.X, pt.Y)
    159     End Function
    160 
    161     Function Contains(ByRef rc As RectangleF) As Boolean
     156    Function Contains(pt As PointF) As Boolean
     157        Return Contains(pt.X, pt.Y)
     158    End Function
     159
     160    Function Contains(rc As RectangleF) As Boolean
    162161        If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
    163             ContainsRCF = _System_TRUE
    164         Else
    165             ContainsRCF = _System_FALSE
     162            Return True
     163        Else
     164            Return False
    166165        End If
    167166    End Function
    … …  
    178177    End Sub
    179178
    180     Static Function Inflate(ByRef rc As RectangleF, x As Single, y As Single) As RectangleF
    181         Inflate = rc
     179    Static Function Inflate(rc As RectangleF, x As Single, y As Single) As RectangleF
     180        Inflate = New Rectangle(rc)
    182181        Inflate.Inflate(x, y)
    183182    End Function
    184183
    185     Sub Intersect(ByRef rect As RectangleF)
     184    Sub Intersect(rect As RectangleF)
    186185        This = RectangleF.Intersect(This, rect)
    187186    End Sub
    188187   
    189     Static Function Intersect(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
     188    Static Function Intersect(a As RectangleF, b As RectangleF) As RectangleF
    190189        Dim right As Single, bottom As Single, left As Single, top As Single
    191190        right = Math.Min(a.Right, b.Right)
    … …  
    196195    End Function
    197196
    198     Function IntersectsWith(ByRef rc As RectangleF) As Boolean
     197    Function IntersectsWith(rc As RectangleF) As Boolean
    199198        If Left < rc.Right And _
    200199            Top < rc.Bottom And _
    … …  
    207206    End Function
    208207
    209     Static Function Union(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
     208    Static Function Union(a As RectangleF, b As RectangleF) As RectangleF
    210209        Dim right As Single, bottom As Single, left As Single, top As Single
    211210        right = Math.Max(a.Right(), b.Right())

  • Include/Classes/System/Drawing/Size.ab

    r166 r212  
    1919    End Sub
    2020
    21     Sub Size(ByRef sz As Size)
     21    Sub Size(sz As Size)
    2222        width = sz.width
    2323        height = sz.height
    … …  
    6262        Return Not Equals(sz)
    6363    End Function
    64 
     64/*
    6565    Sub Operator =(ByRef sz As Size)
    6666        width = sz.width
    6767        height = sz.height
    6868    End Sub
    69 
     69*/
    7070    Function Equals(sz As Size) As Boolean
    7171        If width = sz.width And height = sz.height Then
    … …  
    8181
    8282    Function IsEmpty() As Boolean
    83         If width = 0 And height = 0 Then
    84             Empty = _System_TRUE
    85         Else
    86             Empty = _System_FALSE
    87         End If
     83        Return width = 0 And height = 0
    8884    End Function
    8985

  • Include/Classes/System/Drawing/SizeF.ab

    r166 r212  
    1919    End Sub
    2020
    21     Sub SizeF(ByRef sz As SizeF)
     21    Sub SizeF(sz As SizeF)
    2222        width = sz.width
    2323        height = sz.height
    … …  
    5757        Return Not Equals(sz)
    5858    End Function
    59 
     59/*
    6060    Sub Operator =(ByRef sz As SizeF)
    6161        width = sz.width
    6262        height = sz.height
    6363    End Sub
    64 
     64*/
    6565    Function Equals(sz As SizeF) As Boolean
    6666        If width = sz.width And height = sz.height Then

  • Include/Classes/System/Object.ab

    r207 r212  
    1717    End Function
    1818    Static Function Equals( objectA As Object, objectB As Object ) As Boolean
    19         Return objectA.Equals( objectB )
     19        If VarPtr(objectA) = 0 /*objectA = Nothing*/ Then
     20            Return VarPtr(objectB) = 0 'objectB = Nothing
     21        Else
     22            Return objectA.Equals( objectB )
     23        End If
     24    End Function
     25
     26    ' 参照先が等しいか判断する
     27    Static Function ReferenceEquals(objectA As Object, objectB As Object) As Boolean
     28        If VarPtr(objectA) = 0 /*objectA = Nothing*/ Then
     29            Return VarPtr(objectB) = 0 'objectB = Nothing
     30        ElseIf VarPtr(objectB) = 0 /*objectB = Nothing*/ Then
     31            Return False
     32        Else
     33            Return GetPointer(VarPtr(objectA)) = GetPointer(VarPtr(objectA))
     34        End If
    2035    End Function
    2136

  • Include/Classes/System/String.ab

    r207 r212  
    2828    End Sub
    2929
    30 /*  Sub String(initStr As *Byte)
    31         String()
    32         Assign(initStr As PCTSTR)
    33     End Sub*/
    34 
    3530    Sub String(initStr As PCSTR)
    36         String()
    3731        Assign(initStr)
    3832    End Sub
    3933
    4034    Sub String(initStr As PCSTR, length As Long)
    41         String()
    4235        Assign(initStr, length)
    4336    End Sub
    4437
    4538    Sub String(initStr As PCWSTR)
    46         String()
    4739        Assign(initStr)
    4840    End Sub
    4941
    5042    Sub String(initStr As PCWSTR, length As Long)
    51         String()
    5243        Assign(initStr, length)
    5344    End Sub
    5445
    5546    Sub String(ByRef initStr As String)
    56         String()
    5747        Assign(initStr)
    5848    End Sub
    5949
    6050    Sub String(length As Long)
    61         String()
    6251        ReSize(length)
    6352    End Sub

  • Include/Classes/System/Version.ab

    r175 r212  
    2323        This.major = major
    2424        This.minor = minor
    25         build = -1
    26         revision = -1
     25        This.build = -1
     26        This.revision = -1
    2727    End Sub
    2828
    … …  
    3131        This.minor = minor
    3232        This.build = build
    33         revision = -1
     33        This.revision = -1
    3434    End Sub
    3535
    … …  
    126126        ToString = Str$(major)
    127127        If fieldCount = 1 Then Exit Function
    128         ToString = Str$(minor)
     128        ToString = ToString + "." + Str$(minor)
    129129        If fieldCount = 2 Then Exit Function
    130130
    … …  
    133133            Debug
    134134        End If
    135         ToString = Str$(build)
     135        ToString = ToString + "." + Str$(build)
    136136        If fieldCount = 3 Then Exit Function
    137137
    … …  
    140140            Debug
    141141        End If
    142         ToString = Str$(rivision)
     142        ToString = ToString + "." + Str$(rivision)
    143143    End Function
    144144Private
Note: See TracChangeset for help on using the changeset viewer.