[JVCL-Checkins] CVS: dev/JVCL3/run JvAVICapture.pas,1.4,1.5 JvArrowButton.pas,1.3,1.4

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv14220/run

Modified Files:
	JvAVICapture.pas JvArrowButton.pas 
Log Message:
Some improvements for CLX compatible

Index: JvAVICapture.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAVICapture.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvAVICapture.pas	18 Oct 2003 07:18:45 -0000	1.4
--- JvAVICapture.pas	25 Oct 2003 10:41:10 -0000	1.5
***************
*** 5,11 ****
  http://www.mozilla.org/MPL/
  
! Software distributed under the License is distributed on an "AS IS" basis, 
! WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for 
! the specific language governing rights and limitations under the License. 
  
  The Original Code is: JvAVICapture.PAS, released 2003-07-05.
--- 5,11 ----
  http://www.mozilla.org/MPL/
  
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for
! the specific language governing rights and limitations under the License.
  
  The Original Code is: JvAVICapture.PAS, released 2003-07-05.
***************
*** 36,39 ****
--- 36,40 ----
  
  {$I JVCL.INC}
+ {$I WINDOWSONLY.INC}
  
  unit JvAVICapture;

Index: JvArrowButton.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvArrowButton.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvArrowButton.pas	27 Sep 2003 15:14:52 -0000	1.3
--- JvArrowButton.pas	25 Oct 2003 10:41:10 -0000	1.4
***************
*** 17,21 ****
  Contributor(s):
  
! Last Modified: 2002-05-26
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
--- 17,21 ----
  Contributor(s):
  
! Last Modified: 2003-10-25
  
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
***************
*** 35,41 ****
  interface
  
! uses Windows, Messages, Classes, Controls, Forms, Graphics, StdCtrls,
!   ExtCtrls, Buttons, CommCtrl, Menus,
!   JvComponent;
  
  type
--- 35,49 ----
  interface
  
! uses
!   SysUtils, Classes,
!   {$IFDEF COMPLIB_VCL}
!   Windows, Messages, Controls, Forms, Graphics, Buttons, CommCtrl,
!   Menus,
!   {$ENDIF}
!   {$IFDEF COMPLIB_CLX}
!   Types, QControls, QForms, QGraphics, QButtons, QImgList,
!   Menus,
!   {$ENDIF}
!   JvClxUtils, JvComponent;
  
  type
***************
*** 88,92 ****
      procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
        X, Y: Integer); override;
-     procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
      procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
        X, Y: Integer); override;
--- 96,99 ----
***************
*** 130,134 ****
  
  uses
!   Consts, SysUtils, JvThemes;
  
  type
--- 137,141 ----
  
  uses
!   Consts, JvThemes;
  
  type
***************
*** 575,579 ****
--- 582,588 ----
  procedure TButtonGlyph.DrawButtonText(Canvas: TCanvas; const Caption: string;
    TextBounds: TRect; State: TButtonState);
+ var S: string;
  begin
+   S := Caption;
    with Canvas do
    begin
***************
*** 583,593 ****
        OffsetRect(TextBounds, 1, 1);
        Font.Color := clBtnHighlight;
!       DrawText(Handle, PChar(Caption), Length(Caption), TextBounds, 0);
        OffsetRect(TextBounds, -1, -1);
        Font.Color := clBtnShadow;
!       DrawText(Handle, PChar(Caption), Length(Caption), TextBounds, 0);
      end
      else
!       DrawText(Handle, PChar(Caption), Length(Caption), TextBounds,
          DT_CENTER or DT_VCENTER or DT_SINGLELINE);
    end;
--- 592,602 ----
        OffsetRect(TextBounds, 1, 1);
        Font.Color := clBtnHighlight;
!       ClxDrawText(Canvas, S, TextBounds, 0);
        OffsetRect(TextBounds, -1, -1);
        Font.Color := clBtnShadow;
!       ClxDrawText(Canvas, S, TextBounds, 0);
      end
      else
!       ClxDrawText(Canvas, S, TextBounds,
          DT_CENTER or DT_VCENTER or DT_SINGLELINE);
    end;
***************
*** 601,604 ****
--- 610,614 ----
    ClientSize, GlyphSize, TextSize: TPoint;
    TotalSize: TPoint;
+   S: string;
  begin
    { calculate the item sizes }
***************
*** 614,618 ****
    begin
      TextBounds := Rect(0, 0, Client.Right - Client.Left, 0);
!     DrawText(Canvas.Handle, PChar(Caption), Length(Caption), TextBounds, DT_CALCRECT);
      TextSize := Point(TextBounds.Right - TextBounds.Left, TextBounds.Bottom -
        TextBounds.Top);
--- 624,629 ----
    begin
      TextBounds := Rect(0, 0, Client.Right - Client.Left, 0);
!     S := Caption;
!     ClxDrawText(Canvas, S, TextBounds, DT_CALCRECT);
      TextSize := Point(TextBounds.Right - TextBounds.Left, TextBounds.Bottom -
        TextBounds.Top);
***************
*** 952,960 ****
    FArrowClick := False;
    Repaint;
- end;
- 
- procedure TJvArrowButton.MouseMove(Shift: TShiftState; X, Y: Integer);
- begin
-   inherited MouseMove(Shift, X, Y);
  end;
  
--- 963,966 ----