Skip to content

Commit

Permalink
Version 2.6
Browse files Browse the repository at this point in the history 
Compatibility with Python 3.4
  • Loading branch information
pyscripter committed Mar 20, 2015
1 parent e7fccb2 commit 8c51ae7
Show file tree
Hide file tree
Showing 37 changed files with 5,185 additions and 2,893 deletions.
28 changes: 14 additions & 14 deletions Components/JvDockVSNetStyleSpTBX.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ procedure TJvDockVSNETTreeSpTBX.DrawAutoHideButton(Zone: TJvDockZone; Left,
R := Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight);

if AZone.AutoHideBtnState = TJvDockBtnState.bsNormal then begin
PatternColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, sknsNormal, sknSkin);
PatternColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, sknsNormal);
if PatternColor = clNone then
PatternColor := CurrentSkin.GetTextColor(skncToolbarItem, sknsNormal, sknSkin);
PatternColor := CurrentSkin.GetTextColor(skncToolbarItem, sknsNormal);
if PatternColor = clNone then
PatternColor := clCaptionText;
end else begin
Expand Down Expand Up @@ -258,9 +258,9 @@ procedure TJvDockVSNETTreeSpTBX.DrawCloseButton(Canvas: TCanvas;
R := Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight);

if AZone.CloseBtnState = TJvDockBtnState.bsNormal then begin
PatternColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, sknsNormal, sknSkin);
PatternColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, sknsNormal);
if PatternColor = clNone then
PatternColor := CurrentSkin.GetTextColor(skncToolbarItem, sknsNormal, sknSkin);
PatternColor := CurrentSkin.GetTextColor(skncToolbarItem, sknsNormal);
if PatternColor = clNone then
PatternColor := clCaptionText;
end else begin
Expand Down Expand Up @@ -338,9 +338,9 @@ procedure TJvDockVSNETTreeSpTBX.DrawDockGrabber(Control: TWinControl;

Canvas.Brush.Style := bsClear; // body already painted
State := CurrentSkin.GetState(True, False, False, False);
TextColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, State, sknSkin);
TextColor := CurrentSkin.GetTextColor(skncDockablePanelTitleBar, State);
if TextColor = clNone then
TextColor := CurrentSkin.GetTextColor(skncToolbarItem, State, sknSkin);
TextColor := CurrentSkin.GetTextColor(skncToolbarItem, State);
if TextColor = clNone then
TextColor := clCaptionText;
Canvas.Font.Color := TextColor;
Expand Down Expand Up @@ -665,20 +665,20 @@ procedure TJvDockVSNETTabPanelSpTBX.Paint;
Inc(R.Bottom, 5);
// maintain background border
if IsActive then begin
SpDrawXPTab(Canvas, R, True, IsActive, False, False, Position, sknSkin, Edge);
SpDrawXPTab(Canvas, R, True, IsActive, False, False, Position, Edge);
ExcludeClipRect(Canvas.Handle, R.Left+1, ARect.Bottom - TabSheetBorderSize, R.Right-1, ARect.Bottom);
end;
end;
ttpBottom:
begin
Dec(R.Top, 5);
if IsActive then begin
SpDrawXPTab(Canvas, R, True, IsActive, False, False, Position, sknSkin, Edge);
SpDrawXPTab(Canvas, R, True, IsActive, False, False, Position, Edge);
ExcludeClipRect(Canvas.Handle, R.Left+1, 0, R.Right-1, TabSheetBorderSize);
end;
end;
end;
SpDrawXPTab(Canvas, R, True, IsActive, IsHot, False, Position, sknSkin, Edge);
SpDrawXPTab(Canvas, R, True, IsActive, IsHot, False, Position, Edge);
end
else begin
// Draw the separators
Expand Down Expand Up @@ -718,7 +718,7 @@ procedure TJvDockVSNETTabPanelSpTBX.Paint;

CaptionString := Page.Pages[I].Caption;
State := CurrentSkin.GetState(True, False, IsHot, IsActive);
TextColor := CurrentSkin.GetTextColor(skncTab, State, sknSkin);
TextColor := CurrentSkin.GetTextColor(skncTab, State);
if TextColor = clNone then
TextColor := clBtnText;
Canvas.Font.Color := TextColor;
Expand Down Expand Up @@ -755,7 +755,7 @@ procedure TJvDockVSNETTabPanelSpTBX.Paint;
Inc(CompleteWidth, CurrTabWidth + TabSplitterWidth);
end;
// Paint one side of the TabSheet background after drawing the tabs;
SpDrawXPTabControlBackground(Canvas, BgRect, Color, Page.TabPosition = tpBottom, sknSkin);
SpDrawXPTabControlBackground(Canvas, BgRect, Color, Page.TabPosition = tpBottom);
end;

procedure TJvDockVSNETTabPanelSpTBX.WMSpSkinChange(var Message: TMessage);
Expand Down Expand Up @@ -891,7 +891,7 @@ procedure TJvDockVSChannelSpTBX.Paint;
IsHot := TCrackJvDockVSBlock(Block).ActiveDockControl = Block.VSPane[I].DockForm;
IsChecked := Block.VSPane[I].Active;
State := CurrentSkin.GetState(True, False, IsHot, IsChecked);
SpDrawXPButton(Canvas, DrawRect, True, False, IsHot, IsChecked, False, False, sknSkin);
SpDrawXPButton(Canvas, DrawRect, True, False, IsHot, IsChecked, False, False);

AdjustImagePos;
SpDrawImageList(Canvas, R, Block.ImageList, I, True, False);
Expand All @@ -916,7 +916,7 @@ procedure TJvDockVSChannelSpTBX.Paint;
OldGraphicsMode := SetGraphicsMode(Canvas.Handle, GM_ADVANCED);
Canvas.Brush.Style := bsClear;

TextColor := CurrentSkin.GetTextColor(skncButton, State, sknSkin);
TextColor := CurrentSkin.GetTextColor(skncButton, State);
if TextColor = clNone then
TextColor := clBtnText;
Canvas.Font.Color := TextColor;
Expand Down Expand Up @@ -1170,7 +1170,7 @@ procedure TJvDockVSNETTabSheetSpTBX.WMEraseBkgnd(var Message: TMessage);
else
Dec(R.Top, TabSheetBorderSize);

SpDrawXPTabControlBackground(ACanvas, R, Color, (PageControl as TJvDockVSNETTabPageControlSpTBX).TabPosition = tpBottom, sknSkin);
SpDrawXPTabControlBackground(ACanvas, R, Color, (PageControl as TJvDockVSNETTabPageControlSpTBX).TabPosition = tpBottom);
finally
ACanvas.Handle := 0;
ACanvas.Free;
Expand Down
4 changes: 2 additions & 2 deletions Components/PyScripterCustom.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ requires
vcl,
rtl,
vclx,
SpTBXLib_d16,
tb2k_d16,
SpTBXLib_XE7,
tb2k_XE7,
vclactnband,
vcldb,
dbrtl,
Expand Down
Loading

0 comments on commit 8c51ae7

Please sign in to comment.