[JVCL-Checkins] CVS: dev/JVCL3/run JvColorBox.pas,1.9,1.10 JvColorForm.pas,1.12,1.13 - Fixed ColorBox CLX Form deactivate bug

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

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

Modified Files:
	JvColorBox.pas JvColorForm.pas 
Log Message:
Fixed ColorBox CLX Form deactivate bug

Index: JvColorBox.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorBox.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvColorBox.pas	6 Jan 2004 22:31:00 -0000	1.9
--- JvColorBox.pas	8 Jan 2004 18:00:46 -0000	1.10
***************
*** 446,450 ****
      Canvas.Pen.Color := clBtnShadow
    else
!     Canvas.Pen.Color := cl3DDkShadow;
  
    Rec.Bottom := (Height div 2) + Increment - 1;
--- 446,450 ----
      Canvas.Pen.Color := clBtnShadow
    else
!     Canvas.Pen.Color := {cl3DDkShadow}clWindowText;
  
    Rec.Bottom := (Height div 2) + Increment - 1;

Index: JvColorForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorForm.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvColorForm.pas	6 Jan 2004 22:31:00 -0000	1.12
--- JvColorForm.pas	8 Jan 2004 18:00:46 -0000	1.13
***************
*** 61,64 ****
--- 61,65 ----
      procedure FormClose(Sender: TObject; var Action: TCloseAction);
      procedure FormActivate(Sender: TObject);
+     procedure FormDeactivate(Sender: TObject);
    private
      FOwner: TControl;
***************
*** 79,83 ****
      {$ENDIF VCL}
      {$IFDEF VisualCLX}
-     procedure Deactivate; override;
      procedure DoShow; override;
      {$ENDIF VisualCLX}
--- 80,83 ----
***************
*** 114,117 ****
--- 114,120 ----
    OnClose := FormClose;
    OnKeyUp := FormKeyUp;
+   {$IFDEF VisualCLX}
+   OnDeactivate := FormDeactivate;
+   {$ENDIF VisualCLX}
  
    FColorDialog := TOpenColorDialog.Create(Self);
***************
*** 142,157 ****
      TJvColorButton(FOwner).Color := SelectedColor;
    FColorDialog.Color := SelectedColor;
!   if FColorDialog.Execute then
!   begin
!     FCS.Color := FColorDialog.Color;
!     if FOwner is TJvColorButton then
      begin
!       TJvColorButton(FOwner).CustomColors.Assign(FColorDialog.CustomColors);
!       TJvColorButton(FOwner).Color := SelectedColor;
!     end;
!     ModalResult := mrOK;
!   end
!   else
!     ModalResult := mrCancel;
    Hide;
  end;
--- 145,169 ----
      TJvColorButton(FOwner).Color := SelectedColor;
    FColorDialog.Color := SelectedColor;
!   {$IFDEF VisualCLX}
!   OnDeactivate := nil;
!   try
!   {$ENDIF VisualCLX}
!     if FColorDialog.Execute then
      begin
!       FCS.Color := FColorDialog.Color;
!       if FOwner is TJvColorButton then
!       begin
!         TJvColorButton(FOwner).CustomColors.Assign(FColorDialog.CustomColors);
!         TJvColorButton(FOwner).Color := SelectedColor;
!       end;
!       ModalResult := mrOK;
!     end
!     else
!       ModalResult := mrCancel;
!   {$IFDEF VisualCLX}
!   finally
!     OnDeactivate := FormDeactivate;
!   end;
!   {$ENDIF VisualCLX}
    Hide;
  end;
***************
*** 161,181 ****
  begin
    inherited;
!   if (Msg.Active = WA_INACTIVE) and not FCDVisible then
!   begin
!     Hide;
!     ModalResult := mrCancel;
!   end;
  end;
! {$ELSE}
! procedure TJvColorForm.Deactivate;
  begin
-   inherited Deactivate;
    if (not FCDVisible) then
    begin
!     Hide;
      ModalResult := mrCancel;
    end;
  end;
  
  procedure TJvColorForm.DoShow;
  begin
--- 173,192 ----
  begin
    inherited;
!   if Msg.Active = WA_INACTIVE then
!     FormDeactivate(Self);
  end;
! {$ENDIF VCL}
! 
! procedure TJvColorForm.FormDeactivate(Sender: TObject);
  begin
    if (not FCDVisible) then
    begin
!     if Visible then 
!       Hide;
      ModalResult := mrCancel;
    end;
  end;
  
+ {$IFDEF VisualCLX}
  procedure TJvColorForm.DoShow;
  begin
***************
*** 183,187 ****
    inherited DoShow;
  end;
! {$ENDIF VCL}
  
  procedure TJvColorForm.DoColorClick(Sender: TObject);
--- 194,198 ----
    inherited DoShow;
  end;
! {$ENDIF VisualCLX}
  
  procedure TJvColorForm.DoColorClick(Sender: TObject);