--- Merging r19515 into '.':

U    packages/winunits-base/src/shlobj.pp

# revisions: 19515
------------------------------------------------------------------------
r19515 | marco | 2011-10-19 16:59:59 +0200 (Wed, 19 Oct 2011) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/shlobj.pp

 * IShellFolder2.columnstart -> IShellFolder2.columnstate, as per Mantis #20519

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19534 -

packages/winunits-base/src/shlobj.pp

@@ -1835,7 +1835,7 @@ Type
       function GetDefaultSearchGUID(out guid:TGUID):HResult;StdCall;
       function EnumSearches(out ppenum:IEnumExtraSearch):HResult;StdCall;    
       function GetDefaultColumn(dwres:DWORD;psort :pulong; pdisplay:pulong):HResult;StdCall;   
-      function GetDefaultColumnStart(icolumn:UINT;pscflag:PSHCOLSTATEF):HResult;StdCall;   
+      function GetDefaultColumnState(icolumn:UINT;pscflag:PSHCOLSTATEF):HResult;StdCall;   
       function GetDetailsEx(pidl:LPCITEMIDLIST;pscid:PSHCOLUMNID; pv : pOLEvariant):HResult;StdCall;   
       function GetDetailsOf(pidl:LPCITEMIDLIST;iColumn:UINT;psd:PSHELLDETAILS):HResult;StdCall;   
       function MapColumnToSCID(iColumn:UINT;pscid:PSHCOLUMNID):HResult;StdCall;