Changeset 89 for Include

Timestamp:

Feb 11, 2007, 11:53:12 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

型関連の修正 by konisi

Location:

Include/basic

Files:

• command.sbp (modified) (5 diffs)
• prompt.sbp (modified) (5 diffs)

Include/basic/command.sbp

@@ -6 +6 @@
 
 
-Const _System_Type_Char =   1
-Const _System_Type_Byte =   2
+Const _System_Type_Char = 1
+Const _System_Type_Byte = 2
 Const _System_Type_Integer = 3
-Const _System_Type_Word =   4
-Const _System_Type_Long =   5
-Const _System_Type_DWord =  6
-Const _System_Type_Int64 =  7
-Const _System_Type_QWord =  8
+Const _System_Type_Word = 4
+Const _System_Type_Long = 5
+Const _System_Type_DWord = 6
+Const _System_Type_Int64 = 7
+Const _System_Type_QWord = 8
 Const _System_Type_Single = 9
 Const _System_Type_Double = 10
@@ -64 +64 @@
 End Macro
 
-Macro WINDOW(ByRef hWnd As Long, hOwner As Long, x As Long, y As Long, nWidth As Long, nHeight As Long, lpTitle As String, dwStyle As DWord)(lpClass As String, id As DWord, lpFunc As DWord, dwExStyle As DWord)
+Macro WINDOW(ByRef hWnd As HWND, hOwner As HWND, x As Long, y As Long, nWidth As Long, nHeight As Long, lpTitle As String, dwStyle As DWord)(lpClass As String, id As HMENU, lpFunc As DWord, dwExStyle As DWord)
     If VarPtr(hWnd) Then
         hWnd=CreateWindowEx(dwExStyle,lpClass,lpTitle,dwStyle,x,y,nWidth,nHeight,hOwner,id,GetModuleHandle(0),NULL)
@@ -105 +105 @@
 '--------------
 
-Dim _System_hFile(255) As Long
+Dim _System_hFile(255) As VoidPtr
 Macro OPEN(lpFileName As String, AccessFor As Long, FileNumber As Long)
     Dim dwAccess As Long
@@ -435 +435 @@
 End Macro
 Macro MKDIR(path As String)
-    CreateDirectory(path,ByVal 0)
+    CreateDirectory(path, ByVal 0)
 End Macro
 Macro KILL(path As String)
@@ -443 +443 @@
 
 #endif '_INC_COMMAND
-

Include/basic/prompt.sbp

@@ -519 +519 @@
     'Circle (x, y), radius [, color] [, start] [, end] [, aspect] [, f] [, color2]
 
-    Dim hDC As Long
-    Dim hPen As Long, hOldPen As Long
-    Dim hBrush As Long, hOldBrush As Long
+    Dim hDC As HDC
+    Dim hPen As HPEN, hOldPen As VoidPtr
+    Dim hBrush As HBRUSH, hOldBrush As VoidPtr
     Dim radi2 As Long
     Dim sw As Long
@@ -540 +540 @@
 
     If Aspect<1 Then
-        radi2=CDbl(radius)*Aspect
+        radi2=(CDbl(radius)*Aspect) As Long
     Else
         radi2=radius
-        radius=CDbl(radius)/Aspect
+        radius=(CDbl(radius)/Aspect) As Long
     End If
 
@@ -649 +649 @@
     End If
 
-    Dim hDC As Long
-    Dim hPen As Long, hOldPen As Long
-    Dim hBrush As Long, hOldBrush As Long
+    Dim hDC As HDC
+    Dim hPen As HPEN, hOldPen As VoidPtr
+    Dim hBrush As HBRUSH, hOldBrush As VoidPtr
 
     hDC=GetDC(_PromptSys_hWnd)
@@ -695 +695 @@
     'PSet (x,y),ColorCode
 
-    Dim hDC As Long
+    Dim hDC As HDC
 
     hDC=GetDC(_PromptSys_hWnd)
@@ -710 +710 @@
     'Paint (x,y),BrushColor,LineColor
 
-    Dim hDC As Long
-    Dim hBrush As Long, hOldBrush As Long
-
+    Dim hDC As HDC
+    Dim hBrush As HBRUSH, hOldBrush As VoidPtr
+    
     hBrush=CreateSolidBrush(GetBasicColor(BrushColor))