Changeset 635 for trunk


Ignore:
Timestamp:
2008/09/27 06:31:26 (4 years ago)
Author:
NoWest
Message:

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

Location:
trunk/ab5.0/ablib/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/ab5.0/ablib/src/Classes/System/Console.ab

    r630 r635  
    522522    Static Sub OpenStandardOutput() 
    523523        Console.SetOut(System.IO.TextWriter.Synchronized(New System.IO.StreamWriter(New System.IO.FileStream(GetStdHandle(STD_OUTPUT_HANDLE), System.IO.FileAccess.Write, False)))) 
    524     End Sub 
    525  
    526     /* 
    527     @brief  コンソールの前景色および背景色を既定値に設定(前景色=gray 背景色=black) 
     524        Console.defBC = Console.BackgroundColor() 
     525        Console.defFC = Console.ForegroundColor() 
     526    End Sub 
     527 
     528    /* 
     529    @brief  コンソールの前景色および背景色を既定値に設定 
    528530    @date   2008/09/07 
    529531    @auther NoWest 
    530532    */ 
    531533    Static Sub ResetColor() 
    532         Console.BackgroundColor(ConsoleColor.Black) 
    533         Console.ForegroundColor(ConsoleColor.Gray) 
     534        Console.BackgroundColor(Console.defBC) 
     535        Console.ForegroundColor(Console.defFC) 
    534536    End Sub 
    535537 
    … …  
    659661    Static err = Nothing As IO.TextWriter 
    660662    Static cs = Nothing As ActiveBasic.Windows.CriticalSection 
     663    Static defBC As ConsoleColor 
     664    Static defFC As ConsoleColor 
    661665End Class 
    662666 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/CharacterRange.ab

    r497 r635  
    11' Classes/System/Drawing/CharacterRange.ab 
     2 
     3Namespace System 
     4Namespace Drawing 
    25 
    36Class CharacterRange 
    … …  
    4952    length As Long 
    5053End Class 
     54 
     55End Namespace 
     56End Namespace 

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

    r497 r635  
    11' Classes/System/Drawing/Color.ab 
    22 
    3 #require <Classes/System/Drawing/Imaging/misc.ab> 
     3Namespace System 
     4Namespace Drawing 
    45 
    56Class Color 
    … …  
    2122    End Sub 
    2223 
    23     Sub Color(newArgb As ARGB) 
     24    Sub Color(newArgb As System.Drawing.Imaging.ARGB) 
    2425        argb = newArgb 
    2526    End Sub 
    … …  
    3435 
    3536    Function A() As Byte 
    36         A = (argb >> ALPHA_SHIFT) As Byte 
     37        A = (argb >> System.Drawing.Imaging.ALPHA_SHIFT) As Byte 
    3738    End Function 
    3839 
    3940    Function R() As Byte 
    40         R = (argb >> RED_SHIFT) As Byte 
     41        R = (argb >> System.Drawing.Imaging.RED_SHIFT) As Byte 
    4142    End Function 
    4243 
    4344    Function G() As Byte 
    44         G = (argb >> GREEN_SHIFT) As Byte 
     45        G = (argb >> System.Drawing.Imaging.GREEN_SHIFT) As Byte 
    4546    End Function 
    4647 
    4748    Function B() As Byte 
    48         B = (argb >> BLUE_SHIFT) As Byte 
    49     End Function 
    50  
    51     Function Value() As ARGB 
     49        B = (argb >> System.Drawing.Imaging.BLUE_SHIFT) As Byte 
     50    End Function 
     51 
     52    Function Value() As System.Drawing.Imaging.ARGB 
    5253        Value = argb 
    5354    End Function 
    5455 
    55     Sub Value(value As ARGB) 
     56    Sub Value(value As System.Drawing.Imaging.ARGB) 
    5657        argb = value 
    5758    End Sub 
    … …  
    7374    End Function 
    7475*/ 
    75     Static Function FromArgb(argb As ARGB) As Color 
     76    Static Function FromArgb(argb As System.Drawing.Imaging.ARGB) As Color 
    7677        Return New Color(argb) 
    7778    End Function 
    … …  
    296297    End Enum 
    297298*/ 
    298     Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As ARGB 
    299         MakeARGB = (((b As ARGB) <<  BLUE_SHIFT) Or _ 
    300                     ((g As ARGB) << GREEN_SHIFT) Or _ 
    301                     ((r As ARGB) <<   RED_SHIFT) Or _ 
    302                     ((a As ARGB) << ALPHA_SHIFT)) 
     299    Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As System.Drawing.Imaging.ARGB 
     300        MakeARGB = (((b As System.Drawing.Imaging.ARGB) <<  System.Drawing.Imaging.BLUE_SHIFT) Or _ 
     301                    ((g As System.Drawing.Imaging.ARGB) << System.Drawing.Imaging.GREEN_SHIFT) Or _ 
     302                    ((r As System.Drawing.Imaging.ARGB) <<   System.Drawing.Imaging.RED_SHIFT) Or _ 
     303                    ((a As System.Drawing.Imaging.ARGB) << System.Drawing.Imaging.ALPHA_SHIFT)) 
    303304    End Function 
    304305 
    305306Protected 
    306     argb As ARGB 
     307    argb As System.Drawing.Imaging.ARGB 
    307308End Class 
     309 
     310End Namespace 
     311End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Drawing2D/Matrix.ab

    r497 r635  
    11' Classes/System/Drawing/Drawing2D/Matrix.ab 
     2Namespace System 
     3Namespace Drawing 
     4Namespace Drawing2D 
    25 
    36Class Matrix 
    47End Class 
     8 
     9End Namespace 
     10End Namespace 
     11End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Drawing2D/misc.ab

    r497 r635  
    11' Classes/System/Drawing/Drawing2D/misc.ab 
     2Namespace System 
     3Namespace Drawing 
     4Namespace Drawing2D 
    25 
    36Enum CombineMode 
    … …  
    8184    Device 
    8285End Enum 
     86 
     87End Namespace 
     88End Namespace 
     89End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Font.ab

    r497 r635  
     1Namespace System 
     2Namespace Drawing 
     3 
     4 
    15/** 
    26@file Classes/System/Drawing/Font.ab 
    37@brief Fontクラスなどの実装。 
    48*/ 
    5  
    6 #require <Classes/System/Drawing/Graphics.ab> 
    79 
    810Class FontFamily : End Class 
    … …  
    329331    /*mutable*/ lastResult As Status 
    330332End Class 
     333 
     334End Namespace 
     335End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Graphics.ab

    r497 r635  
    11' Classes/System/Drawing/Graphics.ab 
     2 
     3Namespace System 
     4Namespace Drawing 
    25 
    36Class Brush : End Class 
    … …  
    20082011End Class 
    20092012 
     2013End Namespace 
     2014End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Image.ab

    r104 r635  
    11' Classes/System/Drawing/Image.ab 
     2 
     3Namespace System 
     4Namespace Drawing 
    25 
    36Class Image 
    … …  
    912    nativeImage As *GpImage 
    1013End Class 
     14 
     15End Namespace 
     16End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Imaging/MetafileHeader.ab

    r497 r635  
    11' Classes/System/Drawing/Imaging/MetafileHeader.ab 
     2Namespace System 
     3Namespace Drawing 
     4Namespace Imaging 
    25 
    36Type Align(8) ENHMETAHEADER3 
    … …  
    151154    End Function 
    152155End Class 
     156 
     157End Namespace 
     158End Namespace 
     159End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Imaging/misc.ab

    r497 r635  
    11' Classes/System/Drawing/Imaging/misc.ab 
    22 
    3 #require <Classes/System/Drawing/Color.ab> 
     3Namespace System 
     4Namespace Drawing 
     5Namespace Imaging 
    46 
    57TypeDef ARGB = DWord 
    … …  
    433435    ColorChannelLast 
    434436End Enum 
     437 
     438End Namespace 
     439End Namespace 
     440End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/Text/misc.ab

    r497 r635  
    11' Classes/System/Drawing/Text/misc.ab 
     2Namespace System 
     3Namespace Drawing 
     4Namespace Text 
    25 
    36Enum TextRenderingHint 
    … …  
    912    ClearTypeGridFit 
    1013End Enum 
     14 
     15End Namespace 
     16End Namespace 
     17End Namespace 

  • trunk/ab5.0/ablib/src/Classes/System/Drawing/misc.ab

    r473 r635  
    11' Classes/System/Drawing/misc.ab 
    22 
    3 #ifndef __SYSTEM_DRAWING_MISC_AB__ 
    4 #define __SYSTEM_DRAWING_MISC_AB__ 
     3Namespace System 
     4Namespace Drawing 
    55 
    66Enum RotateFlipType 
    … …  
    4747 
    4848 
    49 #endif '__SYSTEM_DRAWING_MISC_AB__ 
     49End Namespace 
     50End Namespace 

  • trunk/ab5.0/ablib/src/Classes/index.ab

    r619 r635  
    6262'#require "./System/Drawing/Drawing2D/misc.ab" 
    6363'#require "./System/Drawing/Imaging/MetafileHeader.ab" 
    64 '#require "./System/Drawing/Imaging/misc.ab" 
     64#require "./System/Drawing/Imaging/misc.ab" 
    6565'#require "./System/Drawing/Text/misc.ab" 
    6666#require "./System/IO/BinaryReader.ab" 

  • trunk/ab5.0/ablib/src/api_system.sbp

    r628 r635  
    312312Declare Function CreateMailslot Lib "kernel32" Alias _FuncName_CreateMailslot (pName As PCTSTR, nMaxMessageSize As DWord, lReadTimeout As DWord, pSecurityAttributes As *SECURITY_ATTRIBUTES) As HANDLE 
    313313 
    314 Const DEBUG_PROCESS =              &H00000001 
    315 Const DEBUG_ONLY_THIS_PROCESS =    &H00000002 
    316 Const CREATE_SUSPENDED =           &H00000004 
    317 Const DETACHED_PROCESS =           &H00000008 
    318 Const CREATE_NEW_CONSOLE =         &H00000010 
    319 Const NORMAL_PRIORITY_CLASS =      &H00000020 
    320 Const IDLE_PRIORITY_CLASS =        &H00000040 
    321 Const HIGH_PRIORITY_CLASS =        &H00000080 
    322 Const REALTIME_PRIORITY_CLASS =    &H00000100 
    323 Const CREATE_NEW_PROCESS_GROUP =   &H00000200 
    324 Const CREATE_UNICODE_ENVIRONMENT = &H00000400 
    325 Const CREATE_SEPARATE_WOW_VDM =    &H00000800 
    326 Const CREATE_SHARED_WOW_VDM =      &H00001000 
    327 Const CREATE_FORCEDOS =            &H00002000 
    328 Const CREATE_DEFAULT_ERROR_MODE =  &H04000000 
    329 Const CREATE_NO_WINDOW =           &H08000000 
    330 Const PROFILE_USER =               &H10000000 
    331 Const PROFILE_KERNEL =             &H20000000 
    332 Const PROFILE_SERVER =             &H40000000 
     314Const DEBUG_PROCESS =               &H00000001 
     315Const DEBUG_ONLY_THIS_PROCESS =     &H00000002 
     316Const CREATE_SUSPENDED =            &H00000004 
     317Const DETACHED_PROCESS =            &H00000008 
     318Const CREATE_NEW_CONSOLE =          &H00000010 
     319Const NORMAL_PRIORITY_CLASS =       &H00000020 
     320Const IDLE_PRIORITY_CLASS =         &H00000040 
     321Const HIGH_PRIORITY_CLASS =         &H00000080 
     322Const REALTIME_PRIORITY_CLASS =     &H00000100 
     323Const CREATE_NEW_PROCESS_GROUP =    &H00000200 
     324Const CREATE_UNICODE_ENVIRONMENT =  &H00000400 
     325Const CREATE_SEPARATE_WOW_VDM =     &H00000800 
     326Const CREATE_SHARED_WOW_VDM =       &H00001000 
     327Const CREATE_FORCEDOS =             &H00002000 
     328Const BELOW_NORMAL_PRIORITY_CLASS = &H00004000 
     329Const ABOVE_NORMAL_PRIORITY_CLASS = &H00008000 
     330Const CREATE_DEFAULT_ERROR_MODE =   &H04000000 
     331Const CREATE_NO_WINDOW =            &H08000000 
     332Const PROFILE_USER =                &H10000000 
     333Const PROFILE_KERNEL =              &H20000000 
     334Const PROFILE_SERVER =              &H40000000 
     335  
    333336 
    334337Const STARTF_USESHOWWINDOW =    &H00000001 
    … …  
    612615Declare Function GetTempPath Lib "kernel32" Alias _FuncName_GetTempPath (nBufferLength As DWord, lpBuffer As PTSTR) As DWord 
    613616Declare Function GetThreadContext Lib "kernel32" (hThread As HANDLE, ByRef Context As CONTEXT) As BOOL 
    614 /* 
     617 
    615618Const THREAD_PRIORITY_LOWEST =        THREAD_BASE_PRIORITY_MIN 
    616619Const THREAD_PRIORITY_BELOW_NORMAL =  THREAD_PRIORITY_LOWEST+1 
    … …  
    621624Const THREAD_PRIORITY_TIME_CRITICAL = THREAD_BASE_PRIORITY_LOWRT 
    622625Const THREAD_PRIORITY_IDLE =          THREAD_BASE_PRIORITY_IDLE 
    623 */ 
     626 
    624627Declare Function GetThreadPriority Lib "kernel32" (hThread As HANDLE) As Long 
    625628Declare Function GetThreadPriorityBoost Lib "kernel32" ( 

  • trunk/ab5.0/ablib/src/basic/prompt.sbp

    r537 r635  
    597597            Goto *InputReStart 
    598598        End If 
    599         _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], broken[i]) 
     599        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], broken.Item[i]) 
    600600    Next 
    601601 
    … …  
    667667        End If 
    668668 
    669         StartPos = Abs(StartPos) 
    670         EndPos = Abs(EndPos) 
     669        StartPos = Math.Abs(StartPos) 
     670        EndPos = Math.Abs(EndPos) 
    671671 
    672672        If StartPos<=78.5 Then 
Note: See TracChangeset for help on using the changeset viewer.