[JVCL-Checkins] dev/JVCL3/run JvTransparentButton.pas,1.37,1.38 - cleaned ifdefs

[André S. <asn...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32631/JVCL3/run

Modified Files:
	JvTransparentButton.pas 
Log Message:
cleaned ifdefs


Index: JvTransparentButton.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTransparentButton.pas,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** JvTransparentButton.pas	1 Sep 2004 15:06:53 -0000	1.37
--- JvTransparentButton.pas	9 Sep 2004 22:54:39 -0000	1.38
***************
*** 35,39 ****
    ExtCtrls, Menus, Forms, ImgList, ActnList, Buttons,
    {$IFDEF VCL}
!   CommCtrl,
    {$ENDIF VCL}
    JvComponent, JvButton;
--- 35,39 ----
    ExtCtrls, Menus, Forms, ImgList, ActnList, Buttons,
    {$IFDEF VCL}
!   CommCtrl, JvJCLUtils,
    {$ENDIF VCL}
    JvComponent, JvButton;
***************
*** 258,266 ****
    JvConsts;
  
- {$IFDEF VisualCLX}
- const
-   clBtnHighlight = clNormalLight;
-   clBtnShadow = clNormalDark;
- {$ENDIF VisualCLX}
  
  { create a grayed version of a color bitmap }
--- 258,261 ----
***************
*** 738,749 ****
  { just like DrawText, but draws disabled instead }
  
! {$IFDEF VCL}
! function DrawDisabledText(DC: HDC; lpString: PChar;
!   nCount: Integer; var lpRect: TRect; uFormat: Integer): Integer;
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
! function DrawDisabledText(DC: HDC; lpString: PWideChar;
    nCount: Integer; var lpRect: TRect; uFormat: Integer): Integer;
- {$ENDIF VisualCLX}
  var
    OldCol: Integer;
--- 733,738 ----
  { just like DrawText, but draws disabled instead }
  
! function DrawDisabledText(DC: HDC; Caption: TCaption;
    nCount: Integer; var lpRect: TRect; uFormat: Integer): Integer;
  var
    OldCol: Integer;
***************
*** 751,758 ****
    OldCol := SetTextColor(DC, ColorToRGB(clBtnHighlight));
    OffsetRect(lpRect, 1, 1);
!   DrawText(DC, lpString, nCount, lpRect, uFormat);
    OffsetRect(lpRect, -1, -1);
    SetTextColor(DC, ColorToRGB(clBtnShadow));
!   Result := DrawText(DC, lpString, nCount, lpRect, uFormat);
    SetTextColor(DC, OldCol);
  end;
--- 740,747 ----
    OldCol := SetTextColor(DC, ColorToRGB(clBtnHighlight));
    OffsetRect(lpRect, 1, 1);
!   DrawText(DC, Caption, nCount, lpRect, uFormat);
    OffsetRect(lpRect, -1, -1);
    SetTextColor(DC, ColorToRGB(clBtnShadow));
!   Result := DrawText(DC, Caption, nCount, lpRect, uFormat);
    SetTextColor(DC, OldCol);
  end;
***************
*** 780,788 ****
  
    { calculate width and height of text: }
!   {$IFDEF VCL}
!   DrawText(DC, PChar(Caption), Length(Caption), TmpRect, Flags or DT_CALCRECT);
!   {$ENDIF VCL}
!   {$IFDEF VisualCLX}
!   DrawText(Canvas, Caption, Length(Caption), TmpRect, Flags or DT_CALCRECT);
  {
    if FWordWrap then
--- 769,773 ----
  
    { calculate width and height of text: }
!   DrawText(DC, Caption, Length(Caption), TmpRect, Flags or DT_CALCRECT);
  {
    if FWordWrap then
***************
*** 791,795 ****
      Canvas.TextExtent(Caption, TmpRect, 0);
  }
-   {$ENDIF VisualCLX}
    MidY := TmpRect.Bottom - TmpRect.Top;
    MidX := TmpRect.Right - TmpRect.Left;
--- 776,779 ----
***************
*** 824,843 ****
      OffsetRect(TmpRect, FOffset, FOffset);
  
-   {$IFDEF VCL}
    SetBkMode(DC, Windows.TRANSPARENT);
    if not Enabled then
!     DrawDisabledText(DC, PChar(Caption), -1, TmpRect, Flags)
!   else
!   begin
!     if (bsMouseInside in MouseStates) and HotTrack then
!       SetTextColor(DC, ColorToRGB(HotTrackFont.Color))
!     else
!       SetTextColor(DC, ColorToRGB(Self.Font.Color));
!     DrawText(DC, PChar(Caption), -1, TmpRect, Flags);
!   end;
!   {$ENDIF VCL}
!   {$IFDEF VisualCLX}
!   if not Enabled then
!     DrawDisabledText(DC, PWideChar(Caption), -1, TmpRect, Flags)
    else
    begin
--- 808,814 ----
      OffsetRect(TmpRect, FOffset, FOffset);
  
    SetBkMode(DC, Windows.TRANSPARENT);
    if not Enabled then
!     DrawDisabledText(DC, Caption, -1, TmpRect, Flags)
    else
    begin
***************
*** 846,852 ****
      else
        SetTextColor(DC, ColorToRGB(Self.Font.Color));
!     DrawTextW(DC, PWideChar(Caption), -1, TmpRect, Flags);
    end;
-   {$ENDIF VisualCLX}
  end;
  
--- 817,822 ----
      else
        SetTextColor(DC, ColorToRGB(Self.Font.Color));
!     DrawText(DC, Caption, -1, TmpRect, Flags);
    end;
  end;
  
***************
*** 1086,1089 ****
--- 1056,1060 ----
        {$IFDEF VisualCLX}
        FActiveList.GetBitmap(FActiveIndex, Bmp);
+       GrayBitmap(Bmp, 11, 59, 30);
        FImList.AddMasked(Bmp, Bmp.TransparentColor);
        {$ENDIF VisualCLX}