Changeset 141 for Include/api_richedit.sbp

Timestamp:

Mar 8, 2007, 10:42:50 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

#50 API宣言の変更完了

File:

• Include/api_richedit.sbp (modified) (5 diffs)

Include/api_richedit.sbp

@@ -30 +30 @@
 Const CFE_AUTOCOLOR = &H40000000
 
-Type CHARFORMAT
+Type CHARFORMATW
     cbSize As DWord
     dwMask As DWord
@@ -36 +36 @@
     yHeight As Long
     yOffset As Long
-    crTextColor As DWord
+    crTextColor As COLORREF
     bCharSet As Byte
     bPitchAndFamily As Byte
-    szFaceName[ELM(LF_FACESIZE)] As Byte
-End Type
-
+    szFaceName[ELM(LF_FACESIZE)] As WCHAR
+End Type
+Type CHARFORMATA
+    cbSize As DWord
+    dwMask As DWord
+    dwEffects As DWord
+    yHeight As Long
+    yOffset As Long
+    crTextColor As COLORREF
+    bCharSet As Byte
+    bPitchAndFamily As Byte
+    szFaceName[ELM(LF_FACESIZE)] As SByte
+End Type
+#ifdef UNICODE
+TypeDef CHARFORMAT = CHARFORMATW
+#else
+TypeDef CHARFORMAT = CHARFORMATA
+#endif
 
 'CHARFORMAT2 struct
@@ -85 +100 @@
 Const CFU_UNDERLINENONE =   0
 
-Type CHARFORMAT2
+Type CHARFORMAT2W
     cbSize As DWord
     dwMask As DWord
@@ -94 +109 @@
     bCharSet As Byte
     bPitchAndFamily As Byte
-    szFaceName[ELM(LF_FACESIZE)] As Byte
+    szFaceName[ELM(LF_FACESIZE)] As WCHAR
     wWeight As Word
     sSpacing As Integer
@@ -107 +122 @@
     bReserved1 As Byte
 End Type
+Type CHARFORMAT2A
+    cbSize As DWord
+    dwMask As DWord
+    dwEffects As DWord
+    yHeight As Long
+    yOffset As Long
+    crTextColor As DWord
+    bCharSet As Byte
+    bPitchAndFamily As Byte
+    szFaceName[ELM(LF_FACESIZE)] As SByte
+    wWeight As Word
+    sSpacing As Integer
+    crBackColor As DWord
+    lcid As DWord
+    dwReserved As DWord
+    sStyle As Integer
+    wKerning As Word
+    bUnderlineType As Byte
+    bAnimation As Byte
+    bRevAuthor As Byte
+    bReserved1 As Byte
+End Type
+#ifdef UNICODE
+TypeDef CHARFORMAT2 = CHARFORMAT2W
+#else
+TypeDef CHARFORMAT2 = CHARFORMAT2A
+#endif