It is now possible to use the standard macros for GetTextExtentPoint

and GetTextExtentPoint32.
This commit is contained in:
Francois Gouget 1999-03-13 18:19:29 +00:00 committed by Alexandre Julliard
parent 3805ed585f
commit 7ae72f5437
1 changed files with 6 additions and 14 deletions

View File

@ -2529,21 +2529,13 @@ UINT16 WINAPI GetTextCharset16(HDC16);
UINT WINAPI GetTextCharset(HDC); UINT WINAPI GetTextCharset(HDC);
COLORREF WINAPI GetTextColor16(HDC16); COLORREF WINAPI GetTextColor16(HDC16);
COLORREF WINAPI GetTextColor(HDC); COLORREF WINAPI GetTextColor(HDC);
/* this one is different, because Win32 has *both*
* GetTextExtentPoint and GetTextExtentPoint32 !
*/
BOOL16 WINAPI GetTextExtentPoint16(HDC16,LPCSTR,INT16,LPSIZE16); BOOL16 WINAPI GetTextExtentPoint16(HDC16,LPCSTR,INT16,LPSIZE16);
BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
BOOL WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE); BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,INT,LPSIZE);
BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE); BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,INT,LPSIZE);
#ifdef UNICODE #define GetTextExtentPoint WINELIB_NAME_AW(GetTextExtentPoint)
#define GetTextExtentPoint GetTextExtentPointW BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,INT,LPSIZE);
#define GetTextExtentPoint32 GetTextExtentPoint32W BOOL WINAPI GetTextExtentPoint32W(HDC,LPCWSTR,INT,LPSIZE);
#else #define GetTextExtentPoint32 WINELIB_NAME_AW(GetTextExtentPoint32)
#define GetTextExtentPoint GetTextExtentPointA
#define GetTextExtentPoint32 GetTextExtentPoint32A
#endif
INT16 WINAPI GetTextFace16(HDC16,INT16,LPSTR); INT16 WINAPI GetTextFace16(HDC16,INT16,LPSTR);
INT WINAPI GetTextFaceA(HDC,INT,LPSTR); INT WINAPI GetTextFaceA(HDC,INT,LPSTR);
INT WINAPI GetTextFaceW(HDC,INT,LPWSTR); INT WINAPI GetTextFaceW(HDC,INT,LPWSTR);