[JVCL-Checkins] CVS: dev/JVCL3/run JvBmpAnimator.pas,1.9,1.10 JvCalc.pas,1.10,1.11 JvCaptionPanel.pas,1.11,1.12 JvCheckBox.pas,1.25,1.26 JvComCtrls.pas,1.17,1.18 JvFormToHtml.pas,1.4,1.5 JvGammaPanel.pas,1.11,1.12 JvGradient.pas,1.4,1.5 JvGroupBox.pas,1.13,1.14 JvImagesViewer.pas,1.7,1.8 JvItemsPanel.pas,1.12,1.13 JvLED.pas,1.6,1.7 JvTurtle.pas,1.16,1.17 JvgWinMask.pas,1.7,1.8 - style cleaning after CLX support added

[Robert M. <mar...@us...>]

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

Modified Files:
	JvBmpAnimator.pas JvCalc.pas JvCaptionPanel.pas JvCheckBox.pas 
	JvComCtrls.pas JvFormToHtml.pas JvGammaPanel.pas 
	JvGradient.pas JvGroupBox.pas JvImagesViewer.pas 
	JvItemsPanel.pas JvLED.pas JvTurtle.pas JvgWinMask.pas 
Log Message:
style cleaning after CLX support added

Index: JvBmpAnimator.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBmpAnimator.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvBmpAnimator.pas	7 Jan 2004 21:52:47 -0000	1.9
--- JvBmpAnimator.pas	8 Jan 2004 16:27:42 -0000	1.10
***************
*** 46,50 ****
    JvComponent;
  
- 
  type
    TJvAnimateDirection = (tdForward, tdBack, tdFwdBack, tdBackFwd);
--- 46,49 ----

Index: JvCalc.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCalc.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvCalc.pas	7 Jan 2004 21:52:47 -0000	1.10
--- JvCalc.pas	8 Jan 2004 16:27:42 -0000	1.11
***************
*** 98,102 ****
      procedure CopyItemClick(Sender: TObject);
      procedure PasteItemClick(Sender: TObject);
!     procedure CMCtl3DChanged(var Message: TMessage); message CM_CTL3DCHANGED;
    protected
      procedure OkClick(Sender: TObject);
--- 98,102 ----
      procedure CopyItemClick(Sender: TObject);
      procedure PasteItemClick(Sender: TObject);
!     procedure CMCtl3DChanged(var Msg: TMessage); message CM_CTL3DCHANGED;
    protected
      procedure OkClick(Sender: TObject);
***************
*** 120,124 ****
    JvJVCLUtils, JvJCLUtils, JvConsts, JvResources;
  
! {$R ..\resources\JvCalc.res}
  
  type
--- 120,124 ----
    JvJVCLUtils, JvJCLUtils, JvConsts, JvResources;
  
! {$R ..\Resources\JvCalc.res}
  
  type
***************
*** 185,189 ****
      FFontChanging: Boolean;
    protected
!     procedure CMParentFontChanged(var Message: TMessage); message CM_PARENTFONTCHANGED;
    public
      constructor CreateKind(AOwner: TComponent; AKind: TCalcBtnKind);
--- 185,189 ----
      FFontChanging: Boolean;
    protected
!     procedure CMParentFontChanged(var Msg: TMessage); message CM_PARENTFONTCHANGED;
    public
      constructor CreateKind(AOwner: TComponent; AKind: TCalcBtnKind);
***************
*** 202,206 ****
  end;
  
! procedure TJvCalcButton.CMParentFontChanged(var Message: TMessage);
  
    function BtnColor(Kind: TCalcBtnKind): TColor;
--- 202,206 ----
  end;
  
! procedure TJvCalcButton.CMParentFontChanged(var Msg: TMessage);
  
    function BtnColor(Kind: TCalcBtnKind): TColor;
***************
*** 344,348 ****
      procedure UpdateMemoryLabel;
      function FindButton(Key: Char): TJvSpeedButton;
!     procedure CMCtl3DChanged(var Message: TMessage); message CM_CTL3DCHANGED;
      procedure BtnClick(Sender: TObject);
    protected
--- 344,348 ----
      procedure UpdateMemoryLabel;
      function FindButton(Key: Char): TJvSpeedButton;
!     procedure CMCtl3DChanged(var Msg: TMessage); message CM_CTL3DCHANGED;
      procedure BtnClick(Sender: TObject);
    protected
***************
*** 535,539 ****
  end;
  
! procedure TJvCalculatorPanel.CMCtl3DChanged(var Message: TMessage);
  const
    Ctl3DStyle: array [Boolean] of TButtonStyle = (bsWin31, bsNew);
--- 535,539 ----
  end;
  
! procedure TJvCalculatorPanel.CMCtl3DChanged(var Msg: TMessage);
  const
    Ctl3DStyle: array [Boolean] of TButtonStyle = (bsWin31, bsNew);
***************
*** 803,807 ****
    TJvLocCalculator = class(TJvCalculatorPanel)
    private
!     procedure CMEnabledChanged(var Message: TMessage); message CM_ENABLEDCHANGED;
    protected
      procedure CreateParams(var Params: TCreateParams); override;
--- 803,807 ----
    TJvLocCalculator = class(TJvCalculatorPanel)
    private
!     procedure CMEnabledChanged(var Msg: TMessage); message CM_ENABLEDCHANGED;
    protected
      procedure CreateParams(var Params: TCreateParams); override;
***************
*** 819,823 ****
  end;
  
! procedure TJvLocCalculator.CMEnabledChanged(var Message: TMessage);
  begin
    if HandleAllocated and not (csDesigning in ComponentState) then
--- 819,823 ----
  end;
  
! procedure TJvLocCalculator.CMEnabledChanged(var Msg: TMessage);
  begin
    if HandleAllocated and not (csDesigning in ComponentState) then
***************
*** 1150,1154 ****
  end;
  
! procedure TJvCalculatorForm.CMCtl3DChanged(var Message: TMessage);
  const
    Ctl3DBevel: array [Boolean] of TPanelBevel = (bvNone, bvLowered);
--- 1150,1154 ----
  end;
  
! procedure TJvCalculatorForm.CMCtl3DChanged(var Msg: TMessage);
  const
    Ctl3DBevel: array [Boolean] of TPanelBevel = (bvNone, bvLowered);

Index: JvCaptionPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCaptionPanel.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvCaptionPanel.pas	7 Jan 2004 22:21:10 -0000	1.11
--- JvCaptionPanel.pas	8 Jan 2004 16:27:42 -0000	1.12
***************
*** 41,45 ****
  
  {$IFDEF VisualCLX}
!  {$DEFINE JVCAPTIONPANEL_STD_BEHAVE}
  {$ENDIF VisualCLX}
  
--- 41,45 ----
  
  {$IFDEF VisualCLX}
!   {$DEFINE JVCAPTIONPANEL_STD_BEHAVE}
  {$ENDIF VisualCLX}
  
***************
*** 492,496 ****
  procedure TJvCaptionPanel.AlignControls(AControl: TControl; var Rect: TRect);
  begin
!   case FDrawPosition of //
      dpLeft:
        Rect := Classes.Rect(FCaptionWidth + FCaptionOffsetSmall, 0, ClientWidth, ClientHeight);
--- 492,496 ----
  procedure TJvCaptionPanel.AlignControls(AControl: TControl; var Rect: TRect);
  begin
!   case FDrawPosition of
      dpLeft:
        Rect := Classes.Rect(FCaptionWidth + FCaptionOffsetSmall, 0, ClientWidth, ClientHeight);
***************
*** 501,505 ****
      dpBottom:
        Rect := Classes.Rect(0, 0, ClientWidth, ClientHeight - FCaptionWidth - FCaptionOffsetSmall);
!   end; //case
    inherited AlignControls(AControl, Rect);
  end;
--- 501,505 ----
      dpBottom:
        Rect := Classes.Rect(0, 0, ClientWidth, ClientHeight - FCaptionWidth - FCaptionOffsetSmall);
!   end;
    inherited AlignControls(AControl, Rect);
  end;
***************
*** 585,590 ****
  var
    {$IFDEF VCL}
!   lf: TLogFont;
!   tf: TFont;
    Flags: Integer;
    {$ENDIF VCL}
--- 585,590 ----
  var
    {$IFDEF VCL}
!   Lf: TLogFont;
!   Tf: TFont;
    Flags: Integer;
    {$ENDIF VCL}
***************
*** 603,617 ****
      begin
        {$IFDEF VCL}
!       tf := TFont.Create;
        try
!         tf.Assign(CaptionFont);
!         GetObject(tf.Handle, SizeOf(lf), @lf);
!         lf.lfEscapement := Rotation * 10;
!         lf.lfOrientation := Rotation * 10;
!         lf.lfOutPrecision := OUT_TT_PRECIS;
!         tf.Handle := CreateFontIndirect(lf);
!         Canvas.Font.Assign(tf);
        finally
!         tf.Free;
        end;
        {$ENDIF VCL}
--- 603,617 ----
      begin
        {$IFDEF VCL}
!       Tf := TFont.Create;
        try
!         Tf.Assign(CaptionFont);
!         GetObject(Tf.Handle, SizeOf(Lf), @Lf);
!         Lf.lfEscapement := Rotation * 10;
!         Lf.lfOrientation := Rotation * 10;
!         Lf.lfOutPrecision := OUT_TT_PRECIS;
!         Tf.Handle := CreateFontIndirect(Lf);
!         Canvas.Font.Assign(Tf);
        finally
!         Tf.Free;
        end;
        {$ENDIF VCL}
***************
*** 826,830 ****
      FDragging := True;
      ReleaseCapture;
!    {$IFDEF JVCAPTIONPANEL_STD_BEHAVE}
      {$IFDEF VCL}
      SetCapture(Handle);
--- 826,830 ----
      FDragging := True;
      ReleaseCapture;
!     {$IFDEF JVCAPTIONPANEL_STD_BEHAVE}
      {$IFDEF VCL}
      SetCapture(Handle);
***************
*** 833,839 ****
      {$ENDIF VCL}
      FAnchorPos := Point(X, Y);
!    {$ELSE}
      Perform(WM_SYSCOMMAND, SC_DRAGMOVE, 0);
!    {$ENDIF JVCAPTIONPANEL_STD_BEHAVE}
    end;
  end;
--- 833,839 ----
      {$ENDIF VCL}
      FAnchorPos := Point(X, Y);
!     {$ELSE}
      Perform(WM_SYSCOMMAND, SC_DRAGMOVE, 0);
!     {$ENDIF JVCAPTIONPANEL_STD_BEHAVE}
    end;
  end;
***************
*** 841,851 ****
  {$IFDEF VCL}
  procedure TJvCaptionPanel.WMSize(var Msg: TWMNoParams);
  {$ELSE}
  procedure TJvCaptionPanel.BoundsChanged;
- {$ENDIF}
  begin
!   inherited;
    Repaint;
  end;
  
  function TJvCaptionPanel.CanStartDrag: Boolean;
--- 841,855 ----
  {$IFDEF VCL}
  procedure TJvCaptionPanel.WMSize(var Msg: TWMNoParams);
+ begin
+   inherited;
+   Repaint;
+ end;
  {$ELSE}
  procedure TJvCaptionPanel.BoundsChanged;
  begin
!   inherited BoundsChanged;
    Repaint;
  end;
+ {$ENDIF VCL}
  
  function TJvCaptionPanel.CanStartDrag: Boolean;

Index: JvCheckBox.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCheckBox.pas,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** JvCheckBox.pas	7 Jan 2004 22:36:49 -0000	1.25
--- JvCheckBox.pas	8 Jan 2004 16:27:43 -0000	1.26
***************
*** 78,82 ****
      procedure TextChanged; override;
      procedure FontChanged; override;
!     procedure SetAutoSize(Value: Boolean); {$IFDEF VCL}{$IFDEF COMPILER6_UP} override;{$ENDIF}{$ENDIF}
      {$IFDEF VCL}
      procedure CreateParams(var Params: TCreateParams); override;
--- 78,83 ----
      procedure TextChanged; override;
      procedure FontChanged; override;
!     procedure SetAutoSize(Value: Boolean);
!       {$IFDEF VCL}{$IFDEF COMPILER6_UP} override; {$ENDIF}{$ENDIF}
      {$IFDEF VCL}
      procedure CreateParams(var Params: TCreateParams); override;
***************
*** 351,355 ****
      if Value then
        AutoSize := False;
!     {$IFDEF VCl}
      RecreateWnd;
      {$ELSE}
--- 352,356 ----
      if Value then
        AutoSize := False;
!     {$IFDEF VCL}
      RecreateWnd;
      {$ELSE}
***************
*** 364,368 ****
    begin
      FAlignment := Value;
!     {$IFDEF VCl}
      RecreateWnd;
      {$ELSE}
--- 365,369 ----
    begin
      FAlignment := Value;
!     {$IFDEF VCL}
      RecreateWnd;
      {$ELSE}
***************
*** 377,381 ****
    begin
      FLayout := Value;
!     {$IFDEF VCl}
      RecreateWnd;
      {$ELSE}
--- 378,382 ----
    begin
      FLayout := Value;
!     {$IFDEF VCL}
      RecreateWnd;
      {$ELSE}
***************
*** 395,399 ****
    begin
      FLeftText := Value;
!     {$IFDEF VCl}
      RecreateWnd;
      {$ELSE}
--- 396,400 ----
    begin
      FLeftText := Value;
!     {$IFDEF VCL}
      RecreateWnd;
      {$ELSE}

Index: JvComCtrls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvComCtrls.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvComCtrls.pas	8 Jan 2004 09:24:39 -0000	1.17
--- JvComCtrls.pas	8 Jan 2004 16:27:43 -0000	1.18
***************
*** 53,60 ****
    TVM_SETLINECOLOR = TV_FIRST + 40;
    TVM_GETLINECOLOR = TV_FIRST + 41;
! {$IFDEF BCB6}
    {$EXTERNALSYM TVM_SETLINECOLOR}
    {$EXTERNALSYM TVM_GETLINECOLOR}
! {$ENDIF}
  
  type
--- 53,60 ----
    TVM_SETLINECOLOR = TV_FIRST + 40;
    TVM_GETLINECOLOR = TV_FIRST + 41;
!   {$IFDEF BCB6}
    {$EXTERNALSYM TVM_SETLINECOLOR}
    {$EXTERNALSYM TVM_GETLINECOLOR}
!   {$ENDIF BCB6}
  
  type
***************
*** 69,73 ****
    private
      FControl: TWinControl;
!     FRange: array[0..3] of TJvIPAddressMinMax;
      function GetMaxRange(Index: Integer): Byte;
      function GetMinRange(Index: Integer): Byte;
--- 69,73 ----
    private
      FControl: TWinControl;
!     FRange: array [0..3] of TJvIPAddressMinMax;
      function GetMaxRange(Index: Integer): Byte;
      function GetMinRange(Index: Integer): Byte;
***************
*** 96,100 ****
    TJvIPAddressValues = class(TPersistent)
    private
!     FValues: array[0..3] of Byte;
      FOnChange: TNotifyEvent;
      FOnChanging: TJvIPAddressChanging;
--- 96,100 ----
    TJvIPAddressValues = class(TPersistent)
    private
!     FValues: array [0..3] of Byte;
      FOnChange: TNotifyEvent;
      FOnChanging: TJvIPAddressChanging;
***************
*** 195,209 ****
      property OnStartDrag;
    end;
    // TJvHintSource is a hint enumeration type to describe how to display hints for
    // controls that have hint properties both for the main control as well as
    // for it's subitems (like a PageControl)
    // TODO: (p3) this should really be moved to JvTypes or something...
!   TJvHintSource = (
!     hsDefault,       // use default hint behaviour (i.e as regular control)
!     hsForceMain,     // use the main hint even if subitems have hints
      hsForceChildren, // always use subitems hints even if empty
!     hsPreferMain,    // use main control hint unless empty then use subitems hints
      hsPreferChildren // use subitems hints unless empty then use main control hint
!     );
  
    TJvPageControl = class(TPageControl)
--- 195,211 ----
      property OnStartDrag;
    end;
+ 
    // TJvHintSource is a hint enumeration type to describe how to display hints for
    // controls that have hint properties both for the main control as well as
    // for it's subitems (like a PageControl)
    // TODO: (p3) this should really be moved to JvTypes or something...
!   TJvHintSource =
!    (
!     hsDefault, // use default hint behaviour (i.e as regular control)
!     hsForceMain, // use the main hint even if subitems have hints
      hsForceChildren, // always use subitems hints even if empty
!     hsPreferMain, // use main control hint unless empty then use subitems hints
      hsPreferChildren // use subitems hints unless empty then use main control hint
!    );
  
    TJvPageControl = class(TPageControl)
***************
*** 220,224 ****
      FHandleGlobalTab: Boolean;
      FHintSource: TJvHintSource;
!     FReduceMemoryUse: boolean;
      procedure SetClientBorderWidth(const Value: TBorderWidth);
      procedure TCMAdjustRect(var Msg: TMessage); message TCM_ADJUSTRECT;
--- 222,226 ----
      FHandleGlobalTab: Boolean;
      FHintSource: TJvHintSource;
!     FReduceMemoryUse: Boolean;
      procedure SetClientBorderWidth(const Value: TBorderWidth);
      procedure TCMAdjustRect(var Msg: TMessage); message TCM_ADJUSTRECT;
***************
*** 228,239 ****
      procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN;
      procedure CMDialogKey(var Msg: TWMKey); message CM_DIALOGKEY;
!     procedure CMHintShow(var Message: TMessage); message CM_HINTSHOW;
      procedure SetDrawTabShadow(const Value: Boolean);
      procedure SetHideAllTabs(const Value: Boolean);
      function FormKeyPreview: Boolean;
!     procedure SetReduceMemoryUse(const Value: boolean);
! 
    protected
- 
      procedure Loaded; override;
      procedure DrawDefaultTab(TabIndex: Integer; const Rect: TRect; Active: Boolean; DefaultDraw: Boolean);
--- 230,239 ----
      procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN;
      procedure CMDialogKey(var Msg: TWMKey); message CM_DIALOGKEY;
!     procedure CMHintShow(var Msg: TMessage); message CM_HINTSHOW;
      procedure SetDrawTabShadow(const Value: Boolean);
      procedure SetHideAllTabs(const Value: Boolean);
      function FormKeyPreview: Boolean;
!     procedure SetReduceMemoryUse(const Value: Boolean);
    protected
      procedure Loaded; override;
      procedure DrawDefaultTab(TabIndex: Integer; const Rect: TRect; Active: Boolean; DefaultDraw: Boolean);
***************
*** 246,254 ****
    published
      property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
!     property HintSource:TJvHintSource read FHintSource write FHintSource default hsDefault;
      property HandleGlobalTab: Boolean read FHandleGlobalTab write FHandleGlobalTab default False;
      property ClientBorderWidth: TBorderWidth read FClientBorderWidth write SetClientBorderWidth default
        JvDefPageControlBorder;
!     property ReduceMemoryUse:boolean read FReduceMemoryUse write SetReduceMemoryUse default false;
      property DrawTabShadow: Boolean read FDrawTabShadow write SetDrawTabShadow default False;
      property HideAllTabs: Boolean read FHideAllTabs write SetHideAllTabs default False;
--- 246,254 ----
    published
      property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
!     property HintSource: TJvHintSource read FHintSource write FHintSource default hsDefault;
      property HandleGlobalTab: Boolean read FHandleGlobalTab write FHandleGlobalTab default False;
      property ClientBorderWidth: TBorderWidth read FClientBorderWidth write SetClientBorderWidth default
        JvDefPageControlBorder;
!     property ReduceMemoryUse: Boolean read FReduceMemoryUse write SetReduceMemoryUse default False;
      property DrawTabShadow: Boolean read FDrawTabShadow write SetDrawTabShadow default False;
      property HideAllTabs: Boolean read FHideAllTabs write SetHideAllTabs default False;
***************
*** 265,268 ****
--- 265,269 ----
    TJvTrackBar = class(TTrackBar)
    private
+     FAboutJVCL: TJVCLAboutInfo;
      FToolTips: Boolean;
      FToolTipSide: TJvTrackToolTipSide;
***************
*** 275,279 ****
      FOnParentColorChanged: TNotifyEvent;
      FOnChanged: TNotifyEvent;
-     FAboutJVCL: TJVCLAboutInfo;
      FShowRange: Boolean;
      procedure CMMouseEnter(var Msg: TMessage); message CM_MOUSEENTER;
--- 276,279 ----
***************
*** 321,325 ****
      procedure SetPopupMenu(const Value: TPopupMenu);
    public
!     class function CreateEnh(AOwner: TTreeNodes) : TJvTreeNode;
      property Checked: Boolean read GetChecked write SetChecked;
      property Bold: Boolean read GetBold write SetBold;
--- 321,325 ----
      procedure SetPopupMenu(const Value: TPopupMenu);
    public
!     class function CreateEnh(AOwner: TTreeNodes): TJvTreeNode;
      property Checked: Boolean read GetChecked write SetChecked;
      property Bold: Boolean read GetBold write SetBold;
***************
*** 327,332 ****
    end;
  
!   TPageChangedEvent = procedure (Sender: TObject; Item: TTreeNode; Page: TTabSheet) of object;
!   TJvTreeViewComparePageEvent = procedure (Sender: TObject; Page:TTabSheet; Node:TTreeNode; var Matches:boolean) of object;
    TJvTreeView = class(TTreeView)
    private
--- 327,334 ----
    end;
  
!   TPageChangedEvent = procedure(Sender: TObject; Item: TTreeNode; Page: TTabSheet) of object;
!   TJvTreeViewComparePageEvent = procedure(Sender: TObject; Page: TTabSheet;
!     Node: TTreeNode; var Matches: Boolean) of object;
! 
    TJvTreeView = class(TTreeView)
    private
***************
*** 359,363 ****
      {$IFNDEF COMPILER6_UP}
      procedure SetMultiSelect(const Value: Boolean);
!     {$ENDIF}
      procedure SetScrollDirection(const Value: Integer);
      procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN;
--- 361,365 ----
      {$IFNDEF COMPILER6_UP}
      procedure SetMultiSelect(const Value: Boolean);
!     {$ENDIF COMPILER6_UP}
      procedure SetScrollDirection(const Value: Integer);
      procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN;
***************
*** 369,384 ****
      procedure CMParentColorChanged(var Msg: TMessage); message CM_PARENTCOLORCHANGED;
      procedure SetCheckBoxes(const Value: Boolean);
!     function GetItemHeight: integer;
!     procedure SetItemHeight(Value: integer);
      function GetInsertMarkColor: TColor;
      procedure SetInsertMarkColor(Value: TColor);
      function GetLineColor: TColor;
      procedure SetLineColor(Value: TColor);
!     function GetMaxScrollTime: integer;
!     procedure SetMaxScrollTime(const Value: integer);
!     function GetUseUnicode: boolean;
!     procedure SetUseUnicode(const Value: boolean);
    protected
!     function DoComparePage(Page: TTabSheet; Node: TTreeNode): boolean;virtual;
      function CreateNode: TTreeNode; override;
      procedure CreateParams(var Params: TCreateParams); override;
--- 371,386 ----
      procedure CMParentColorChanged(var Msg: TMessage); message CM_PARENTCOLORCHANGED;
      procedure SetCheckBoxes(const Value: Boolean);
!     function GetItemHeight: Integer;
!     procedure SetItemHeight(Value: Integer);
      function GetInsertMarkColor: TColor;
      procedure SetInsertMarkColor(Value: TColor);
      function GetLineColor: TColor;
      procedure SetLineColor(Value: TColor);
!     function GetMaxScrollTime: Integer;
!     procedure SetMaxScrollTime(const Value: Integer);
!     function GetUseUnicode: Boolean;
!     procedure SetUseUnicode(const Value: Boolean);
    protected
!     function DoComparePage(Page: TTabSheet; Node: TTreeNode): Boolean; virtual;
      function CreateNode: TTreeNode; override;
      procedure CreateParams(var Params: TCreateParams); override;
***************
*** 416,429 ****
      procedure SetNodePopup(Node: TTreeNode; Value: TPopupMenu);
      function GetNodePopup(Node: TTreeNode): TPopupMenu;
!     procedure InsertMark(Node: TTreeNode; MarkAfter: boolean); // TVM_SETINSERTMARK
      procedure RemoveMark;
      property InsertMarkColor: TColor read GetInsertMarkColor write SetInsertMarkColor;
!     property Checked[Node: TTreeNode]: boolean read GetChecked write SetChecked;
!     property MaxScrollTime: integer read GetMaxScrollTime write SetMaxScrollTime;
      // UseUnicode should only be changed on Win95 and Win98 that has IE5 or later installed
!     property UseUnicode: boolean read GetUseUnicode write SetUseUnicode default false;
    published
      property LineColor: TColor read GetLineColor write SetLineColor default clDefault;
!     property ItemHeight: integer read GetItemHeight write SetItemHeight default 16;
  
      property HintColor: TColor read FColor write FColor default clInfoBk;
--- 418,431 ----
      procedure SetNodePopup(Node: TTreeNode; Value: TPopupMenu);
      function GetNodePopup(Node: TTreeNode): TPopupMenu;
!     procedure InsertMark(Node: TTreeNode; MarkAfter: Boolean); // TVM_SETINSERTMARK
      procedure RemoveMark;
      property InsertMarkColor: TColor read GetInsertMarkColor write SetInsertMarkColor;
!     property Checked[Node: TTreeNode]: Boolean read GetChecked write SetChecked;
!     property MaxScrollTime: Integer read GetMaxScrollTime write SetMaxScrollTime;
      // UseUnicode should only be changed on Win95 and Win98 that has IE5 or later installed
!     property UseUnicode: Boolean read GetUseUnicode write SetUseUnicode default False;
    published
      property LineColor: TColor read GetLineColor write SetLineColor default clDefault;
!     property ItemHeight: Integer read GetItemHeight write SetItemHeight default 16;
  
      property HintColor: TColor read FColor write FColor default clInfoBk;
***************
*** 439,444 ****
      {$IFNDEF COMPILER6_UP}
      property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default False;
!     {$ENDIF}
!     property OnComparePage:TJvTreeViewComparePageEvent read FOnComparePage write FOnComparePage;
      property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
      property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
--- 441,446 ----
      {$IFNDEF COMPILER6_UP}
      property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default False;
!     {$ENDIF COMPILER6_UP}
!     property OnComparePage: TJvTreeViewComparePageEvent read FOnComparePage write FOnComparePage;
      property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
      property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
***************
*** 457,461 ****
    TVIS_CHECKED = $2000;
  
!   // === TJvIPAddressRange =====================================================
  
  constructor TJvIPAddressRange.Create(Control: TWinControl);
--- 459,463 ----
    TVIS_CHECKED = $2000;
  
! // === TJvIPAddressRange =====================================================
  
  constructor TJvIPAddressRange.Create(Control: TWinControl);
***************
*** 844,849 ****
    const Rect: TRect; Active: Boolean; DefaultDraw: Boolean);
  var
!   imageindex: Integer;
!   r: TRect;
    S: string;
  begin
--- 846,851 ----
    const Rect: TRect; Active: Boolean; DefaultDraw: Boolean);
  var
!   ImageIndex: Integer;
!   R: TRect;
    S: string;
  begin
***************
*** 854,875 ****
    if DefaultDraw then
      Exit;
!   r := Rect;
!   Canvas.Fillrect(r);
!   imageindex := GetImageIndex(tabindex);
!   if (imageindex >= 0) and Assigned(Images) then
    begin
!     SaveDC(canvas.handle);
!     images.Draw(Canvas, Rect.Left + 4, Rect.Top + 2,
!       imageindex,
!       Pages[TabIndex].enabled);
      // images.draw fouls the canvas colors if it draws
      // the image disabled, thus the SaveDC/RestoreDC
!     RestoreDC(canvas.handle, -1);
!     R.Left := R.Left + images.Width + 4;
    end;
    S := Pages[TabIndex].Caption;
!   InflateRect(r, -2, -2);
!   // (p3) TODO: draw rotated when TabPosition in tbLeft,tbRight
!   DrawText(Canvas.Handle, PChar(S), Length(S), r, DT_SINGLELINE or DT_LEFT or DT_TOP);
  end;
  
--- 856,876 ----
    if DefaultDraw then
      Exit;
!   R := Rect;
!   Canvas.FillRect(R);
!   ImageIndex := GetImageIndex(TabIndex);
!   if (ImageIndex >= 0) and Assigned(Images) then
    begin
!     SaveDC(Canvas.Handle);
!     Images.Draw(Canvas, Rect.Left + 4, Rect.Top + 2,
!       ImageIndex, Pages[TabIndex].Enabled);
      // images.draw fouls the canvas colors if it draws
      // the image disabled, thus the SaveDC/RestoreDC
!     RestoreDC(Canvas.Handle, -1);
!     R.Left := R.Left + Images.Width + 4;
    end;
    S := Pages[TabIndex].Caption;
!   InflateRect(R, -2, -2);
!   // (p3) TODO: draw rotated when TabPosition in tbLeft, tbRight
!   DrawText(Canvas.Handle, PChar(S), Length(S), R, DT_SINGLELINE or DT_LEFT or DT_TOP);
  end;
  
***************
*** 899,906 ****
    if (ImageIndex >= 0) and Assigned(Images) then
    begin
!     SaveDC(canvas.handle);
      Images.Draw(Canvas, Rect.Left + 4, Rect.Top + 2,
!       ImageIndex,
!       Pages[TabIndex].Enabled);
      RestoreDC(Canvas.Handle, -1);
      R.Left := R.Left + Images.Width + 4;
--- 900,906 ----
    if (ImageIndex >= 0) and Assigned(Images) then
    begin
!     SaveDC(Canvas.Handle);
      Images.Draw(Canvas, Rect.Left + 4, Rect.Top + 2,
!       ImageIndex, Pages[TabIndex].Enabled);
      RestoreDC(Canvas.Handle, -1);
      R.Left := R.Left + Images.Width + 4;
***************
*** 1001,1005 ****
  var
    hi: TTCHitTestInfo;
!   tabindex: Integer;
  begin
    if csDesigning in ComponentState then
--- 1001,1005 ----
  var
    hi: TTCHitTestInfo;
!   TabIndex: Integer;
  begin
    if csDesigning in ComponentState then
***************
*** 1011,1017 ****
    hi.pt.y := Msg.YPos;
    hi.flags := 0;
!   tabindex := Perform(TCM_HITTEST, 0, Longint(@hi));
!   if (tabindex >= 0) and ((hi.flags and TCHT_ONITEM) <> 0) then
!     if not Pages[tabindex].Enabled then
      begin
        Msg.Result := 0;
--- 1011,1017 ----
    hi.pt.y := Msg.YPos;
    hi.flags := 0;
!   TabIndex := Perform(TCM_HITTEST, 0, Longint(@hi));
!   if (TabIndex >= 0) and ((hi.flags and TCHT_ONITEM) <> 0) then
!     if not Pages[TabIndex].Enabled then
      begin
        Msg.Result := 0;
***************
*** 1072,1077 ****
  procedure TJvTrackBar.InternalSetToolTipSide;
  const
!   ToolTipSides: array[TJvTrackToolTipSide] of DWORD =
!   (TBTS_LEFT, TBTS_TOP, TBTS_RIGHT, TBTS_BOTTOM);
  begin
    if HandleAllocated and (GetComCtlVersion >= ComCtlVersionIE3) then
--- 1072,1077 ----
  procedure TJvTrackBar.InternalSetToolTipSide;
  const
!   ToolTipSides: array [TJvTrackToolTipSide] of DWORD =
!     (TBTS_LEFT, TBTS_TOP, TBTS_RIGHT, TBTS_BOTTOM);
  begin
    if HandleAllocated and (GetComCtlVersion >= ComCtlVersionIE3) then
***************
*** 1097,1102 ****
  end;
  
! procedure TJvTrackBar.MouseUp(Button: TMouseButton; Shift: TShiftState; X,
!   Y: Integer);
  begin
    inherited MouseUp(Button, Shift, X, Y);
--- 1097,1102 ----
  end;
  
! procedure TJvTrackBar.MouseUp(Button: TMouseButton; Shift: TShiftState;
!   X, Y: Integer);
  begin
    inherited MouseUp(Button, Shift, X, Y);
***************
*** 1154,1158 ****
  // === TJvTreeNode ===========================================================
  
! class function TJvTreeNode.CreateEnh(AOwner: TTreeNodes) : TJvTreeNode;
  begin
    Result := Create(AOwner);
--- 1154,1158 ----
  // === TJvTreeNode ===========================================================
  
! class function TJvTreeNode.CreateEnh(AOwner: TTreeNodes): TJvTreeNode;
  begin
    Result := Create(AOwner);
***************
*** 1332,1336 ****
  begin
    InvalidateSelectedItems;
!   inherited;
  end;
  
--- 1332,1336 ----
  begin
    InvalidateSelectedItems;
!   inherited DoEnter;
  end;
  
***************
*** 1355,1359 ****
    if Y < AutoScrollMargin then
      ScrollDirection := -1
!   else if Y > ClientHeight - AutoScrollMargin then
      ScrollDirection := 1
    else
--- 1355,1360 ----
    if Y < AutoScrollMargin then
      ScrollDirection := -1
!   else
!   if Y > ClientHeight - AutoScrollMargin then
      ScrollDirection := 1
    else
***************
*** 1420,1424 ****
          Canvas.Brush.Color := clHighlight;
        end
!       else if not HideSelection then
        begin
          Canvas.Font.Color := Font.Color;
--- 1421,1426 ----
          Canvas.Brush.Color := clHighlight;
        end
!       else
!       if not HideSelection then
        begin
          Canvas.Font.Color := Font.Color;
***************
*** 1481,1485 ****
      if not (ssAlt in Shift) then
      begin
!       if (Key = VK_SPACE) then
          SelectItem(Selected, IsNodeSelected(Selected))
        else
--- 1483,1487 ----
      if not (ssAlt in Shift) then
      begin
!       if Key = VK_SPACE then
          SelectItem(Selected, IsNodeSelected(Selected))
        else
***************
*** 1496,1500 ****
  procedure TJvTreeView.KeyPress(var Key: Char);
  begin
!   if FMultiSelect and (Key = #32) then
      Key := #0
    else
--- 1498,1502 ----
  procedure TJvTreeView.KeyPress(var Key: Char);
  begin
!   if FMultiSelect and (Key = ' ') then
      Key := #0
    else
***************
*** 1532,1536 ****
    if Unselect then
      FSelectedList.Remove(Node)
!   else if not IsNodeSelected(Node) then
      FSelectedList.Add(Node);
    if HandleAllocated then
--- 1534,1539 ----
    if Unselect then
      FSelectedList.Remove(Node)
!   else
!   if not IsNodeSelected(Node) then
      FSelectedList.Add(Node);
    if HandleAllocated then
***************
*** 1556,1560 ****
  
  {$IFNDEF COMPILER6_UP}
- 
  procedure TJvTreeView.SetMultiSelect(const Value: Boolean);
  begin
--- 1559,1562 ----
***************
*** 1566,1570 ****
    end;
  end;
! {$ENDIF}
  
  procedure TJvTreeView.SetNodePopup(Node: TTreeNode; Value: TPopupMenu);
--- 1568,1572 ----
    end;
  end;
! {$ENDIF COMPILER6_UP}
  
  procedure TJvTreeView.SetNodePopup(Node: TTreeNode; Value: TPopupMenu);
***************
*** 1579,1583 ****
      if Value = 0 then
        KillTimer(Handle, AutoScrollTimerID)
!     else if (Value <> 0) and (FScrollDirection = 0) then
        SetTimer(Handle, AutoScrollTimerID, 200, nil);
      FScrollDirection := Value;
--- 1581,1586 ----
      if Value = 0 then
        KillTimer(Handle, AutoScrollTimerID)
!     else
!     if (Value <> 0) and (FScrollDirection = 0) then
        SetTimer(Handle, AutoScrollTimerID, 200, nil);
      FScrollDirection := Value;
***************
*** 1664,1673 ****
  end;
  
! function TJvTreeView.DoComparePage(Page:TTabSheet;Node:TTreeNode):boolean;
  begin
!  if Assigned(FOnComparePage) then
!    FOnComparePage(Self, Page, Node, Result)
!  else
!   Result := AnsiCompareText(Page.Caption, Node.Text) = 0;
  end;
  
--- 1667,1676 ----
  end;
  
! function TJvTreeView.DoComparePage(Page: TTabSheet; Node: TTreeNode): Boolean;
  begin
!   if Assigned(FOnComparePage) then
!     FOnComparePage(Self, Page, Node, Result)
!   else
!     Result := AnsiCompareText(Page.Caption, Node.Text) = 0;
  end;
  
***************
*** 1682,1687 ****
        DragImages.HideDragImage;
      case FScrollDirection of
!       -1: SendMessage(Handle, WM_VSCROLL, SB_LINEUP, 0);
!       1: SendMessage(Handle, WM_VSCROLL, SB_LINEDOWN, 0);
      end;
      if Assigned(DragImages) then
--- 1685,1692 ----
        DragImages.HideDragImage;
      case FScrollDirection of
!       -1:
!         SendMessage(Handle, WM_VSCROLL, SB_LINEUP, 0);
!       1:
!         SendMessage(Handle, WM_VSCROLL, SB_LINEDOWN, 0);
      end;
      if Assigned(DragImages) then
***************
*** 1766,1770 ****
  end;
  
! function TJvTreeView.GetItemHeight: integer;
  begin
    if HandleAllocated then
--- 1771,1775 ----
  end;
  
! function TJvTreeView.GetItemHeight: Integer;
  begin
    if HandleAllocated then
***************
*** 1774,1778 ****
  end;
  
! procedure TJvTreeView.SetItemHeight(Value: integer);
  begin
    if Value <= 0 then
--- 1779,1783 ----
  end;
  
! procedure TJvTreeView.SetItemHeight(Value: Integer);
  begin
    if Value <= 0 then
***************
*** 1800,1812 ****
  end;
  
! procedure TJvTreeView.InsertMark(Node: TTreeNode; MarkAfter: boolean);
  begin
    if HandleAllocated then
-   begin
      if Node = nil then
        RemoveMark
      else
!       SendMessage(Handle, TVM_SETINSERTMARK, integer(MarkAfter), integer(Node.ItemId));
!   end;
  end;
  
--- 1805,1815 ----
  end;
  
! procedure TJvTreeView.InsertMark(Node: TTreeNode; MarkAfter: Boolean);
  begin
    if HandleAllocated then
      if Node = nil then
        RemoveMark
      else
!       SendMessage(Handle, TVM_SETINSERTMARK, Integer(MarkAfter), Integer(Node.ItemId));
  end;
  
***************
*** 1835,1839 ****
  end;
  
! function TJvTreeView.GetMaxScrollTime: integer;
  begin
    if HandleAllocated then
--- 1838,1842 ----
  end;
  
! function TJvTreeView.GetMaxScrollTime: Integer;
  begin
    if HandleAllocated then
***************
*** 1843,1847 ****
  end;
  
! procedure TJvTreeView.SetMaxScrollTime(const Value: integer);
  begin
    if HandleAllocated then
--- 1846,1850 ----
  end;
  
! procedure TJvTreeView.SetMaxScrollTime(const Value: Integer);
  begin
    if HandleAllocated then
***************
*** 1849,1878 ****
  end;
  
! function TJvTreeView.GetUseUnicode: boolean;
  begin
    if HandleAllocated then
!     Result := boolean(SendMessage(Handle, TVM_GETUNICODEFORMAT, 0, 0))
    else
!     Result := false;
  end;
  
! procedure TJvTreeView.SetUseUnicode(const Value: boolean);
  begin
    // only try to change value if not running on NT platform
    // (see MSDN: CCM_SETUNICODEFORMAT explanation for details)
    if HandleAllocated and (Win32Platform <> VER_PLATFORM_WIN32_NT) then
!     SendMessage(Handle, TVM_SETUNICODEFORMAT, integer(Value), 0);
  end;
  
! procedure TJvPageControl.CMHintShow(var Message: TMessage);
  var
!   TabNo:integer;
!   Tab:TTabsheet;
  begin
    inherited;
  
!   if FHintSource = hsDefault then Exit;
  
!   if TCMHintShow(Message).Result = 1 then Exit;
  (*
      hsDefault,    // use default hint behaviour (i.e as regular control)
--- 1852,1883 ----
  end;
  
! function TJvTreeView.GetUseUnicode: Boolean;
  begin
    if HandleAllocated then
!     Result := Boolean(SendMessage(Handle, TVM_GETUNICODEFORMAT, 0, 0))
    else
!     Result := False;
  end;
  
! procedure TJvTreeView.SetUseUnicode(const Value: Boolean);
  begin
    // only try to change value if not running on NT platform
    // (see MSDN: CCM_SETUNICODEFORMAT explanation for details)
    if HandleAllocated and (Win32Platform <> VER_PLATFORM_WIN32_NT) then
!     SendMessage(Handle, TVM_SETUNICODEFORMAT, Integer(Value), 0);
  end;
  
! procedure TJvPageControl.CMHintShow(var Msg: TMessage);
  var
!   TabNo: Integer;
!   Tab: TTabsheet;
  begin
    inherited;
  
!   if FHintSource = hsDefault then
!     Exit;
  
!   if TCMHintShow(Msg).Result = 1 then
!     Exit;
  (*
      hsDefault,    // use default hint behaviour (i.e as regular control)
***************
*** 1884,1900 ****
  *)
  
!   with TCMHintShow(Message) do
    begin
!     if (Result = 1) or (Self <> HintInfo^.HintControl) then Exit; // strange, hint requested by other component. Why should we deal with it?
      with HintInfo^.CursorPos do
        TabNo := IndexOfTabAt(X, Y); // X&Y are expected in Client coordinates
  
      if (TabNo >= 0) and (TabNo < PageCount) then
!        Tab := Pages[TabNo]
      else
        Tab := nil;
      if (FHintSource = hsForceMain) or ((FHintSource = hsPreferMain) and (GetShortHint(Hint) <> '')) then
        HintInfo^.HintStr := GetShortHint(Hint)
!     else if (Tab <> nil) and ((FHintSource = hsForceChildren) or ((FHintSource = hsPreferChildren) and (GetShortHint(Tab.Hint) <> ''))) then
        HintInfo^.HintStr := GetShortHint(Tab.Hint)
    end;
--- 1889,1908 ----
  *)
  
!   with TCMHintShow(Msg) do
    begin
!     if (Result = 1) or (Self <> HintInfo^.HintControl) then
!       Exit; // strange, hint requested by other component. Why should we deal with it?
      with HintInfo^.CursorPos do
        TabNo := IndexOfTabAt(X, Y); // X&Y are expected in Client coordinates
  
      if (TabNo >= 0) and (TabNo < PageCount) then
!       Tab := Pages[TabNo]
      else
        Tab := nil;
      if (FHintSource = hsForceMain) or ((FHintSource = hsPreferMain) and (GetShortHint(Hint) <> '')) then
        HintInfo^.HintStr := GetShortHint(Hint)
!     else
!     if (Tab <> nil) and ((FHintSource = hsForceChildren) or ((FHintSource = hsPreferChildren) and
!       (GetShortHint(Tab.Hint) <> ''))) then
        HintInfo^.HintStr := GetShortHint(Tab.Hint)
    end;
***************
*** 1902,1906 ****
  
  type
!   TAccessTabSheet = class(TTabSheet);
  
  function TJvPageControl.CanChange: Boolean;
--- 1910,1914 ----
  
  type
!   THackTabSheet = class(TTabSheet);
  
  function TJvPageControl.CanChange: Boolean;
***************
*** 1908,1915 ****
    Result := inherited CanChange;
    if Result and (ActivePage <> nil) and ReduceMemoryUse then
!     TAccessTabSheet(ActivePage).DestroyHandle;
  end;
  
! procedure TJvPageControl.SetReduceMemoryUse(const Value: boolean);
  begin
    FReduceMemoryUse := Value;
--- 1916,1923 ----
    Result := inherited CanChange;
    if Result and (ActivePage <> nil) and ReduceMemoryUse then
!     THackTabSheet(ActivePage).DestroyHandle;
  end;
  
! procedure TJvPageControl.SetReduceMemoryUse(const Value: Boolean);
  begin
    FReduceMemoryUse := Value;

Index: JvFormToHtml.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvFormToHtml.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvFormToHtml.pas	7 Jan 2004 20:41:52 -0000	1.4
--- JvFormToHtml.pas	8 Jan 2004 16:27:43 -0000	1.5
***************
*** 35,42 ****
    {$IFDEF VCL}
    Graphics, Controls, Forms, StdCtrls,
!   {$ENDIF}
    {$IFDEF VisualCLX}
    QGraphics, QControls, QForms, QStdCtrls,
!   {$ENDIF}
    JvComponent;
  
--- 35,42 ----
    {$IFDEF VCL}
    Graphics, Controls, Forms, StdCtrls,
!   {$ENDIF VCL}
    {$IFDEF VisualCLX}
    QGraphics, QControls, QForms, QStdCtrls,
!   {$ENDIF VisualCLX}
    JvComponent;
  

Index: JvGammaPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGammaPanel.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvGammaPanel.pas	7 Jan 2004 20:26:18 -0000	1.11
--- JvGammaPanel.pas	8 Jan 2004 16:27:43 -0000	1.12
***************
*** 40,47 ****
    Windows, Messages, Graphics, Controls, Dialogs,
    ExtCtrls, StdCtrls,
!   {$ENDIF}
    {$IFDEF VisualCLX}
    QGraphics, QControls, QDialogs, QExtCtrls, QStdCtrls, Types,
!   {$ENDIF}
    JvTypes, JvComponent;
  
--- 40,47 ----
    Windows, Messages, Graphics, Controls, Dialogs,
    ExtCtrls, StdCtrls,
!   {$ENDIF VCL}
    {$IFDEF VisualCLX}
    QGraphics, QControls, QDialogs, QExtCtrls, QStdCtrls, Types,
!   {$ENDIF VisualCLX}
    JvTypes, JvComponent;
  
***************
*** 67,71 ****
      {$IFDEF VCL}
      procedure WMSize(var Msg: TWMSize); message WM_SIZE;
!     {$ENDIF}
      procedure ChangeColor(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
      procedure ColorSeek(Sender: TObject; Shift: TShiftState; X, Y: Integer);
--- 67,71 ----
      {$IFDEF VCL}
      procedure WMSize(var Msg: TWMSize); message WM_SIZE;
!     {$ENDIF VCL}
      procedure ChangeColor(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
      procedure ColorSeek(Sender: TObject; Shift: TShiftState; X, Y: Integer);
***************
*** 78,82 ****
    protected
      procedure AdjustSize; override;
!   {$ENDIF}
    public
      constructor Create(AOwner: TComponent); override;
--- 78,82 ----
    protected
      procedure AdjustSize; override;
!   {$ENDIF VisualCLX}
    public
      constructor Create(AOwner: TComponent); override;
***************
*** 96,105 ****
    JvResources;
  
! {$IFDEF WINDOWS}
! {$R ..\resources\JvGammaPanel.res}
! {$ENDIF}
  {$IFDEF LINUX}
  {$R ../Resources/JvGammaPanel.res}
! {$ENDIF}
  
  constructor TJvGammaPanel.Create(AOwner: TComponent);
--- 96,105 ----
    JvResources;
  
! {$IFDEF MSWINDOWS}
! {$R ..\Resources\JvGammaPanel.res}
! {$ENDIF MSWINDOWS}
  {$IFDEF LINUX}
  {$R ../Resources/JvGammaPanel.res}
! {$ENDIF LINUX}
  
  constructor TJvGammaPanel.Create(AOwner: TComponent);
***************
*** 392,399 ****
  {$IFDEF VisualCLX}
  procedure TJvGammaPanel.AdjustSize;
! {$ENDIF}
  {$IFDEF VCL}
  procedure TJvGammaPanel.WMSize(var Msg: TWMSize);
! {$ENDIF}
  begin
    Width := 65;
--- 392,399 ----
  {$IFDEF VisualCLX}
  procedure TJvGammaPanel.AdjustSize;
! {$ENDIF VisualCLX}
  {$IFDEF VCL}
  procedure TJvGammaPanel.WMSize(var Msg: TWMSize);
! {$ENDIF VCL}
  begin
    Width := 65;

Index: JvGradient.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGradient.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvGradient.pas	7 Jan 2004 20:41:52 -0000	1.4
--- JvGradient.pas	8 Jan 2004 16:27:43 -0000	1.5
***************
*** 35,42 ****
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
!   {$ENDIF}
    {$IFDEF VisualCLX}
    QGraphics, QControls, Types,
!   {$ENDIF}
    JvTypes, JVCLVer;
  
--- 35,42 ----
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
!   {$ENDIF VCL}
    {$IFDEF VisualCLX}
    QGraphics, QControls, Types,
!   {$ENDIF VisualCLX}
    JvTypes, JVCLVer;
  
***************
*** 102,106 ****
    I: Integer;
    J, K: Real;
!   Deltas: array [0..2] of Real; //R,G,B
    R: TRect;
    LStartRGB, LEndRGB: TColor;
--- 102,106 ----
    I: Integer;
    J, K: Real;
!   Deltas: array [0..2] of Real; // R,G,B
    R: TRect;
    LStartRGB, LEndRGB: TColor;

Index: JvGroupBox.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGroupBox.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** JvGroupBox.pas	7 Jan 2004 18:22:30 -0000	1.13
--- JvGroupBox.pas	8 Jan 2004 16:27:43 -0000	1.14
***************
*** 154,160 ****
    Details: TThemedElementDetails;
    CaptionRect: TRect;
!   {$ENDIF}
    LastBkMode: Integer;
!   pText: {$IFDEF VCL}PChar;{$ELSE}WideString;{$ENDIF}
  begin
    {$IFDEF JVCLThemesEnabled}
--- 154,160 ----
    Details: TThemedElementDetails;
    CaptionRect: TRect;
!   {$ENDIF JVCLThemesEnabledD56}
    LastBkMode: Integer;
!   PText: {$IFDEF VCL} PChar; {$ELSE} WideString; {$ENDIF}
  begin
    {$IFDEF JVCLThemesEnabled}
***************
*** 185,191 ****
    begin
      {$IFDEF VCL}
!     pText := PChar(Text);
      {$ELSE}
!     pText := Text;
      Start;
      {$ENDIF VCL}
--- 185,191 ----
    begin
      {$IFDEF VCL}
!     PText := PChar(Text);
      {$ELSE}
!     PText := Text;
      Start;
      {$ENDIF VCL}
***************
*** 195,199 ****
        H := TextHeight('0');
        R := Rect(0, H div 2 - 1, Width, Height);
!       {$IFDEF VCl}
        if Ctl3D then
        {$ELSE}
--- 195,199 ----
        H := TextHeight('0');
        R := Rect(0, H div 2 - 1, Width, Height);
!       {$IFDEF VCL}
        if Ctl3D then
        {$ELSE}
***************
*** 228,232 ****
          // calculate text rect
          SetBkMode(Handle, OPAQUE);
!         DrawText(Handle, pText, Length(Text), R, Flags or DT_CALCRECT);
          Brush.Color := Color;
          if not Enabled then
--- 228,232 ----
          // calculate text rect
          SetBkMode(Handle, OPAQUE);
!         DrawText(Handle, PText, Length(Text), R, Flags or DT_CALCRECT);
          Brush.Color := Color;
          if not Enabled then
***************
*** 234,245 ****
            OffsetRect(R, 1, 1);
            Font.Color := clBtnHighlight;
!           DrawText(Handle, pText, Length(Text), R, Flags);
            OffsetRect(R, -1, -1);
            Font.Color := clBtnShadow;
            SetBkMode(Handle, TRANSPARENT);
!           DrawText(Handle, pText, Length(Text), R, Flags);
          end
          else
!           DrawText(Handle, pText, Length(Text), R, Flags);
        end;
      finally
--- 234,245 ----
            OffsetRect(R, 1, 1);
            Font.Color := clBtnHighlight;
!           DrawText(Handle, PText, Length(Text), R, Flags);
            OffsetRect(R, -1, -1);
            Font.Color := clBtnShadow;
            SetBkMode(Handle, TRANSPARENT);
!           DrawText(Handle, PText, Length(Text), R, Flags);
          end
          else
!           DrawText(Handle, PText, Length(Text), R, Flags);
        end;
      finally

Index: JvImagesViewer.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvImagesViewer.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvImagesViewer.pas	6 Jan 2004 23:13:24 -0000	1.7
--- JvImagesViewer.pas	8 Jan 2004 16:27:43 -0000	1.8
***************
*** 29,32 ****
--- 29,33 ----
  
  uses
+   SysUtils, Classes,
    {$IFDEF MSWINDOWS}
    Windows,
***************
*** 38,42 ****
    Types, QWindows, QControls, QGraphics, QStdCtrls, QComCtrls,
    {$ENDIF VisualCLX}
-   SysUtils, Classes,
    JvCustomItemViewer;
  
--- 39,42 ----
***************
*** 416,424 ****
  begin
    inherited;
!   {$IFDEF WINDOWS}
    if Win32Platform = VER_PLATFORM_WIN32_NT then
      BottomRightShift := 1
    else
!   {$ENDIF}
      BottomRightShift := 0;
    AItem := Items[Index];
--- 416,424 ----
  begin
    inherited;
!   {$IFDEF MSWINDOWS}
    if Win32Platform = VER_PLATFORM_WIN32_NT then
      BottomRightShift := 1
    else
!   {$ENDIF MSWINDOWS}
      BottomRightShift := 0;
    AItem := Items[Index];
***************
*** 521,525 ****
    i, j: integer;
    F: TSearchRec;
!   Files, FileMasks: TStringlist;
    tmpDir: string;
  begin
--- 521,525 ----
    i, j: integer;
    F: TSearchRec;
!   Files, FileMasks: TStringList;
    tmpDir: string;
  begin
***************
*** 540,549 ****
          for i := 0 to FileMasks.Count - 1 do
          begin
!           if FindFirst(tmpDir + FileMasks[i], faAnyFile, F) = 0 then
            try
              repeat
                if F.Attr and faDirectory = 0 then
                  Files.Add(tmpDir + F.Name);
!             until FindNext(F) <> 0;
              Count := Files.Count;
              j := 0;
--- 540,549 ----
          for i := 0 to FileMasks.Count - 1 do
          begin
!           if SysUtils.FindFirst(tmpDir + FileMasks[i], faAnyFile, F) = 0 then
            try
              repeat
                if F.Attr and faDirectory = 0 then
                  Files.Add(tmpDir + F.Name);
!             until SysUtils.FindNext(F) <> 0;
              Count := Files.Count;
              j := 0;
***************
*** 554,558 ****
              end;
            finally
!             FindClose(F);
            end;
          end;
--- 554,558 ----
              end;
            finally
!             SysUtils.FindClose(F);
            end;
          end;

Index: JvItemsPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvItemsPanel.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvItemsPanel.pas	7 Jan 2004 22:58:20 -0000	1.12
--- JvItemsPanel.pas	8 Jan 2004 16:27:43 -0000	1.13
***************
*** 75,79 ****
    protected
      {$IFDEF COMPILER6_UP}
!     procedure SetAutoSize(Value: Boolean); {$IFDEF VCL}override;{$ENDIF}
      {$ENDIF COMPILER6_UP}
      {$IFDEF VisualCLX}
--- 75,79 ----
    protected
      {$IFDEF COMPILER6_UP}
!     procedure SetAutoSize(Value: Boolean); {$IFDEF VCL} override; {$ENDIF}
      {$ENDIF COMPILER6_UP}
      {$IFDEF VisualCLX}

Index: JvLED.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLED.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvLED.pas	6 Jan 2004 21:22:58 -0000	1.6
--- JvLED.pas	8 Jan 2004 16:27:43 -0000	1.7
***************
*** 38,45 ****
    {$IFDEF VCL}
    Windows, Messages, Controls, Classes, Graphics,
!   {$ENDIF}
    {$IFDEF VisualCLX}
    QWindows, QControls, QClasses, QGraphics,
!   {$ENDIF}
    JvComponent;
  
--- 38,45 ----
    {$IFDEF VCL}
    Windows, Messages, Controls, Classes, Graphics,
!   {$ENDIF VCL}
    {$IFDEF VisualCLX}
    QWindows, QControls, QClasses, QGraphics,
!   {$ENDIF VisualCLX}
    JvComponent;
  
***************
*** 117,126 ****
    SysUtils;
  
! {$IFDEF WINDOWS}
! {$R ..\resources\JvLED.res}
! {$ENDIF}
  {$IFDEF LINUX}
  {$R ../Resources/JvLED.res}
! {$ENDIF}
  
  const
--- 117,126 ----
    SysUtils;
  
! {$IFDEF MSWINDOWS}
! {$R ..\Resources\JvLED.res}
! {$ENDIF MSWINDOWS}
  {$IFDEF LINUX}
  {$R ../Resources/JvLED.res}
! {$ENDIF LINUX}
  
  const

Index: JvTurtle.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTurtle.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JvTurtle.pas	7 Jan 2004 21:01:09 -0000	1.16
--- JvTurtle.pas	8 Jan 2004 16:27:43 -0000	1.17
***************
*** 35,42 ****
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
!   {$ENDIF}
    {$IFDEF VisualCLX}
    QGraphics, QControls, Types, 
!   {$ENDIF}
    Math;
  
--- 35,42 ----
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
!   {$ENDIF VCL}
    {$IFDEF VisualCLX}
    QGraphics, QControls, Types, 
!   {$ENDIF VisualCLX}
    Math;
  

Index: JvgWinMask.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgWinMask.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvgWinMask.pas	5 Jan 2004 22:37:47 -0000	1.7
--- JvgWinMask.pas	8 Jan 2004 16:27:43 -0000	1.8
***************
*** 68,72 ****
    FMask := TBitmap.Create;
    FMaskBuff := TBitmap.Create;
!   fIgnorePaint := false;
  end;
  
--- 68,72 ----
    FMask := TBitmap.Create;
    FMaskBuff := TBitmap.Create;
!   FIgnorePaint := False;
  end;