pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Rename fake windows units to allow compilation with non win32 widgetset under windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1078 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2009-12-23 09:00:03 +00:00
parent 3e6b2b7bd9
commit f5031e0139
10 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/virtualtreeview-new/trunk/VirtualTrees.pas
View File

@ -318,8 +318,11 @@ uses
{$ifdef LCLWin32} {$ifdef LCLWin32}
Windows, Windows,
{$endif} {$endif}
{$ifdef Windows}
ActiveX, ActiveX,
Clipbrd, {$else}
FakeActiveX,
{$endif}
OleUtils, OleUtils,
LCLIntf, LCLIntf,
DelphiCompat, DelphiCompat,
@ -328,8 +331,8 @@ uses
LCLVersion, LCLVersion,
vtlogger, LCLType, LResources, LMessages, Types, vtlogger, LCLType, LResources, LMessages, Types,
SysUtils, Classes, Graphics, Controls, Forms, ImgList, StdCtrls, Menus, Printers, SysUtils, Classes, Graphics, Controls, Forms, ImgList, StdCtrls, Menus, Printers,
SyncObjs // Thread support SyncObjs, // Thread support
//Clipbrd // Clipboard support Clipbrd // Clipboard support
{$ifdef ThemeSupport} {$ifdef ThemeSupport}
, Themes , Win32UxTheme, UxTheme , Themes , Win32UxTheme, UxTheme
{$endif ThemeSupport} {$endif ThemeSupport}
@ -3876,7 +3879,11 @@ uses
{$ifdef UseFlatScrollbars} {$ifdef UseFlatScrollbars}
FlatSB, // wrapper for systems without flat SB support FlatSB, // wrapper for systems without flat SB support
{$endif UseFlatScrollbars} {$endif UseFlatScrollbars}
{$ifdef Windows}
MMSystem, // for animation timer (does not include further resources) MMSystem, // for animation timer (does not include further resources)
{$else}
FakeMMSystem,
{$endif}
TypInfo, // for migration stuff TypInfo, // for migration stuff
ActnList, ActnList,
StdActns, // for standard action support StdActns, // for standard action support
@ -20066,7 +20073,11 @@ procedure TBaseVirtualTree.DragAndDrop(AllowedEffects: Integer;
DataObject: IDataObject; DragEffect: Integer); DataObject: IDataObject; DragEffect: Integer);
begin begin
{$ifdef Windows}
ActiveX.DoDragDrop(DataObject, VTVDragManager as IDropSource, AllowedEffects, @DragEffect); ActiveX.DoDragDrop(DataObject, VTVDragManager as IDropSource, AllowedEffects, @DragEffect);
{$else}
FakeActiveX.DoDragDrop(DataObject, VTVDragManager as IDropSource, AllowedEffects, @DragEffect);
{$endif}
end; end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------

1
components/virtualtreeview-new/trunk/demos/advanced/Advanced.lpi
View File

@ -17,7 +17,6 @@
</VersionInfo> </VersionInfo>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<DestinationDirectory Value="$(TestDir)\publishedproject\"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/> <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
</PublishOptions> </PublishOptions>

2
components/virtualtreeview-new/trunk/units/carbon/activex.pas → components/virtualtreeview-new/trunk/units/carbon/fakeactivex.pas
View File

@ -1,3 +1,3 @@
unit ActiveX; unit FakeActiveX;
{$i ../dummyactivex.inc} {$i ../dummyactivex.inc}

2
components/virtualtreeview-new/trunk/units/gtk2/mmsystem.pas → components/virtualtreeview-new/trunk/units/carbon/fakemmsystem.pas
View File

@ -1,4 +1,4 @@
unit mmsystem; unit fakemmsystem;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}

2
components/virtualtreeview-new/trunk/units/gtk2/activex.pas → components/virtualtreeview-new/trunk/units/gtk/fakeactivex.pas
View File

@ -1,3 +1,3 @@
unit ActiveX; unit FakeActiveX;
{$i ../dummyactivex.inc} {$i ../dummyactivex.inc}

2
components/virtualtreeview-new/trunk/units/carbon/mmsystem.pas → components/virtualtreeview-new/trunk/units/gtk/fakemmsystem.pas
View File

@ -1,4 +1,4 @@
unit mmsystem; unit fakemmsystem;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}

2
components/virtualtreeview-new/trunk/units/gtk/activex.pas → components/virtualtreeview-new/trunk/units/gtk2/fakeactivex.pas
View File

@ -1,3 +1,3 @@
unit ActiveX; unit FakeActiveX;
{$i ../dummyactivex.inc} {$i ../dummyactivex.inc}

2
components/virtualtreeview-new/trunk/units/qt/mmsystem.pas → components/virtualtreeview-new/trunk/units/gtk2/fakemmsystem.pas
View File

@ -1,4 +1,4 @@
unit mmsystem; unit fakemmsystem;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}

2
components/virtualtreeview-new/trunk/units/qt/activex.pas → components/virtualtreeview-new/trunk/units/qt/fakeactivex.pas
View File

@ -1,3 +1,3 @@
unit ActiveX; unit FakeActiveX;
{$i ../dummyactivex.inc} {$i ../dummyactivex.inc}

2
components/virtualtreeview-new/trunk/units/gtk/mmsystem.pas → components/virtualtreeview-new/trunk/units/qt/fakemmsystem.pas
View File

@ -1,4 +1,4 @@
unit mmsystem; unit fakemmsystem;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}