Fixes wince compilation

git-svn-id: trunk@15086 -

lcl/interfaces/wince/winceint.pp

@@ -51,11 +51,15 @@ Interface
 Uses
   // Compatibility
   {$ifdef Win32}win32compat,{$endif}
-  // Everything else
-  Windows, Classes, ComCtrls, Controls, Buttons, Dialogs, DynHashArray,
+  // Libs
+  Windows,
+  {$ifndef win32}aygshell,{$endif}
+  // RTL, LCL
+  Classes, ComCtrls, Controls, Buttons, Dialogs, DynHashArray,
   ExtCtrls, Forms, GraphMath, GraphType, InterfaceBase, LCLIntf, LCLType,
-  LMessages, StdCtrls, SysUtils, Graphics, Menus, WinCEProc, WinCEExtra,
-  WinExt, WinCEDef, Themes;
+  LMessages, StdCtrls, SysUtils, Graphics, Menus,
+  // Widgetset
+  WinCEProc, WinCEExtra, WinExt, WinCEDef, Themes;
 
 const
   {$ifdef Win32}

lcl/interfaces/wince/winceproc.pp

@@ -5,8 +5,13 @@ unit winceproc;
 interface
 
 uses
-  Windows, Classes, LMessages, LCLType, LCLProc, Controls, Forms, Menus,
+  // Libs
+  Windows,
+  {$ifndef Win32}oleaut32,{$endif}
+  // compatibility
   {$ifdef Win32}win32compat,{$endif}
+  // RTL, LCL
+  Classes, LMessages, LCLType, LCLProc, Controls, Forms, Menus,
   WinCEExtra, GraphType;
   
 Type

lcl/interfaces/wince/wincewscomctrls.pp

@@ -26,7 +26,7 @@ interface
 
 uses
   // RTL, FCL
-  Windows, Classes, SysUtils, {WinExt,}
+  Windows, Classes, SysUtils, commctrl, {WinExt,}
   // Compatibility
   {$ifdef Win32}win32compat,{$endif}
   // LCL
@@ -35,7 +35,6 @@ uses
   LCLProc, InterfaceBase,
   // widgetset
   WSComCtrls, WSLCLClasses, WSProc,
-  // wince widgetset
   WinCEInt, WinCEProc, WinCEWSControls, WinCEExtra;
 
 type

lcl/interfaces/wince/wincewsextctrls.pp

@@ -27,7 +27,7 @@ interface
 
 uses
   // RTL, FCL
-  Windows, SysUtils,
+  Windows, SysUtils, commctrl,
   // Compatibility
   {$ifdef Win32}win32compat,{$endif}
   // LCL

lcl/interfaces/wince/wincewsmenus.pp

@@ -26,17 +26,15 @@ unit WinCEWSMenus;
 interface
 
 uses
-////////////////////////////////////////////////////
-// I M P O R T A N T
-////////////////////////////////////////////////////
-// To get as little as posible circles,
-// uncomment only when needed for registration
-////////////////////////////////////////////////////
+  // LCL
   Graphics, GraphType, ImgList, Menus, Forms, LCLIntf, {keep before Windows }
-////////////////////////////////////////////////////
-  WSMenus, WSLCLClasses,
-  Windows, Controls, Classes, SysUtils, WinceInt, WinceProc, WinCEWSImgList,
-  InterfaceBase, LCLProc;
+  Controls,  InterfaceBase, LCLProc,
+  // RTL, FCL
+  Windows, Classes, SysUtils, commctrl,
+  {$ifndef win32}aygshell,{$endif}
+  // widgetset
+  WinceInt, WinceProc, WinCEWSImgList,
+  WSMenus, WSLCLClasses;
 
 type
 

lcl/interfaces/wince/wincewsstdctrls.pp

@@ -29,6 +29,7 @@ interface
 uses
   // Libs
   Windows,
+  {$ifndef win32}oleaut32,{$endif}
   // Compatibility
   {$ifdef Win32}win32compat,{$endif}
   // RTL, FCL, LCL

lcl/lconvencoding.pas

@@ -94,7 +94,11 @@ var EncodingValid: boolean = false;
 {$IFDEF Windows}
 function GetWindowsEncoding: string;
 var
+  {$ifdef WinCE}
+  Buffer : PWideChar;
+  {$else}
   Buffer : PChar;
+  {$endif}
   Size : integer;
 begin
   Size := GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ILANGUAGE, nil, 0);