[Cegcc-svn] SF.net SVN: cegcc: [801] trunk/cegcc/src/w32api

[<ped...@us...>]

Revision: 801
          http://svn.sourceforge.net/cegcc/?rev=801&view=rev
Author:   pedroalves
Date:     2006-11-12 13:37:58 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
 * include/wingdi.h (GetTextExtentPoint32, GetTextExtentPointW):
 Implement in terms of GetTextExtentExPointW.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/wingdi.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 21:05:34 UTC (rev 800)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 21:37:58 UTC (rev 801)
@@ -1,5 +1,10 @@
 2006-11-12  Pedro Alves  <ped...@po...>
 
+	* include/wingdi.h (GetTextExtentPoint32, GetTextExtentPointW):
+	Implement in terms of GetTextExtentExPointW.
+
+2006-11-12  Pedro Alves  <ped...@po...>
+
 	* include/shellapi.h (SHGetSpecialFolderPath,
 	SHGetShortcutTarget, SHCreateShortcut): Declare.
 

Modified: trunk/cegcc/src/w32api/include/wingdi.h
===================================================================
--- trunk/cegcc/src/w32api/include/wingdi.h	2006-11-12 21:05:34 UTC (rev 800)
+++ trunk/cegcc/src/w32api/include/wingdi.h	2006-11-12 21:37:58 UTC (rev 801)
@@ -2877,15 +2877,17 @@
 WINGDIAPI COLORREF WINAPI GetTextColor(HDC);
 WINGDIAPI BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
 WINGDIAPI BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
+#ifndef _WIN32_WCE
 WINGDIAPI BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE);
 WINGDIAPI BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE);
-#ifdef _WIN32_WCE
-extern BOOL GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE);
-extern BOOL GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE);
-#else
 WINGDIAPI BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE);
 WINGDIAPI BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE);
+#else
+#if (_WIN32_WCE >= 0x200)
+#define GetTextExtentPointW(hdc,cstr,len,size) GetTextExtentExPointW(hdc,cstr,len,0,NULL,NULL,size)
+#define GetTextExtentPoint32W GetTextExtentPointW
 #endif
+#endif
 WINGDIAPI int WINAPI GetTextFaceA(HDC,int,LPSTR);
 WINGDIAPI int WINAPI GetTextFaceW(HDC,int,LPWSTR);
 WINGDIAPI BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.