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

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

Revision: 1044
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1044&view=rev
Author:   pedroalves
Date:     2007-08-06 14:32:34 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
	* include/winbase.h (GetCharABCWidths): Remove the W suffix on
	WinCE.

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	2007-08-06 21:18:55 UTC (rev 1043)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2007-08-06 21:32:34 UTC (rev 1044)
@@ -1,5 +1,10 @@
 2007-08-06  Pedro Alves  <ped...@po...>
 
+	* include/winbase.h (GetCharABCWidths): Remove the W suffix on
+	WinCE.
+
+2007-08-06  Pedro Alves  <ped...@po...>
+
 	* include/winbase.h (LocalFlags, LocalHandle, LocalLock, LocalUnlock):
 	Define for WinCE.
 	

Modified: trunk/cegcc/src/w32api/include/wingdi.h
===================================================================
--- trunk/cegcc/src/w32api/include/wingdi.h	2007-08-06 21:18:55 UTC (rev 1043)
+++ trunk/cegcc/src/w32api/include/wingdi.h	2007-08-06 21:32:34 UTC (rev 1044)
@@ -2797,8 +2797,12 @@
 WINGDIAPI int WINAPI GetBkMode(HDC);
 WINGDIAPI UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT);
 WINGDIAPI BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT);
+#ifndef _WIN32_WCE
 WINGDIAPI BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
 WINGDIAPI BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
+#else
+WINGDIAPI BOOL WINAPI GetCharABCWidths(HDC,UINT,UINT,LPABC);
+#endif
 WINGDIAPI BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
 WINGDIAPI BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
 WINGDIAPI DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD);
@@ -3099,7 +3103,9 @@
 #define EnumICMProfiles EnumICMProfilesW
 #define ExtTextOut ExtTextOutW
 #define GetCharABCWidthsFloat GetCharABCWidthsFloatW
+#ifndef _WIN32_WCE
 #define GetCharABCWidths GetCharABCWidthsW
+#endif
 #define GetCharacterPlacement GetCharacterPlacementW
 #ifndef _WIN32_WCE
 #define GetCharWidth32 GetCharWidth32W


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