* Update and cleanup.

git-svn-id: trunk@8208 -

rtl/wince/wininc/commctrl.inc

@@ -170,6 +170,42 @@ const
   NM_KEYDOWN            =  (NM_FIRST-15);
   NM_RECOGNIZEGESTURE   =  (NM_FIRST-50);
 
+  { Header control  }
+  HDM_DELETEITEM = 4610;
+  HDM_GETITEMW = 4619;
+  HDM_INSERTITEMW = 4618;
+  HDM_SETITEMW = 4620;
+
+  HDM_GETITEM = HDM_GETITEMW;
+  HDM_INSERTITEM = HDM_INSERTITEMW;
+  HDM_SETITEM = HDM_SETITEMW;
+
+  HDM_GETITEMCOUNT = 4608;
+  HDM_HITTEST = 4614;
+  HDM_LAYOUT = 4613;
+  { Header control notifications  }
+  HDN_BEGINTRACKW = HDN_FIRST-26;
+  HDN_DIVIDERDBLCLICKW = HDN_FIRST-25;
+  HDN_ENDTRACKW = HDN_FIRST-27;
+  HDN_ITEMCHANGEDW = HDN_FIRST-21;
+  HDN_ITEMCHANGINGW = HDN_FIRST-20;
+  HDN_ITEMCLICKW = HDN_FIRST-22;
+  HDN_ITEMDBLCLICKW = HDN_FIRST-23;
+  HDN_TRACKW = HDN_FIRST-28;
+  HDN_GETDISPINFOW = HDN_FIRST-29;
+  HDN_BEGINDRAG = HDN_FIRST-10;
+  HDN_ENDDRAG = HDN_FIRST-11;
+
+  HDN_BEGINTRACK = HDN_BEGINTRACKW;
+  HDN_DIVIDERDBLCLICK = HDN_DIVIDERDBLCLICKW;
+  HDN_ENDTRACK = HDN_ENDTRACKW;
+  HDN_ITEMCHANGED = HDN_ITEMCHANGEDW;
+  HDN_ITEMCHANGING = HDN_ITEMCHANGINGW;
+  HDN_ITEMCLICK = HDN_ITEMCLICKW;
+  HDN_ITEMDBLCLICK = HDN_ITEMDBLCLICKW;
+  HDN_TRACK = HDN_TRACKW;
+  HDN_GETDISPINFO = HDN_GETDISPINFOW;
+     
   // DATETIMEPICK CONTROL
   DATETIMEPICK_CLASS  ='SysDateTimePick32';
   DTM_FIRST           = $1000;

rtl/wince/wininc/messages.inc

@@ -247,75 +247,8 @@
      EN_SAVECLIPBOARD = 1800;
      EN_SELCHANGE = 1794;
      EN_STOPNOUNDO = 1798;
-  { File Manager extensions  }
-  { File Manager extensions DLL events  }
-  { Header control  }
-     HDM_DELETEITEM = 4610;
-     HDM_GETITEMW = 4619;
-     HDM_INSERTITEMW = 4618;
-     HDM_SETITEMW = 4620;
-     HDM_GETITEMA = 4611;
-     HDM_INSERTITEMA = 4609;
-     HDM_SETITEMA = 4612;
-{$ifdef UNICODE}
-     HDM_GETITEM = HDM_GETITEMW;
-     HDM_INSERTITEM = HDM_INSERTITEMW;
-     HDM_SETITEM = HDM_SETITEMW;
-{$else}
-     HDM_GETITEM = HDM_GETITEMA;
-     HDM_INSERTITEM = HDM_INSERTITEMA;
-     HDM_SETITEM = HDM_SETITEMA;
-{$endif}
-
-  { UNICODE  }
-
-  const
-     HDM_GETITEMCOUNT = 4608;
-     HDM_HITTEST = 4614;
-     HDM_LAYOUT = 4613;
-  { Header control notifications  }
-     HDN_BEGINTRACKW = -(326);
-     HDN_DIVIDERDBLCLICKW = -(325);
-     HDN_ENDTRACKW = -(327);
-     HDN_ITEMCHANGEDW = -(321);
-     HDN_ITEMCHANGINGW = -(320);
-     HDN_ITEMCLICKW = -(322);
-     HDN_ITEMDBLCLICKW = -(323);
-     HDN_TRACKW = -(328);
-     HDN_BEGINTRACKA = -(306);
-     HDN_DIVIDERDBLCLICKA = -(305);
-     HDN_ENDTRACKA = -(307);
-     HDN_ITEMCHANGEDA = -(301);
-     HDN_ITEMCHANGINGA = -(300);
-     HDN_ITEMCLICKA = -(302);
-     HDN_ITEMDBLCLICKA = -(303);
-     HDN_TRACKA = -(308);
-{$ifdef UNICODE}
 
-  const
-     HDN_BEGINTRACK = HDN_BEGINTRACKW;
-     HDN_DIVIDERDBLCLICK = HDN_DIVIDERDBLCLICKW;
-     HDN_ENDTRACK = HDN_ENDTRACKW;
-     HDN_ITEMCHANGED = HDN_ITEMCHANGEDW;
-     HDN_ITEMCHANGING = HDN_ITEMCHANGINGW;
-     HDN_ITEMCLICK = HDN_ITEMCLICKW;
-     HDN_ITEMDBLCLICK = HDN_ITEMDBLCLICKW;
-     HDN_TRACK = HDN_TRACKW;
-{$else}
-
-  const
-     HDN_BEGINTRACK = HDN_BEGINTRACKA;
-     HDN_DIVIDERDBLCLICK = HDN_DIVIDERDBLCLICKA;
-     HDN_ENDTRACK = HDN_ENDTRACKA;
-     HDN_ITEMCHANGED = HDN_ITEMCHANGEDA;
-     HDN_ITEMCHANGING = HDN_ITEMCHANGINGA;
-     HDN_ITEMCLICK = HDN_ITEMCLICKA;
-     HDN_ITEMDBLCLICK = HDN_ITEMDBLCLICKA;
-     HDN_TRACK = HDN_TRACKA;
-{$endif}
-  { UNICODE  }
   { Hot key control  }
-
   const
      HKM_GETHOTKEY = 1026;
      HKM_SETHOTKEY = 1025;