* fixes in wince windows unit.

git-svn-id: trunk@6136 -

rtl/wince/wininc/defines.inc

@@ -5089,20 +5089,16 @@ Const
      MK_RBUTTON = 2;
      MK_SHIFT = 4;
   { WNDCLASS structure  }
-     CS_BYTEALIGNCLIENT = 4096;
-     CS_BYTEALIGNWINDOW = 8192;
-     CS_CLASSDC = 64;
-     CS_DBLCLKS = 8;
-     CS_GLOBALCLASS = 16384;
+     CS_VREDRAW = 1;
      CS_HREDRAW = 2;
-     CS_KEYCVTWINDOW = 4;
-     CS_NOCLOSE = 512;
-     CS_NOKEYCVT = 256;
-     CS_OWNDC = 32;
+     CS_DBLCLKS = 8;
      CS_PARENTDC = 128;
+     CS_NOCLOSE = 512;
      CS_SAVEBITS = 2048;
-     CS_VREDRAW = 1;
-     DLGWINDOWEXTRA = 30;
+     CS_GLOBALCLASS = 16384;
+     CS_IME = $10000;
+
+     DLGWINDOWEXTRA = 32;
   { ACCEL structure  }
      FALT = 16;
      FCONTROL = 8;

rtl/wince/wininc/redef.inc

@@ -178,8 +178,8 @@ function GetMenuItemInfoW(p1: HMENU; p2: UINT; p3: BOOL; var p4: TMenuItemInfoW)
 function GetMessage(var lpMsg: TMsg; hWnd: HWND; wMsgFilterMin, wMsgFilterMax: UINT): BOOL;external KernelDLL name 'GetMessageW';
 function GetScrollInfo(hWnd: HWND; BarFlag: Integer; var ScrollInfo: TScrollInfo): BOOL; external KernelDLL name 'GetScrollInfo';
 procedure GetSystemTime(var lpSystemTime:SYSTEMTIME); external KernelDLL name 'GetSystemTime';
-function GetTextExtentPoint32(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL; external KernelDLL name 'GetTextExtentPoint32W';
-function GetTextExtentPoint32W(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL; external KernelDLL name 'GetTextExtentPoint32W';
+function GetTextExtentPoint32(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL;
+function GetTextExtentPoint32W(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL;
 function GetVersionEx(var lpVersionInformation: TOSVersionInfo): BOOL;external KernelDLL name 'GetVersionExW';
 function GetVersionExW(var lpVersionInformation: TOSVersionInfoW): BOOL; external KernelDLL name 'GetVersionExW';
 function GetWindowRect(hWnd: HWND; var lpRect: TRect): BOOL; external KernelDLL name 'GetWindowRect';
@@ -1067,6 +1067,16 @@ begin
   MsgWaitForMultipleObjects:=MsgWaitForMultipleObjectsEx(nCount,@pHandles,dwMilliseconds,dwWakeMask,0);
 end;
 
+function GetTextExtentPoint32(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL;
+begin
+  Result:=GetTextExtentExPoint(DC, Str, Count, 0, nil, nil, @Size);
+end;
+
+function GetTextExtentPoint32W(DC: HDC; Str: LPWSTR; Count: Integer; var Size: TSize): BOOL;
+begin
+  Result:=GetTextExtentExPoint(DC, Str, Count, 0, nil, nil, @Size);
+end;
+
 (*
 //begin win32 or wince not checked
 function Succeeded(Status : HRESULT) : BOOL;