Skip to content

Commit

Permalink
Updated third-party components (VirtualTreeView, MustangPeak JCL and …
Browse files Browse the repository at this point in the history
…JVCL). See readme.txt for third party component installation instructions.
  • Loading branch information
pyscripter committed Dec 1, 2011
1 parent 28ef0c9 commit d073ab9
Show file tree
Hide file tree
Showing 16 changed files with 362 additions and 8,014 deletions.
5 changes: 4 additions & 1 deletion Components/PyScripterCustom.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="c:\program files\borland\bds\4.0\Bin\bcbie100.bpl">Borland C++Builder Internet Explorer 5 Components Package</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\bcboffice2k140.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\bcbofficexp140.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k140.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp140.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
</BorlandProject>
Expand Down
5,291 changes: 0 additions & 5,291 deletions JclStrings.pas

This file was deleted.

2,354 changes: 0 additions & 2,354 deletions JclWideStrings.pas

This file was deleted.

50 changes: 25 additions & 25 deletions JvDockControlForm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Known Issues:
-----------------------------------------------------------------------------}
// $Id: JvDockControlForm.pas 12797 2010-06-07 16:21:51Z ahuser $
// $Id: JvDockControlForm.pas 13173 2011-11-19 12:43:58Z ahuser $

{ Changes:
Expand Down Expand Up @@ -333,6 +333,9 @@ TJvDockBaseControl = class(TJvComponent)

TJvDockPosition = (dpLeft, dpRight, dpTop, dpBottom, dpCustom); {dpCustom NEW!}

{$IFDEF RTL230_UP}
[ComponentPlatformsAttribute(pidWin32 or pidWin64)]
{$ENDIF RTL230_UP}
TJvDockServer = class(TJvDockBaseControl)
private
FDockPanelClass: TJvDockPanelClass;
Expand Down Expand Up @@ -433,6 +436,9 @@ TJvDockServer = class(TJvDockBaseControl)
TJvDockPaintDockSplitterEvent = TJvDockPaintDockEvent;
TJvDockFormHintEvent = procedure(HTFlag: Integer; var HintStr: string; var CanShow: Boolean) of object;

{$IFDEF RTL230_UP}
[ComponentPlatformsAttribute(pidWin32 or pidWin64)]
{$ENDIF RTL230_UP}
TJvDockClient = class(TJvDockBaseControl)
private
FConjoinPanelClass: TJvDockConjoinPanelClass;
Expand Down Expand Up @@ -859,9 +865,9 @@ procedure InvalidateDockHostSiteOfControl(Control: TControl; FocusLost: Boolean)
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
RCSfile: '$URL: https://jvcl.svn.sourceforge.net/svnroot/jvcl/branches/JVCL3_40_PREPARATION/run/JvDockControlForm.pas $';
Revision: '$Revision: 12797 $';
Date: '$Date: 2010-06-07 18:21:51 +0200 (lun., 07 juin 2010) $';
RCSfile: '$URL: https://jcl.svn.sourceforge.net/svnroot/jvcl/trunk/jvcl/run/JvDockControlForm.pas $';
Revision: '$Revision: 13173 $';
Date: '$Date: 2011-11-19 14:43:58 +0200 (Σαβ, 19 Νοε 2011) $';
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
Expand Down Expand Up @@ -894,9 +900,7 @@ TWinControlAccessProtected = class(TWinControl);

function IsWinXP_UP: Boolean;
begin
Result := (Win32Platform = VER_PLATFORM_WIN32_NT) and
((Win32MajorVersion > 5) or
(Win32MajorVersion = 5) and (Win32MinorVersion >= 1));
Result := (Win32Platform = VER_PLATFORM_WIN32_NT) and CheckWin32Version(5, 1);
end;

procedure ApplyShowingChanged;
Expand Down Expand Up @@ -1295,7 +1299,7 @@ procedure InvalidateDockHostSiteOfControl(Control: TControl; FocusLost: Boolean)
end;
if ChildDockSite <> nil then
TWinControlAccessProtected(ChildDockSite).SendDockNotification(CM_INVALIDATEDOCKHOST,
Integer(Control), Integer(FocusLost));
WPARAM(Control), LPARAM(FocusLost));
end;
{$ENDIF !COMPILER9_UP}

Expand Down Expand Up @@ -1559,6 +1563,7 @@ function ManualTabDock(DockSite: TWinControl; Form1, Form2: TForm): TJvDockTabHo
Result := TabHost;
end;


(*
This old way was a kludge written by Warren that never properly worked anyways.
It had the odd habit of rearranging controls, making previous docked forms (controls)
Expand Down Expand Up @@ -2604,27 +2609,22 @@ procedure TJvDockBasicStyle.FormPositionDockRect(DockClient: TJvDockClient;
var
NewWidth, NewHeight: Integer;
TempX, TempY: Double;
R, TempDockRect: TRect;
R: TRect;
begin
with Source do
begin
if (DragTarget = nil) or (not TWinControlAccessProtected(DragTarget).UseDockManager) then
begin
NewWidth := Control.UndockWidth;
NewHeight := Control.UndockHeight;

TempX := DragPos.X - ((NewWidth) * MouseDeltaX);
TempY := DragPos.Y - ((NewHeight) * MouseDeltaY);
TempDockRect := DockRect;
with TempDockRect do
begin
Left := Round(TempX);
Top := Round(TempY);
Right := Left + NewWidth;
Bottom := Top + NewHeight;
end;
DockRect := TempDockRect;

R := DockRect;
R.Left := Round(TempX);
R.Top := Round(TempY);
R.Right := R.Left + NewWidth;
R.Bottom := R.Top + NewHeight;
DockRect := R;
AdjustDockRect(DockRect);
end
else
Expand Down Expand Up @@ -3013,7 +3013,7 @@ function TJvDockClient.CreateTabHostAndDockControl(Control1, Control2: TControl)
begin
Result := TJvDockTabHostForm.Create(Application);
Result.Name := 'TJvDockTabHostForm_' + Control1.Name + '_' + Control2.Name + '_' +
IntToHex(Integer(Result), 8);
IntToHex(LPARAM(Result), 2 * SizeOf(LPARAM));

{ CreateTabDockClass implicitly sets Result.DockClient.DockStyle via the
assign in that function }
Expand Down Expand Up @@ -3701,7 +3701,7 @@ function TJvDockConjoinPanel.CustomUnDock(Source: TJvDockDragDockObject;

procedure TJvDockConjoinPanel.DockDrop(Source: TDragDockObject; X, Y: Integer);
begin
if Perform(CM_DOCKCLIENT, WPARAM(Source), LPARAM(SmallPoint(X, Y))) >= 0 then
if Perform(CM_DOCKCLIENT, WPARAM(Source), {$IFDEF RTL230_UP}PointToLParam{$ELSE}LPARAM{$ENDIF RTL230_UP}(SmallPoint(X, Y))) >= 0 then
begin
if Source.Control is TForm then
begin
Expand Down Expand Up @@ -3889,7 +3889,7 @@ function TJvDockPanel.CustomUnDock(Source: TJvDockDragDockObject; NewTarget: TWi

procedure TJvDockPanel.DockDrop(Source: TDragDockObject; X, Y: Integer);
begin
if Perform(CM_DOCKCLIENT, WPARAM(Source), LPARAM(SmallPoint(X, Y))) >= 0 then
if Perform(CM_DOCKCLIENT, WPARAM(Source), {$IFDEF RTL230_UP}PointToLParam{$ELSE}LPARAM{$ENDIF RTL230_UP}(SmallPoint(X, Y))) >= 0 then
begin
if Source.Control is TForm then
begin
Expand Down Expand Up @@ -4820,7 +4820,7 @@ procedure TJvDockTabPageControl.CustomDockDrop(Source: TJvDockDragDockObject;
try
DragDockObject.DockRect := Source.DockRect;
DragDockObject.Control := Source.Control;
Perform(CM_DOCKCLIENT, WPARAM(DragDockObject), LPARAM(SmallPoint(X, Y)));
Perform(CM_DOCKCLIENT, WPARAM(DragDockObject), {$IFDEF RTL230_UP}PointToLParam{$ELSE}LPARAM{$ENDIF RTL230_UP}(SmallPoint(X, Y)));
UpdateCaption(nil);
finally
DragDockObject.Free;
Expand Down Expand Up @@ -4897,7 +4897,7 @@ function TJvDockTabPageControl.CustomUnDock(Source: TJvDockDragDockObject;
procedure TJvDockTabPageControl.DockDrop(Source: TDragDockObject; X,
Y: Integer);
begin
if Perform(CM_DOCKCLIENT, WPARAM(Source), LPARAM(SmallPoint(X, Y))) >= 0 then
if Perform(CM_DOCKCLIENT, WPARAM(Source), {$IFDEF RTL230_UP}PointToLParam{$ELSE}LPARAM{$ENDIF RTL230_UP}(SmallPoint(X, Y))) >= 0 then
begin
if Source.Control is TForm then
begin
Expand Down
4 changes: 2 additions & 2 deletions JvDockInfo.pas
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ TJvDockInfoTree = class(TJvDockBaseTree)
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
RCSfile: '$URL: https://jvcl.svn.sourceforge.net/svnroot/jvcl/branches/JVCL3_40_PREPARATION/run/JvDockInfo.pas $';
RCSfile: '$URL: https://jcl.svn.sourceforge.net/svnroot/jvcl/trunk/jvcl/run/JvDockInfo.pas $';
Revision: '$Revision: 12461 $';
Date: '$Date: 2009-08-14 19:21:33 +0200 (ven., 14 aoΓ»t 2009) $';
Date: '$Date: 2009-08-14 20:21:33 +0300 (Παρ, 14 Αυγ 2009) $';
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
Expand Down
Loading

0 comments on commit d073ab9

Please sign in to comment.