[JVCL-Checkins] dev/JVCL3/run JvLookOut.pas,1.15,1.16 JvOutlookBar.pas,1.32,1.33 - VisualCLX updates

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

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

Modified Files:
	JvLookOut.pas JvOutlookBar.pas 
Log Message:
VisualCLX updates


Index: JvLookOut.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLookOut.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvLookOut.pas	25 Mar 2004 13:25:52 -0000	1.15
--- JvLookOut.pas	25 Apr 2004 00:57:12 -0000	1.16
***************
*** 33,38 ****
  
  uses
!   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
    StdCtrls, ExtCtrls, Buttons, Menus, ImgList,
    JvTypes, JvConsts, JvComponent, JvThemes, JvExControls, JvExButtons;
  
--- 33,45 ----
  
  uses
!   SysUtils, Classes,
!   {$IFDEF VCL}
!   Windows, Messages, Graphics, Controls, Forms,
    StdCtrls, ExtCtrls, Buttons, Menus, ImgList,
+   {$ENDIF VCL}
+   {$IFDEF VisualCLX}
+   Types, QGraphics, QControls, QForms, QStdCtrls, QExtCtrls, QButtons,
+   QMenus, QImgList, QTypes, QWindows,
+   {$ENDIF VisualCLX}
    JvTypes, JvConsts, JvComponent, JvThemes, JvExControls, JvExButtons;
  
***************
*** 51,55 ****
--- 58,64 ----
      FFlat: Boolean;
      procedure SetFlat(Value: Boolean);
+     {$IFDEF VCL}
      procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST;
+     {$ENDIF VCL}
    protected
      procedure OnTime(Sender: TObject); virtual;
***************
*** 137,141 ****
        X, Y: Integer);
      procedure PaintFrame; virtual;
!     procedure SetParent(AParent: TWinControl); override;
      procedure Paint; override;
      procedure MouseEnter(Control: TControl); override;
--- 146,150 ----
        X, Y: Integer);
      procedure PaintFrame; virtual;
!     procedure SetParent({$IFDEF VisualCLX}const {$ENDIF}AParent: TWinControl); override;
      procedure Paint; override;
      procedure MouseEnter(Control: TControl); override;
***************
*** 186,190 ****
--- 195,201 ----
      property Constraints;
      property Down;
+     {$IFDEF VCL}
      property DragCursor;
+     {$ENDIF VCL}
      property DragMode;
      property Enabled;
***************
*** 232,236 ****
--- 243,249 ----
      property Constraints;
      property Down;
+     {$IFDEF VCL}
      property DragCursor;
+     {$ENDIF VCL}
      property DragMode;
      property Enabled;
***************
*** 324,329 ****
      procedure ScrollChildren(Start: Word); virtual;
      procedure AlignControls(Control: TControl; var Rect: TRect); override;
!     procedure SetParent(AParent: TWinControl); override;
      procedure CreateWnd; override;
      procedure SmoothScroll(AControl: TControl; NewTop, AInterval: Integer; Smooth: Boolean); virtual;
      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
--- 337,347 ----
      procedure ScrollChildren(Start: Word); virtual;
      procedure AlignControls(Control: TControl; var Rect: TRect); override;
!     procedure SetParent({$IFDEF VisualCLX}const {$ENDIF}AParent: TWinControl); override;
!     {$IFDEF VCL}
      procedure CreateWnd; override;
+     {$ENDIF VCL}
+     {$IFDEF VisualCLX}
+     procedure CreateWidget; override;
+     {$ENDIF VisualCLX}
      procedure SmoothScroll(AControl: TControl; NewTop, AInterval: Integer; Smooth: Boolean); virtual;
      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
***************
*** 359,363 ****
--- 377,383 ----
      property Caption: TCaption read FCaption write SetCaption;
      property Color;
+     {$IFDEF VCL}
      property DragCursor;
+     {$ENDIF VCL}
      property DragMode;
      property ShowHint;
***************
*** 408,415 ****
      procedure SetPage(Index: Integer; Value: TJvLookOutPage);
      procedure SetFlatButtons(Value: Boolean);
      procedure WMNCCalcSize(var Msg: TWMNCCalcSize); message WM_NCCALCSIZE;
      procedure WMNCPaint(var Msg: TMessage); message WM_NCPAINT;
    protected
!     procedure SetAutoSize(Value: Boolean); override; 
      procedure SmoothScroll(AControl: TControl; NewTop, AInterval: Integer; Smooth: Boolean); virtual;
      procedure Paint; override;
--- 428,437 ----
      procedure SetPage(Index: Integer; Value: TJvLookOutPage);
      procedure SetFlatButtons(Value: Boolean);
+     {$IFDEF VCL}
      procedure WMNCCalcSize(var Msg: TWMNCCalcSize); message WM_NCCALCSIZE;
+     {$ENDIF VCL}
      procedure WMNCPaint(var Msg: TMessage); message WM_NCPAINT;
    protected
!     procedure SetAutoSize(Value: Boolean); override;
      procedure SmoothScroll(AControl: TControl; NewTop, AInterval: Integer; Smooth: Boolean); virtual;
      procedure Paint; override;
***************
*** 430,434 ****
--- 452,458 ----
      property Color default clBtnShadow;
      property FlatButtons: Boolean read FFlatButtons write SetFlatButtons default False;
+     {$IFDEF VCL}
      property DragCursor;
+     {$ENDIF VCL}
      property DragMode;
      property ImageSize: TJvImageSize read FImageSize write SetImageSize default isLarge;
***************
*** 460,466 ****
      procedure DrawTopButton; override;
      procedure Paint; override;
      procedure CreateWnd; override;
-     procedure WMNCPaint(var Msg: TMessage); message WM_NCPAINT;
      procedure WMNCCalcSize(var Msg: TWMNCCalcSize); message WM_NCCALCSIZE;
    public
      constructor Create(AOwner: TComponent); override;
--- 484,495 ----
      procedure DrawTopButton; override;
      procedure Paint; override;
+     {$IFDEF VCL}
      procedure CreateWnd; override;
      procedure WMNCCalcSize(var Msg: TWMNCCalcSize); message WM_NCCALCSIZE;
+     {$ENDIF VCL}
+     procedure WMNCPaint(var Msg: TMessage); message WM_NCPAINT;
+     {$IFDEF VisualCLX}
+     procedure CreateWidget; override;
+     {$ENDIF VisualCLX}
    public
      constructor Create(AOwner: TComponent); override;
***************
*** 475,480 ****
--- 504,515 ----
  implementation
  
+ {$IFDEF VCL}
  uses
    ActnList;
+ {$ENDIF VCL}
+ {$IFDEF VisualCLX}
+ uses
+   QActnList;
+ {$ENDIF VisualCLX}
  
  const
***************
*** 639,646 ****
--- 674,683 ----
  end;
  
+ {$IFDEF VCL}
  procedure TJvUpArrowBtn.CMDesignHitTest(var Msg: TCMDesignHitTest);
  begin
    Msg.Result := 1;
  end;
+ {$ENDIF VCL}
  
  procedure TJvUpArrowBtn.Paint;
***************
*** 1208,1212 ****
      PaintFrame;
  
!     Flags := DT_END_ELLIPSIS or DT_EDITCONTROL;
  
      if (FImageSize = isSmall) and Assigned(FSmallImages) then
--- 1245,1249 ----
      PaintFrame;
  
!     Flags := DT_END_ELLIPSIS {$IFDEF VCL}or DT_EDITCONTROL{$ENDIF};
  
      if (FImageSize = isSmall) and Assigned(FSmallImages) then
***************
*** 1242,1246 ****
        R.Left := R.Left + FSmallImages.Width + (FSpacing * 3)
      else
!       Flags := DT_END_ELLIPSIS or DT_EDITCONTROL or DT_WORDBREAK or DT_CENTER or DT_VCENTER;
      if FDown then
        OffsetRect(R, FOffset, FOffset);
--- 1279,1283 ----
        R.Left := R.Left + FSmallImages.Width + (FSpacing * 3)
      else
!       Flags := DT_END_ELLIPSIS or DT_WORDBREAK or DT_CENTER or DT_VCENTER {$IFDEF VCL}or DT_EDITCONTROL{$ENDIF};
      if FDown then
        OffsetRect(R, FOffset, FOffset);
***************
*** 1302,1306 ****
--- 1339,1348 ----
      begin
        Canvas.Brush.Style := bsBDiagonal;
+       {$IFDEF VCL}
        Windows.FillRect(Canvas.Handle, R, Canvas.Brush.Handle);
+       {$ENDIF VCL}
+       {$IFDEF VisualCLX}
+       QWindows.FillRect(Canvas.Handle, R, Canvas.Brush.Handle);
+       {$ENDIF VisualCLX}
        Canvas.Brush.Style := bsSolid;
      end
***************
*** 1314,1318 ****
--- 1356,1365 ----
      begin { fill it up! }
        Canvas.Brush.Color := FFillColor;
+       {$IFDEF VCL}
        Windows.FillRect(Canvas.Handle, R, Canvas.Brush.Handle);
+       {$ENDIF VCL}
+       {$IFDEF VisualCLX}
+       QWindows.FillRect(Canvas.Handle, R, Canvas.Brush.Handle);
+       {$ENDIF VisualCLX}
      end;
  
***************
*** 1494,1498 ****
  end;
  
! procedure TJvCustomLookOutButton.SetParent(AParent: TWinControl);
  begin
    if AParent <> Parent then
--- 1541,1545 ----
  end;
  
! procedure TJvCustomLookOutButton.SetParent({$IFDEF VisualCLX}const {$ENDIF}AParent: TWinControl);
  begin
    if AParent <> Parent then
***************
*** 1755,1759 ****
  end;
  
! procedure TJvLookOutPage.SetParent(AParent: TWinControl);
  begin
    if AParent <> Parent then
--- 1802,1806 ----
  end;
  
! procedure TJvLookOutPage.SetParent({$IFDEF VisualCLX}const {$ENDIF}AParent: TWinControl);
  begin
    if AParent <> Parent then
***************
*** 1899,1907 ****
--- 1946,1964 ----
  end;
  
+ {$IFDEF VCL}
  procedure TJvLookOutPage.CreateWnd;
+ {$ENDIF VCL}
+ {$IFDEF VisualCLX}
+ procedure TJvLookOutPage.CreateWidget;
+ {$ENDIF VisualCLX}
  var
    R: TRect;
  begin
+   {$IFDEF VCL}
    inherited CreateWnd;
+   {$ENDIF VCL}
+   {$IFDEF VisualCLX}
+   inherited CreateWidget;
+   {$ENDIF VisualCLX}
    R := GetClientRect;
    if not Assigned(FUpArrow) then
***************
*** 2619,2622 ****
--- 2676,2680 ----
  end;
  
+ 
  procedure TJvLookOut.WMNCPaint(var Msg: TMessage);
  var
***************
*** 2660,2663 ****
--- 2718,2724 ----
    if not (Visible or (csDesigning in ComponentState)) then
      Exit;
+   {$IFDEF VisualCLX}
+   Perform(WM_NCPAINT, 1, 0);
+   {$ENDIF VisualCLX}
    Canvas.Brush.Color := Color;
    Canvas.FillRect(GetClientRect);
***************
*** 2681,2684 ****
--- 2742,2748 ----
  procedure TJvExpress.Paint;
  begin
+   {$IFDEF VisualCLX}
+   Perform(WN_NCPAINT, 1, 0);
+   {$ENDIF VisualCLX}
    if not FBitmap.Empty then
    begin
***************
*** 2799,2802 ****
--- 2863,2867 ----
  end;
  
+ {$IFDEF VCL}
  procedure TJvExpress.WMNCCalcSize(var Msg: TWMNCCalcSize);
  begin
***************
*** 2805,2812 ****
--- 2870,2885 ----
    inherited;
  end;
+ {$ENDIF VCL}
  
+ {$IFDEF VCL}
  procedure TJvExpress.CreateWnd;
  begin
    inherited CreateWnd;
+ {$ENDIF VCL}
+ {$IFDEF VisualCLX}
+ procedure TJvExpress.CreateWidget;
+ begin
+   inherited CreateWidget;
+ {$ENDIF VisualCLX}
    if not Assigned(FUpArrow) then
      FUpArrow := TJvUpArrowBtn.Create(nil);

Index: JvOutlookBar.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvOutlookBar.pas,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** JvOutlookBar.pas	8 Apr 2004 09:39:09 -0000	1.32
--- JvOutlookBar.pas	25 Apr 2004 00:57:13 -0000	1.33
***************
*** 40,46 ****
  
  uses
!   Windows, Messages, SysUtils, Classes, Controls,
!   Buttons, Graphics, ImgList, Forms, StdCtrls, ExtCtrls,
!   JvThemes,
  {$IFDEF JVCLThemesEnabled}
    UxTheme,
--- 40,48 ----
  
  uses
!   SysUtils, Classes,
! 
! {$IFDEF VCL}
!   Windows, Messages, Controls, Buttons, Graphics,
!   ImgList, Forms, StdCtrls, ExtCtrls,
  {$IFDEF JVCLThemesEnabled}
    UxTheme,
***************
*** 49,53 ****
  {$ENDIF COMPILER7_UP}
  {$ENDIF JVCLThemesEnabled}
!   JvComponent;
  
  const
--- 51,61 ----
  {$ENDIF COMPILER7_UP}
  {$ENDIF JVCLThemesEnabled}
! {$ENDIF VCL}
! 
! {$IFDEF VisualCLX}
!   Types, QControls, QButtons, QGraphics,
!   QImgList, QForms, QStdCtrls, QExtCtrls, QWindows,
! {$ENDIF VisualCLX}
!   JvThemes, JvComponent, JvExButtons;
  
  const
***************
*** 275,279 ****
      procedure DoPageChange(Index: Integer); virtual;
      procedure DoButtonClick(Index: Integer); virtual;
!     procedure DoContextPopup(MousePos: TPoint; var Handled: Boolean); override;
      function DoDrawBackGround: boolean;
      function DoDrawPage(ARect: TRect; Index: integer): boolean;
--- 283,287 ----
      procedure DoPageChange(Index: Integer); virtual;
      procedure DoButtonClick(Index: Integer); virtual;
!     procedure DoContextPopup({$IFDEF VisualCLX}const {$ENDIF}MousePos: TPoint; var Handled: Boolean); override;
      function DoDrawBackGround: boolean;
      function DoDrawPage(ARect: TRect; Index: integer): boolean;
***************
*** 337,348 ****
      property Action;
      property Anchors;
      property BiDiMode;
      property ParentBiDiMode;
      property BorderStyle;
      property Color;
      property Constraints;
      property Cursor;
-     property DragCursor;
-     property DragKind;
      property DragMode;
      property Font;
--- 345,358 ----
      property Action;
      property Anchors;
+     {$IFDEF VCL}
      property BiDiMode;
      property ParentBiDiMode;
+     property DragCursor;
+     property DragKind;
+     {$ENDIF VCL}
      property BorderStyle;
      property Color;
      property Constraints;
      property Cursor;
      property DragMode;
      property Font;
***************
*** 374,383 ****
    Math;
  
! {$IFDEF MSWINDOWS}
  {$R ..\Resources\JvOutlookBar.res}
! {$ENDIF MSWINDOWS}
! {$IFDEF LINUX}
  {$R ../Resources/JvOutlookBar.res}
! {$ENDIF LINUX}
  
  const
--- 384,393 ----
    Math;
  
! {$IFDEF VCL}
  {$R ..\Resources\JvOutlookBar.res}
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
  {$R ../Resources/JvOutlookBar.res}
! {$ENDIF VisualCLX}
  
  const
***************
*** 393,397 ****
--- 403,409 ----
    private
      FCanvas: TControlCanvas;
+     {$IFDEF VCL}
      procedure WMNCPaint(var Msg: TMessage); message WM_NCPAINT;
+     {$ENDIF VCL}
      procedure EditAccept;
      procedure EditCancel;
***************
*** 515,518 ****
--- 527,531 ----
  end;
  
+ {$IFDEF VCL}
  procedure TJvOutlookBarEdit.WMNCPaint(var Msg: TMessage);
  //var
***************
*** 555,569 ****
    *)
  end;
! 
  //=== TJvRepeatButton ========================================================
  
  type
    // auto-repeating button using a timer (stolen from Borland's Spin.pas sample component)
!   TJvRepeatButton = class(TSpeedButton)
    private
      FRepeatTimer: TTimer;
      procedure TimerExpired(Sender: TObject);
    protected
!     procedure CMVisibleChanged(var Msg: TMessage); message CM_VISIBLECHANGED;
      procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
        X, Y: Integer); override;
--- 568,582 ----
    *)
  end;
! {$ENDIF VCL}
  //=== TJvRepeatButton ========================================================
  
  type
    // auto-repeating button using a timer (stolen from Borland's Spin.pas sample component)
!   TJvRepeatButton = class(TJvExSpeedButton)
    private
      FRepeatTimer: TTimer;
      procedure TimerExpired(Sender: TObject);
    protected
!     procedure VisibleChanged; override;
      procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
        X, Y: Integer); override;
***************
*** 576,580 ****
  { TJvRepeatButton }
  
! procedure TJvRepeatButton.CMVisibleChanged(var Msg: TMessage);
  begin
    inherited;
--- 589,593 ----
  { TJvRepeatButton }
  
! procedure TJvRepeatButton.VisibleChanged;
  begin
    inherited;
***************
*** 1226,1229 ****
--- 1239,1243 ----
  end;
  
+ {$IFDEF VCL}
  procedure TJvCustomOutlookBar.CreateParams(var Params: TCreateParams);
  const
***************
*** 1241,1244 ****
--- 1255,1259 ----
    end;
  end;
+ {$ENDIF VCL}
  
  procedure TJvCustomOutlookBar.DoChangeLinkChange(Sender: TObject);
***************
*** 2167,2171 ****
  end;
  
! procedure TJvCustomOutlookBar.DoContextPopup(MousePos: TPoint;
    var Handled: Boolean);
  var
--- 2182,2186 ----
  end;
  
! procedure TJvCustomOutlookBar.DoContextPopup({$IFDEF VisualCLX}const {$ENDIF}MousePos: TPoint;
    var Handled: Boolean);
  var