Permalink
Browse files

Version 2.6

Compatibility with Python 3.4
  • Loading branch information...
pyscripter
pyscripter committed Mar 20, 2015
1 parent e7fccb2 commit 8c51ae71371ceeb6c3fded31c0f03252f5f969af
@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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);
@@ -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);
@@ -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;
@@ -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;
@@ -36,8 +36,8 @@ requires
vcl,
rtl,
vclx,
- SpTBXLib_d16,
- tb2k_d16,
+ SpTBXLib_XE7,
+ tb2k_XE7,
vclactnband,
vcldb,
dbrtl,
Oops, something went wrong.

0 comments on commit 8c51ae7

Please sign in to comment.