Changeset 497 for trunk/Include/basic/prompt.sbp

Timestamp:

Mar 28, 2008, 5:43:34 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

インクルードガードとその他不要な前処理定義などの削除

File:

• trunk/Include/basic/prompt.sbp (modified) (12 diffs)

trunk/Include/basic/prompt.sbp

@@ -8 +8 @@
 Namespace Prompt
 Namespace Detail
-    
+
 Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCSTR, cb As Long, ByRef Size As SIZE) As Long
     _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32A(hdc, psz, cb, Size)
@@ -47 +47 @@
 Type _PromptSys_LineInformation
     Length As Long
-    Text As *StrChar
+    Text As *Char
     CharInfo As *_PromptSys_CharacterInformation
 End Type
@@ -53 +53 @@
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
-Dim _PromptSys_InputStr[255] As StrChar
+Dim _PromptSys_InputStr[255] As Char
 Dim _PromptSys_InputLen = -1 As Long
 Dim _PromptSys_KeyChar As Byte
@@ -97 +97 @@
         Next
         _PromptSys_TextLine[100].Length = 0
-        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (StrChar) * 255)
+        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (Char) * 255)
         _PromptSys_TextLine[100].CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         _PromptSys_CurPos.y--
@@ -136 +136 @@
                 End If
                 With _PromptSys_FontSize
-                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *StrChar, tempLen)
+                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *Char, tempLen)
                 End With
                 i2 += tempLen
@@ -191 +191 @@
                         EndIf
                         Dim p = buf.StrPtr
-                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *StrChar, charLen, sz)
+                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *Char, charLen, sz)
                         currentLineCharInfo[.x + 1].StartPos = currentLineCharInfo[.x].StartPos + sz.cx
                     End If
@@ -421 +421 @@
         End If
         Dim tempStr = Nothing As String
-        Dim str As *StrChar
-#ifdef __STRING_IS_NOT_UNICODE
-        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
-        tempStr = New String(str, size As Long)
-#else
+        Dim str As *Char
+#ifdef UNICODE
         Dim osver = System.Environment.OSVersion
         With osver
-            ' GetCompositionStringW is not implimented in Windows 95 
+            ' GetCompositionStringW is not implimented in Windows 95
             If .Version.Major = 4 And .Version.Minor = 0 And .Platform = System.PlatformID.Win32Windows Then
                 Dim strA As PCSTR
@@ -438 +435 @@
             End If
         End With
+#else
+        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
+        tempStr = New String(str, size As Long)
 #endif
         ImmReleaseContext(hwnd, himc)
@@ -460 +460 @@
         With _PromptSys_TextLine[i]
             .Length = 0
-            .Text = _System_calloc(SizeOf (StrChar) * 255)
+            .Text = _System_calloc(SizeOf (Char) * 255)
             .CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         End With
@@ -543 +543 @@
         For i = 0 To 100
             With _PromptSys_TextLine[i]
-                .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As StrChar, 0)
+                .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As Char, 0)
                 .Length = 0
             End With
@@ -589 +589 @@
 
     'Set value to variable
-    Const comma = &h2c As StrChar 'Asc(",")
+    Const comma = &h2c As Char 'Asc(",")
     Dim broken = ActiveBasic.Strings.Detail.Split(New String(_PromptSys_InputStr), comma)
     Dim i As Long
@@ -617 +617 @@
     Dim i = _PromptSys_TextLine[y].Length
     If i < x Then
-        ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As StrChar) 'Asc(" ")
+        ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As Char) 'Asc(" ")
         Dim i2 As Long
         For i2 = i To ELM(x)