From 06d8d7c03ce21bc527e9968ece8d0dcf04b65cd4 Mon Sep 17 00:00:00 2001
From: oro06 <oro06@idefix.freepascal.org>
Date: Tue, 20 Dec 2005 18:55:53 +0000
Subject: [PATCH] * updated compilation pb

git-svn-id: trunk@2012 -
---
 rtl/wince/windows.pp          |  9 +++++----
 rtl/wince/wininc/commctrl.inc | 10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/rtl/wince/windows.pp b/rtl/wince/windows.pp
index 08fa31399d..e44e1c7750 100644
--- a/rtl/wince/windows.pp
+++ b/rtl/wince/windows.pp
@@ -38,7 +38,6 @@ interface
 
 {$ifdef UNDER_CE}
 {$define UNICODE}  //ce is unicode only
-//{$define _X86_}  //for testing compilation
 {$calling cedcl}
 {$endif UNDER_CE}
 
@@ -64,12 +63,13 @@ interface
 
 {$ifdef UNDER_CE}
 {$i aygshell.inc}
-//{$i commctrl.inc}
+{$i commctrl.inc}
 {$endif UNDER_CE}
 
+{$undef read_interface}
+
 implementation
 
-{$undef read_interface}
 {$define read_implementation}
 
 {$i base.inc}
@@ -94,9 +94,10 @@ implementation
 
 {$ifdef UNDER_CE}
 {$i aygshell.inc}
-//{$i commctrl.inc}
+{$i commctrl.inc}
 {$endif UNDER_CE}
 
 {$undef read_implementation}
 
+begin
 end.
diff --git a/rtl/wince/wininc/commctrl.inc b/rtl/wince/wininc/commctrl.inc
index 6ae9b8a7fb..cbaec0dd35 100644
--- a/rtl/wince/wininc/commctrl.inc
+++ b/rtl/wince/wininc/commctrl.inc
@@ -121,39 +121,41 @@
 // consts
 //*****************************************************************************
 const
-
+  { already defined in defines.inc
   TBSTATE_CHECKED         = $01;
   TBSTATE_PRESSED         = $02;
   TBSTATE_ENABLED         = $04;
   TBSTATE_HIDDEN          = $08;
   TBSTATE_INDETERMINATE   = $10;
   TBSTATE_WRAP            = $20;
+  }
   TBSTATE_ELLIPSES        = $40;
   TBSTATE_HIGHLIGHTED     = $80;
 
+  { already defined in defines.inc
   TBSTYLE_BUTTON          = $0000;
   TBSTYLE_SEP             = $0001;
   TBSTYLE_CHECK           = $0002;
   TBSTYLE_GROUP           = $0004;
   TBSTYLE_CHECKGROUP      =(TBSTYLE_GROUP or TBSTYLE_CHECK);
+  }
   TBSTYLE_DROPDOWN        = $0008;
   TBSTYLE_AUTOSIZE        = $0010; // automatically calculate the cx of the button
-
+  { already defined in defines.inc
   TBSTYLE_TOOLTIPS        = $0100;
   TBSTYLE_WRAPABLE        = $0200;
   TBSTYLE_ALTDRAG         = $0400;
+  }
   TBSTYLE_FLAT            = $0800;
   TBSTYLE_LIST            = $1000;
   TBSTYLE_CUSTOMERASE     = $2000;
   TBSTYLE_TRANSPARENT     = $8000;
-
   I_IMAGENONE  = -2; // Desktop listview uses this same value for I_IMAGENONE when (_WIN32_IE >= 0x0501)
   
 //*****************************************************************************
 // types
 //*****************************************************************************
 
-type
 
 
 //*****************************************************************************