[JVCL-Checkins] dev/JVCL3/run JvDockHashTable.pas,1.11,1.12 JvDynControlEngineJVCL.pas,1.25,1.26 JvD

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	JvDockHashTable.pas JvDynControlEngineJVCL.pas 
	JvDynControlEngineVCL.pas JvJCLUtils.pas JvPanel.pas 
	JvParameterList.pas JvParameterListParameter.pas 
Log Message:
cleanup of the last changes

Index: JvDynControlEngineVCL.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineVCL.pas,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** JvDynControlEngineVCL.pas	9 Aug 2004 21:10:05 -0000	1.29
--- JvDynControlEngineVCL.pas	10 Aug 2004 06:28:24 -0000	1.30
***************
*** 494,498 ****
    {$ENDIF COMPILER6_UP}
    SysUtils,
!   JvJCLUtils;

  var
--- 494,498 ----
    {$ENDIF COMPILER6_UP}
    SysUtils,
!   JvConsts, JvJCLUtils;

  var
***************
*** 717,727 ****

  procedure TJvDynControlVCLFileNameEdit.DefaultOnButtonClick(Sender: TObject);
- var Dialog : TOpenDialog;
  begin
    case FDialogKind of
      jdkOpen:
!     begin
!       Dialog := TOpenDialog.Create(Self);
!       with TOpenDialog(Dialog) do
          try
            Options := FDialogOptions;
--- 717,724 ----

  procedure TJvDynControlVCLFileNameEdit.DefaultOnButtonClick(Sender: TObject);
  begin
    case FDialogKind of
      jdkOpen:
!       with TOpenDialog.Create(Self) do
          try
            Options := FDialogOptions;
***************
*** 732,741 ****
            DefaultExt := FDefaultExt;
            FileName := ControlGetValue;
!           if Dialog.Execute then
              ControlSetValue(FileName);
          finally
            Free;
          end;
-     end;
      jdkOpenPicture:
        with TOpenPictureDialog.Create(Self) do
--- 729,737 ----
            DefaultExt := FDefaultExt;
            FileName := ControlGetValue;
!           if Execute then
              ControlSetValue(FileName);
          finally
            Free;
          end;
      jdkOpenPicture:
        with TOpenPictureDialog.Create(Self) do
***************
*** 880,889 ****
    FEditControl := TMaskEdit.Create(AOwner);
    FEditControl.Parent := Self;
!   FButton    := TBitBtn.Create(AOwner);
    FButton.Parent := Self;
    FButton.Align := alRight;
    FButton.OnClick := DefaultOnButtonClick;
    FButton.Caption := '...';
!   Height     := FEditControl.Height;
    FButton.Width := Height;
    FEditControl.Align := alClient;
--- 876,885 ----
    FEditControl := TMaskEdit.Create(AOwner);
    FEditControl.Parent := Self;
!   FButton := TBitBtn.Create(AOwner);
    FButton.Parent := Self;
    FButton.Align := alRight;
    FButton.OnClick := DefaultOnButtonClick;
    FButton.Caption := '...';
!   Height := FEditControl.Height;
    FButton.Width := Height;
    FEditControl.Align := alClient;
***************
*** 911,928 ****
    Dir := ControlGetValue;
    if Dir = '' then
!     if fInitialDir <> '' then
        Dir := FInitialDir
      else
!   {$IFDEF LINUX}
!       Dir := '\';
!   {$ELSE}
!       Dir := '/';
!   {$ENDIF LINUX}
    if not DirectoryExists(Dir) then
!   {$IFDEF LINUX}
!     Dir := '\';
!   {$ELSE}
!     Dir := '/';
!   {$ENDIF LINUX}
    {$IFDEF VCL}
    if SelectDirectory(Dir, Opt, HelpContext) then
--- 907,916 ----
    Dir := ControlGetValue;
    if Dir = '' then
!     if FInitialDir <> '' then
        Dir := FInitialDir
      else
!       Dir := PathDelim;
    if not DirectoryExists(Dir) then
!     Dir := PathDelim;
    {$IFDEF VCL}
    if SelectDirectory(Dir, Opt, HelpContext) then
***************
*** 1284,1288 ****
      Checked := Value
    else
!     Checked := Uppercase(Value) = 'TRUE';
  end;

--- 1272,1276 ----
      Checked := Value
    else
!     Checked := UpperCase(Value) = 'TRUE';
  end;

***************
*** 1929,1935 ****
  end;

- {$IFDEF VCL}
  //=== { TJvDynControlVCLStaticText } =========================================

  procedure TJvDynControlVCLStaticText.ControlSetDefaultProperties;
  begin
--- 1917,1924 ----
  end;

  //=== { TJvDynControlVCLStaticText } =========================================

+ {$IFDEF VCL}
+ 
  procedure TJvDynControlVCLStaticText.ControlSetDefaultProperties;
  begin
***************
*** 2002,2005 ****
--- 1991,1996 ----
  end;

+ //=== { TJvDynControlEngineVCL } =============================================
+ 
  function DynControlEngineVCL: TJvDynControlEngine;
  begin
***************
*** 2009,2012 ****
--- 2000,2004 ----
  type
    TJvDynControlEngineVCL = class(TJvDynControlEngine)
+   public
      procedure RegisterControls; override;
    end;

Index: JvPanel.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPanel.pas,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** JvPanel.pas	9 Aug 2004 22:15:31 -0000	1.42
--- JvPanel.pas	10 Aug 2004 06:28:25 -0000	1.43
***************
*** 143,147 ****
      procedure Resize; override;
      procedure AlignControls(AControl: TControl; var Rect: TRect); override;
!     function GetNextControlByTabOrder (iTabOrder : Integer): TWinControl;
    public
      constructor Create(AOwner: TComponent); override;
--- 143,147 ----
      procedure Resize; override;
      procedure AlignControls(AControl: TControl; var Rect: TRect); override;
!     function GetNextControlByTabOrder(ATabOrder: Integer): TWinControl;
    public
      constructor Create(AOwner: TComponent); override;
***************
*** 246,250 ****

  uses
!   JvMouseTimer, Types;

  const
--- 246,251 ----

  uses
!   Types,
!   JvMouseTimer;

  const
***************
*** 497,502 ****
        ThemeServices.DrawElement(Canvas.Handle, ThemeServices.GetElementDetails(tsGripper),
          Rect(ClientWidth - GetSystemMetrics(SM_CXVSCROLL) - BevelWidth - 2,
!              ClientHeight - GetSystemMetrics(SM_CYHSCROLL) - BevelWidth - 2,
!              ClientWidth - BevelWidth - 2, ClientHeight - BevelWidth - 2));
      end
      else
--- 498,503 ----
        ThemeServices.DrawElement(Canvas.Handle, ThemeServices.GetElementDetails(tsGripper),
          Rect(ClientWidth - GetSystemMetrics(SM_CXVSCROLL) - BevelWidth - 2,
!           ClientHeight - GetSystemMetrics(SM_CYHSCROLL) - BevelWidth - 2,
!           ClientWidth - BevelWidth - 2, ClientHeight - BevelWidth - 2));
      end
      else
***************
*** 504,507 ****
--- 505,509 ----
        with Canvas do
        begin
+         // (rom) Marlett is not a standard Windows font
          Font.Name := 'Marlett';
          Font.Charset := DEFAULT_CHARSET;
***************
*** 523,527 ****
    if Transparent and not IsThemed then
    begin
!    // (ahuser) That is the only way to draw the border of the contained controls.
      Width := Width + 1;
      Width := Width - 1;
--- 525,529 ----
    if Transparent and not IsThemed then
    begin
!     // (ahuser) That is the only way to draw the border of the contained controls.
      Width := Width + 1;
      Width := Width - 1;
***************
*** 844,857 ****
  end;

! function TJvPanel.GetNextControlByTabOrder (iTabOrder : Integer): TWinControl;
! var i: Integer;
  begin
    Result := nil;
    for I := 0 to ControlCount - 1 do
      if Controls[I] is TWinControl then
!       if TWinControl(Controls[I]).TabOrder = iTabOrder then
        begin
          Result := TWinControl(Controls[I]);
!         exit;
        end;
  end;
--- 846,860 ----
  end;

! function TJvPanel.GetNextControlByTabOrder(ATabOrder: Integer): TWinControl;
! var
!   I: Integer;
  begin
    Result := nil;
    for I := 0 to ControlCount - 1 do
      if Controls[I] is TWinControl then
!       if TWinControl(Controls[I]).TabOrder = ATabOrder then
        begin
          Result := TWinControl(Controls[I]);
!         Break;
        end;
  end;
***************
*** 859,863 ****
  procedure TJvPanel.ArrangeControls;
  var
!   AktX, AktY, NewX, NewY, MaxY, NewMaxX : Integer;
    ControlMaxX, ControlMaxY: Integer;
    TmpWidth, TmpHeight: Integer;
--- 862,866 ----
  procedure TJvPanel.ArrangeControls;
  var
!   AktX, AktY, NewX, NewY, MaxY, NewMaxX: Integer;
    ControlMaxX, ControlMaxY: Integer;
    TmpWidth, TmpHeight: Integer;
***************
*** 887,891 ****
      else
        ControlMaxX := -1;
!     if (FArrangeSettings.AutoSize in [asHeight, asBoth])then
        ControlMaxY := TmpHeight - 2 * FArrangeSettings.BorderTop
      else
--- 890,894 ----
      else
        ControlMaxX := -1;
!     if (FArrangeSettings.AutoSize in [asHeight, asBoth]) then
        ControlMaxY := TmpHeight - 2 * FArrangeSettings.BorderTop
      else
***************
*** 910,922 ****
          ((csDesigning in ComponentState) and FArrangeSettings.ShowNotVisibleAtDesignTime) then
        begin
!         NewMaxX := AktX + CurrControl.Width +
!                    FArrangeSettings.DistanceHorizontal +
!                    FArrangeSettings.BorderLeft;
!         if (((NewMaxX > TmpWidth) AND NOT (FArrangeSettings.AutoSize in [asWidth, asBoth]))
!              OR
!              ((NewMaxX > FArrangeSettings.MaxWidth) and
!               (FArrangeSettings.MaxWidth > 0)
!              )
!            ) and
             (AktX > FArrangeSettings.BorderLeft) and // Only Valid if there is one control in the current line
             FArrangeSettings.WrapControls then
--- 913,920 ----
          ((csDesigning in ComponentState) and FArrangeSettings.ShowNotVisibleAtDesignTime) then
        begin
!         NewMaxX := AktX + CurrControl.Width + FArrangeSettings.DistanceHorizontal +
!           FArrangeSettings.BorderLeft;
!         if (((NewMaxX > TmpWidth) and not (FArrangeSettings.AutoSize in [asWidth, asBoth])) or
!             ((NewMaxX > FArrangeSettings.MaxWidth) and (FArrangeSettings.MaxWidth > 0))) and
             (AktX > FArrangeSettings.BorderLeft) and // Only Valid if there is one control in the current line
             FArrangeSettings.WrapControls then
***************
*** 957,961 ****
            TmpWidth := 0;
        if (FArrangeSettings.AutoSize in [asHeight, asBoth]) then
!         if ControlMaxY >=0  then
            TmpHeight := ControlMaxY + FArrangeSettings.BorderTop
          else
--- 955,959 ----
            TmpWidth := 0;
        if (FArrangeSettings.AutoSize in [asHeight, asBoth]) then
!         if ControlMaxY >= 0 then
            TmpHeight := ControlMaxY + FArrangeSettings.BorderTop
          else
***************
*** 966,970 ****
      FArrangeWidth := ControlMaxX + 2 * FArrangeSettings.BorderLeft;
      FArrangeHeight := ControlMaxY + 2 * FArrangeSettings.BorderTop;
!     if (OldWidth <> TmpWidth) OR (OldHeight <> Height) then
        {$IFDEF VCL}
        SendMessage(GetFocus, WM_PAINT, 0, 0);
--- 964,968 ----
      FArrangeWidth := ControlMaxX + 2 * FArrangeSettings.BorderLeft;
      FArrangeHeight := ControlMaxY + 2 * FArrangeSettings.BorderTop;
!     if (OldWidth <> TmpWidth) or (OldHeight <> Height) then
        {$IFDEF VCL}
        SendMessage(GetFocus, WM_PAINT, 0, 0);
***************
*** 979,992 ****

  procedure TJvPanel.SetWidth(Value: Integer);
! var changed : Boolean;
  begin
!   changed := inherited Width <> Value;
    inherited Width := Value;
!   if changed then
      if Assigned(FOnResizeParent) then
        FOnResizeParent(Self, Left, Top, Value, Height)
      else
      if Parent is TJvPanel then
!        TJvPanel(Parent).ArrangeSettings.Rearrange;
  end;

--- 977,991 ----

  procedure TJvPanel.SetWidth(Value: Integer);
! var
!   Changed: Boolean;
  begin
!   Changed := inherited Width <> Value;
    inherited Width := Value;
!   if Changed then
      if Assigned(FOnResizeParent) then
        FOnResizeParent(Self, Left, Top, Value, Height)
      else
      if Parent is TJvPanel then
!       TJvPanel(Parent).ArrangeSettings.Rearrange;
  end;

***************
*** 997,1010 ****

  procedure TJvPanel.SetHeight(Value: Integer);
! var changed : Boolean;
  begin
!   changed := inherited Height <> Value;
    inherited Height := Value;
!   if changed then
      if Assigned(FOnResizeParent) then
        FOnResizeParent(Self, Left, Top, Width, Value)
      else
      if Parent is TJvPanel then
!        TJvPanel(Parent).ArrangeSettings.Rearrange;
  end;

--- 996,1010 ----

  procedure TJvPanel.SetHeight(Value: Integer);
! var
!   Changed: Boolean;
  begin
!   Changed := inherited Height <> Value;
    inherited Height := Value;
!   if Changed then
      if Assigned(FOnResizeParent) then
        FOnResizeParent(Self, Left, Top, Width, Value)
      else
      if Parent is TJvPanel then
!       TJvPanel(Parent).ArrangeSettings.Rearrange;
  end;

Index: JvDynControlEngineJVCL.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDynControlEngineJVCL.pas,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** JvDynControlEngineJVCL.pas	9 Aug 2004 21:10:04 -0000	1.25
--- JvDynControlEngineJVCL.pas	10 Aug 2004 06:28:24 -0000	1.26
***************
*** 507,512 ****
    Variants,
    {$ENDIF COMPILER6_UP}
!   JvDynControlEngineVCL,
!   JvJCLUtils;

  var
--- 507,511 ----
    Variants,
    {$ENDIF COMPILER6_UP}
!   JvDynControlEngineVCL, JvJCLUtils;

  var
***************
*** 581,589 ****
    FEditControl := TJvMaskEdit.Create(AOwner);
    FEditControl.Parent := Self;
!   FButton     := TJvBitBtn.Create(AOwner);
    FButton.Parent := Self;
    FButton.Align := alRight;
    FButton.Caption := '...';
!   Height      := FEditControl.Height;
    FButton.Width := Height;
    FEditControl.Align := alClient;
--- 580,588 ----
    FEditControl := TJvMaskEdit.Create(AOwner);
    FEditControl.Parent := Self;
!   FButton := TJvBitBtn.Create(AOwner);
    FButton.Parent := Self;
    FButton.Align := alRight;
    FButton.Caption := '...';
!   Height := FEditControl.Height;
    FButton.Width := Height;
    FEditControl.Align := alClient;
***************
*** 683,687 ****
  end;

- 
  //=== { TJvDynControlJVCLCalcEdit } ==========================================

--- 682,685 ----
***************
*** 1023,1027 ****
  end;

- 
  procedure TJvDynControlJVCLDateTimeEdit.ControlSetCaption(const Value: string);
  begin
--- 1021,1024 ----
***************
*** 1087,1091 ****
  end;

- 
  //=== { TJvDynControlJVCLDateEdit } ==========================================

--- 1084,1087 ----
***************
*** 1619,1626 ****
  end;

!  //procedure TJvDynControlJVCLComboBox.ControlSetReadOnly(Value: Boolean);
!  //begin
!  //  ReadOnly := Value;
!  //end;

  procedure TJvDynControlJVCLComboBox.ControlSetCaption(const Value: string);
--- 1615,1622 ----
  end;

! //procedure TJvDynControlJVCLComboBox.ControlSetReadOnly(Value: Boolean);
! //begin
! //  ReadOnly := Value;
! //end;

  procedure TJvDynControlJVCLComboBox.ControlSetCaption(const Value: string);
***************
*** 1977,1990 ****
  end;

! function DynControlEngineJVCL: TJvDynControlEngine;
! begin
!   Result := IntDynControlEngineJVCL;
! end;

  type
    TJvDynControlEngineJVCL = class(TJvDynControlEngine)
      procedure RegisterControls; override;
    end;

  procedure TJvDynControlEngineJVCL.RegisterControls;
  begin
--- 1973,1989 ----
  end;

! //=== { TJvDynControlEngineJVCL } ============================================

  type
    TJvDynControlEngineJVCL = class(TJvDynControlEngine)
+   public
      procedure RegisterControls; override;
    end;

+ function DynControlEngineJVCL: TJvDynControlEngine;
+ begin
+   Result := IntDynControlEngineJVCL;
+ end;
+ 
  procedure TJvDynControlEngineJVCL.RegisterControls;
  begin

Index: JvParameterList.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvParameterList.pas,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** JvParameterList.pas	9 Aug 2004 22:15:31 -0000	1.44
--- JvParameterList.pas	10 Aug 2004 06:28:25 -0000	1.45
***************
*** 156,160 ****
      function GetWinControlData: Variant; virtual;
      procedure SetWinControlData(Value: Variant); virtual;
!     procedure SetSearchName (Value : string);

      procedure SetEnabled(Value: Boolean); virtual;
--- 156,160 ----
      function GetWinControlData: Variant; virtual;
      procedure SetWinControlData(Value: Variant); virtual;
!     procedure SetSearchName(Value: string);

      procedure SetEnabled(Value: Boolean); virtual;
***************
*** 260,266 ****
      FMaxWidth: Integer;
      FMaxHeight: Integer;
!     FDefaultParameterHeight : Integer;
!     FDefaultParameterWidth : Integer;
!     FDefaultParameterLabelWidth : Integer;
      FOkButtonVisible: Boolean;
      FCancelButtonVisible: Boolean;
--- 260,266 ----
      FMaxWidth: Integer;
      FMaxHeight: Integer;
!     FDefaultParameterHeight: Integer;
!     FDefaultParameterWidth: Integer;
!     FDefaultParameterLabelWidth: Integer;
      FOkButtonVisible: Boolean;
      FCancelButtonVisible: Boolean;
***************
*** 345,349 ****
       This function can be called inside a running thread. It will synchromized
       with the main thread using SynchronizeThread.Synchronize}
!     function ShowParameterDialog(SynchronizeThread: tThread) : Boolean; overload;
      { Creates the ParameterDialog }
      procedure CreateParameterDialog;
--- 345,349 ----
       This function can be called inside a running thread. It will synchromized
       with the main thread using SynchronizeThread.Synchronize}
!     function ShowParameterDialog(SynchronizeThread: TThread): Boolean; overload;
      { Creates the ParameterDialog }
      procedure CreateParameterDialog;
***************
*** 393,399 ****
      {Maximum ClientHeight of the Dialog}
      property MaxHeight: Integer read FMaxHeight write FMaxHeight default 600;
!     property DefaultParameterHeight: Integer read fDefaultParameterHeight write fDefaultParameterHeight default 0;
!     property DefaultParameterWidth: Integer read fDefaultParameterWidth write fDefaultParameterWidth default 0;
!     property DefaultParameterLabelWidth: Integer read fDefaultParameterLabelWidth write fDefaultParameterLabelWidth default 0;
      property OkButtonVisible: Boolean read FOkButtonVisible write FOkButtonVisible;
      property CancelButtonVisible: Boolean read FCancelButtonVisible write FCancelButtonVisible;
--- 393,399 ----
      {Maximum ClientHeight of the Dialog}
      property MaxHeight: Integer read FMaxHeight write FMaxHeight default 600;
!     property DefaultParameterHeight: Integer read FDefaultParameterHeight write FDefaultParameterHeight default 0;
!     property DefaultParameterWidth: Integer read FDefaultParameterWidth write FDefaultParameterWidth default 0;
!     property DefaultParameterLabelWidth: Integer read FDefaultParameterLabelWidth write FDefaultParameterLabelWidth default 0;
      property OkButtonVisible: Boolean read FOkButtonVisible write FOkButtonVisible;
      property CancelButtonVisible: Boolean read FCancelButtonVisible write FCancelButtonVisible;
***************
*** 832,836 ****
  end;

! procedure TJvBaseParameter.SetSearchName (Value : string);
  begin
    FSearchName := Trim(Value);
--- 832,836 ----
  end;

! procedure TJvBaseParameter.SetSearchName(Value: string);
  begin
    FSearchName := Trim(Value);
***************
*** 1442,1448 ****

  type
!   TAccessThread = class(tThread);

! function TJvParameterList.ShowParameterDialog(SynchronizeThread: tThread) : Boolean;
  begin
    if Count = 0 then
--- 1442,1448 ----

  type
!   TAccessThread = class(TThread);

! function TJvParameterList.ShowParameterDialog(SynchronizeThread: TThread): Boolean;
  begin
    if Count = 0 then
***************
*** 1452,1456 ****
      SetDataToWinControls;
      if Assigned(SynchronizeThread) then
!       TAccessThread(SynchronizeThread).Synchronize (ShowParameterDialogThread)
      else
        ParameterDialog.ShowModal;
--- 1452,1456 ----
      SetDataToWinControls;
      if Assigned(SynchronizeThread) then
!       TAccessThread(SynchronizeThread).Synchronize(ShowParameterDialogThread)
      else
        ParameterDialog.ShowModal;

Index: JvJCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJCLUtils.pas,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** JvJCLUtils.pas	9 Aug 2004 21:12:29 -0000	1.119
--- JvJCLUtils.pas	10 Aug 2004 06:28:24 -0000	1.120
***************
*** 53,58 ****
    Libc, Xlib, QStdCtrls, StrUtils,
    {$ENDIF LINUX}
!   SysUtils, Classes,
!   Graphics, Clipbrd,
    {$IFDEF VisualCLX}
    Qt, QWindows,
--- 53,57 ----
    Libc, Xlib, QStdCtrls, StrUtils,
    {$ENDIF LINUX}
!   SysUtils, Classes, Graphics, Clipbrd,
    {$IFDEF VisualCLX}
    Qt, QWindows,

Index: JvParameterListParameter.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvParameterListParameter.pas,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** JvParameterListParameter.pas	9 Aug 2004 21:10:05 -0000	1.40
--- JvParameterListParameter.pas	10 Aug 2004 06:28:25 -0000	1.41
***************
*** 684,698 ****
  end;

! type TAccessCustomControl = class(TCustomControl);

  procedure TJvBasePanelEditParameter.ArrangeLabelAndWinControlOnPanel;
! Var tmpLabelArrangeMode : TJvParameterLabelArrangeMode;
  begin
    if not Assigned(FramePanel) or not Assigned(WinControl) or FArrangeLabelAndWinControlDisabled then
      Exit;
    if (LabelArrangeMode = lamBefore) and not Assigned(LabelControl) then
!     tmpLabelArrangeMode := lamAbove
    else
!     tmpLabelArrangeMode := LabelArrangeMode;

    if not Assigned(LabelControl) then
--- 684,700 ----
  end;

! type
!   TAccessCustomControl = class(TCustomControl);

  procedure TJvBasePanelEditParameter.ArrangeLabelAndWinControlOnPanel;
! var
!   TmpLabelArrangeMode: TJvParameterLabelArrangeMode;
  begin
    if not Assigned(FramePanel) or not Assigned(WinControl) or FArrangeLabelAndWinControlDisabled then
      Exit;
    if (LabelArrangeMode = lamBefore) and not Assigned(LabelControl) then
!     TmpLabelArrangeMode := lamAbove
    else
!     TmpLabelArrangeMode := LabelArrangeMode;

    if not Assigned(LabelControl) then
***************
*** 731,735 ****
      LabelControl.Left := 0;
    end;
!   if (tmpLabelArrangeMode = lamAbove) or not Assigned(LabelControl) then
    begin
      if Assigned(LabelControl) then
--- 733,737 ----
      LabelControl.Left := 0;
    end;
!   if (TmpLabelArrangeMode = lamAbove) or not Assigned(LabelControl) then
    begin
      if Assigned(LabelControl) then

Index: JvDockHashTable.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockHashTable.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JvDockHashTable.pas	8 Aug 2004 16:02:13 -0000	1.11
--- JvDockHashTable.pas	10 Aug 2004 06:28:24 -0000	1.12
***************
*** 61,65 ****
    protected
      function HashProc(Name: string): Integer; virtual;
!     procedure DeleteListIndex(Index: Integer);        
      function CreateKeyNode(KeyName: string; KeyData: Pointer;
        ListIndex: Integer): TJvDockClientHashNode;
--- 61,65 ----
    protected
      function HashProc(Name: string): Integer; virtual;
!     procedure DeleteListIndex(Index: Integer);
      function CreateKeyNode(KeyName: string; KeyData: Pointer;
        ListIndex: Integer): TJvDockClientHashNode;
***************
*** 78,81 ****
--- 78,82 ----
      property TableSize: Integer read FTableSize write SetTableSize;
    end;
+ 
  implementation

***************
*** 187,191 ****
    Index := HashProc(Name);
    Assert((Index >= 0) and (Index < FTableSize), RsDockTableIndexError);
-   ParentNode := nil;
    if FEntryList[Index] = nil then
      FEntryList[Index] := CreateKeyNode(Name, Data, Index)
--- 188,191 ----

[JVCL-Checkins] dev/JVCL3/run JvDockHashTable.pas,1.11,1.12 JvDynControlEngineJVCL.pas,1.25,1.26 JvD

JEDI VCL for Delphi

[JVCL-Checkins] dev/JVCL3/run JvDockHashTable.pas,1.11,1.12 JvDynControlEngineJVCL.pas,1.25,1.26 JvDynControlEngineVCL.pas,1.29,1.30 JvJCLUtils.pas,1.119,1.120 JvPanel.pas,1.42,1.43 JvParameterList.pas,1.44,1.45 JvParameterListParameter.pas,1.40,1.41 - cleanup of the last changes