[JVCL-Checkins] dev/JVCL3/run JvCsvParse.pas,1.15,1.16 JvCustomItemViewer.pas,1.20,1.21 JvDBFindEdit.pas,1.4,1.5 JvDataProvider.pas,1.32,1.33 JvDatePickerEdit.pas,1.34,1.35 JvWinDialogs.pas,1.19,1.20 JvXPButtons.pas,1.12,1.13 JvZlibMultiple.pas,1.9,1.10 - style cleaning (else if)

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

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

Modified Files:
	JvCsvParse.pas JvCustomItemViewer.pas JvDBFindEdit.pas 
	JvDataProvider.pas JvDatePickerEdit.pas JvWinDialogs.pas 
	JvXPButtons.pas JvZlibMultiple.pas 
Log Message:
style cleaning (else if)


Index: JvDBFindEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDBFindEdit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvDBFindEdit.pas	26 Mar 2004 22:34:03 -0000	1.4
--- JvDBFindEdit.pas	11 May 2004 06:43:52 -0000	1.5
***************
*** 64,68 ****
        var Accept: Boolean);
    protected
-     { Protected declarations }
      procedure Change; override;
      procedure Notification(AComponent: TComponent;
--- 64,67 ----
***************
*** 73,82 ****
      function IsNumeric(s1: string): Boolean;
    public
-     { Public declarations }
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
      procedure Find(AText: string);
      procedure ResetFilter;
- 
    published
      property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
--- 72,79 ----
***************
*** 132,137 ****
  implementation
  
- { TJvDBFindEdit }
- 
  constructor TJvDBFindEdit.Create(AOwner: TComponent);
  begin
--- 129,132 ----
***************
*** 194,209 ****
  function TJvDBFindEdit.GetDateDelimiter: string;
  var
!   s1: string;
!   i: Integer;
  begin
!   s1 := DateTimeToStr(Now);
!   for i := 1 to Length(s1) do
!   begin
!     if not (s1[i] in ['0'..'9']) then
      begin
!       Result := s1[i];
        Break;
      end;
-   end;
  end;
  
--- 189,202 ----
  function TJvDBFindEdit.GetDateDelimiter: string;
  var
!   S1: string;
!   I: Integer;
  begin
!   S1 := DateTimeToStr(Now);
!   for I := 1 to Length(S1) do
!     if not (S1[I] in ['0'..'9']) then
      begin
!       Result := S1[I];
        Break;
      end;
  end;
  
***************
*** 284,293 ****
    ActiveChange(Self);
    if FSearchText = '' then
      if FFindStyle = fsFilter then
      begin
        FDataLink.DataSet.OnFilterRecord := FOldFilterRecord;
        FDataLink.DataSet.Filtered := FOldFiltered;
!     end
!     else
    else
    begin
--- 277,287 ----
    ActiveChange(Self);
    if FSearchText = '' then
+   begin
      if FFindStyle = fsFilter then
      begin
        FDataLink.DataSet.OnFilterRecord := FOldFilterRecord;
        FDataLink.DataSet.Filtered := FOldFiltered;
!     end;
!   end
    else
    begin
***************
*** 326,330 ****
      else
        Accept := Pos(FSearchText, DataSet.FieldByName(DataField).AsString) = 1
!   else if IgnoreCase then
      Accept := Pos(AnsiUpperCase(FSearchText),
        AnsiUpperCase(DataSet.FieldByName(DataField).AsString)) > 0
--- 320,325 ----
      else
        Accept := Pos(FSearchText, DataSet.FieldByName(DataField).AsString) = 1
!   else
!   if IgnoreCase then
      Accept := Pos(AnsiUpperCase(FSearchText),
        AnsiUpperCase(DataSet.FieldByName(DataField).AsString)) > 0
***************
*** 337,341 ****
    Func1, Func2: TFilterRecordEvent;
  begin
!   if (FFindStyle = fsNavigate) or (FDataLink.DataSet = nil) then Exit;
    Func1 := FDataLink.DataSet.OnFilterRecord;
    Func2 := AFilterRecord;
--- 332,337 ----
    Func1, Func2: TFilterRecordEvent;
  begin
!   if (FFindStyle = fsNavigate) or (FDataLink.DataSet = nil) then
!     Exit;
    Func1 := FDataLink.DataSet.OnFilterRecord;
    Func2 := AFilterRecord;
***************
*** 398,405 ****
    inherited Notification(AComponent, Operation);
    if Operation = opRemove then
-   begin
      if (FDataLink <> nil) and (AComponent = DataSource) then
        DataSource := nil;
-   end;
  end;
  
--- 394,399 ----

Index: JvZlibMultiple.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvZlibMultiple.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvZlibMultiple.pas	7 Apr 2004 13:25:31 -0000	1.9
--- JvZlibMultiple.pas	11 May 2004 06:43:53 -0000	1.10
***************
*** 120,124 ****
            if (SearchRec.Attr and faDirectory) = 0 then
              AddFile(SearchRec.Name, SDirectory, Directory + SDirectory + SearchRec.Name, Result)
!           else if Recursive then
              SearchDirectory(SDirectory + SearchRec.Name + PathDelim);
          end;
--- 120,125 ----
            if (SearchRec.Attr and faDirectory) = 0 then
              AddFile(SearchRec.Name, SDirectory, Directory + SDirectory + SearchRec.Name, Result)
!           else
!           if Recursive then
              SearchDirectory(SDirectory + SearchRec.Name + PathDelim);
          end;

Index: JvCsvParse.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCsvParse.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvCsvParse.pas	14 Apr 2004 08:50:28 -0000	1.15
--- JvCsvParse.pas	11 May 2004 06:43:51 -0000	1.16
***************
*** 12,16 ****
  
  The Initial Developers of the Original Code are: Andrei Prygounkov <a dott prygounkov att gmx dott de>
! Copyright (c) 1999, 2002 Andrei Prygounkov   
  All Rights Reserved.
  
--- 12,16 ----
  
  The Initial Developers of the Original Code are: Andrei Prygounkov <a dott prygounkov att gmx dott de>
! Copyright (c) 1999, 2002 Andrei Prygounkov
  All Rights Reserved.
[...1533 lines suppressed...]
!     if (Ch = splitChar) and not inQuotes then
!     begin
!       OutStrings.Add(OutString);
!       OutString := '';
!       Inc(SplitCounter);
!     end
!     else
!     begin
!       OutString := OutString + ch;
!       if ch = quoteChar then
!         inQuotes := not inQuotes;
!     end;
!   end;
!   OutStrings.Add(OutString);
!   Inc(SplitCounter);
!   Result := SplitCounter;
  end;
+ 
  //--end NEW--
  

Index: JvCustomItemViewer.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCustomItemViewer.pas,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JvCustomItemViewer.pas	6 May 2004 09:11:41 -0000	1.20
--- JvCustomItemViewer.pas	11 May 2004 06:43:52 -0000	1.21
***************
*** 181,186 ****
    TJvViewerItemChangingEvent = procedure(Sender: TObject; Item: TJvViewerItem; var Allow: Boolean) of object;
    TJvViewerItemChangedEvent = procedure(Sender: TObject; Item: TJvViewerItem) of object;
!   TJvViewerItemHintEvent = procedure (Sender:TObject; Index:integer; var HintInfo:THintInfo; var Handled:boolean) of object;
! 
  
    TJvCustomItemViewer = class(TJvExScrollingWinControl)
--- 181,186 ----
    TJvViewerItemChangingEvent = procedure(Sender: TObject; Item: TJvViewerItem; var Allow: Boolean) of object;
    TJvViewerItemChangedEvent = procedure(Sender: TObject; Item: TJvViewerItem) of object;
!   TJvViewerItemHintEvent = procedure(Sender: TObject; Index: Integer;
!     var HintInfo: THintInfo; var Handled: Boolean) of object;
  
    TJvCustomItemViewer = class(TJvExScrollingWinControl)
***************
*** 208,221 ****
      procedure DoScrollTimer(Sender: TObject);
  
!     procedure WMHScroll(var Message: TWMHScroll); message WM_HSCROLL;
!     procedure WMVScroll(var Message: TWMVScroll); message WM_VSCROLL;
      procedure WMNCPaint(var Messages: TWMNCPaint); message WM_NCPAINT;
!     procedure WMPaint(var Message: TWMPaint); message WM_PAINT;
!     procedure WMNCHitTest(var Message: TMessage); message WM_NCHITTEST;
!     procedure WMCancelMode(var Message: TWMCancelMode); message WM_CANCELMODE;
  
!     procedure CMUnselectItem(var Message: TMessage); message CM_UNSELECTITEMS;
!     procedure CMDeleteItem(var Message: TMessage); message CM_DELETEITEM;
!     procedure CMCtl3DChanged(var Message: TMessage); message CM_CTL3DCHANGED;
  
      procedure SetOptions(const Value: TJvCustomItemViewerOptions);
--- 208,221 ----
      procedure DoScrollTimer(Sender: TObject);
  
!     procedure WMHScroll(var Msg: TWMHScroll); message WM_HSCROLL;
!     procedure WMVScroll(var Msg: TWMVScroll); message WM_VSCROLL;
      procedure WMNCPaint(var Messages: TWMNCPaint); message WM_NCPAINT;
!     procedure WMPaint(var Msg: TWMPaint); message WM_PAINT;
!     procedure WMNCHitTest(var Msg: TMessage); message WM_NCHITTEST;
!     procedure WMCancelMode(var Msg: TWMCancelMode); message WM_CANCELMODE;
  
!     procedure CMUnselectItem(var Msg: TMessage); message CM_UNSELECTITEMS;
!     procedure CMDeleteItem(var Msg: TMessage); message CM_DELETEITEM;
!     procedure CMCtl3DChanged(var Msg: TMessage); message CM_CTL3DCHANGED;
  
      procedure SetOptions(const Value: TJvCustomItemViewerOptions);
***************
*** 279,283 ****
      procedure ItemChanged(Item: TJvViewerItem); virtual;
      function HintShow(var HintInfo: THintInfo): Boolean; override;
!     function DoItemHint(Index:integer; var HintInfo: THintInfo):boolean;virtual;
  
      property TopLeftIndex: Integer read FTopLeftIndex;
--- 279,283 ----
      procedure ItemChanged(Item: TJvViewerItem); virtual;
      function HintShow(var HintInfo: THintInfo): Boolean; override;
!     function DoItemHint(Index: Integer; var HintInfo: THintInfo): Boolean; virtual;
  
      property TopLeftIndex: Integer read FTopLeftIndex;
***************
*** 305,309 ****
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
!     procedure ScrollBy(DeltaX, DeltaY:integer);
      procedure ScrollIntoView(Index: Integer);
      procedure BeginUpdate;
--- 305,309 ----
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
!     procedure ScrollBy(DeltaX, DeltaY: Integer);
      procedure ScrollIntoView(Index: Integer);
      procedure BeginUpdate;
***************
*** 445,451 ****
    var R: TRect; Format: Cardinal; Alignment: TAlignment; Layout: TTextLayout; WordWrap: Boolean): Integer;
  const
!   Alignments: array[TAlignment] of Cardinal = (DT_LEFT, DT_RIGHT, DT_CENTER);
!   Layouts: array[TTextLayout] of Cardinal = (DT_TOP, DT_VCENTER, DT_BOTTOM);
!   WordWraps: array[Boolean] of Cardinal = (DT_SINGLELINE, DT_WORDBREAK);
  var
    Flags: Cardinal;
--- 445,451 ----
    var R: TRect; Format: Cardinal; Alignment: TAlignment; Layout: TTextLayout; WordWrap: Boolean): Integer;
  const
!   Alignments: array [TAlignment] of Cardinal = (DT_LEFT, DT_RIGHT, DT_CENTER);
!   Layouts: array [TTextLayout] of Cardinal = (DT_TOP, DT_VCENTER, DT_BOTTOM);
!   WordWraps: array [Boolean] of Cardinal = (DT_SINGLELINE, DT_WORDBREAK);
  var
    Flags: Cardinal;
***************
*** 463,467 ****
  end;
  
! { TJvBrushPattern }
  
  constructor TJvBrushPattern.Create;
--- 463,467 ----
  end;
  
! //=== TJvBrushPattern ========================================================
  
  constructor TJvBrushPattern.Create;
***************
*** 519,523 ****
  end;
  
! { TJvCustomItemViewerOptions }
  
  procedure TJvCustomItemViewerOptions.Assign(Source: TPersistent);
--- 519,548 ----
  end;
  
! //=== TJvCustomItemViewerOptions =============================================
! 
! constructor TJvCustomItemViewerOptions.Create(AOwner: TJvCustomItemViewer);
! begin
!   inherited Create;
!   FOwner := AOwner;
!   FWidth := 120;
!   FHeight := 120;
!   FVertSpacing := 4;
!   FHorzSpacing := 4;
!   FScrollBar := tvVertical;
!   FSmooth := False;
!   FTracking := True;
!   FLazyRead := True;
!   FShowCaptions := False;
!   FAlignment := taCenter;
!   FLayout := tlBottom;
!   FDragAutoScroll := True;
!   FBrushPattern := TJvBrushPattern.Create;
! end;
! 
! destructor TJvCustomItemViewerOptions.Destroy;
! begin
!   FBrushPattern.Free;
!   inherited Destroy;
! end;
  
  procedure TJvCustomItemViewerOptions.Assign(Source: TPersistent);
***************
*** 550,578 ****
  end;
  
- constructor TJvCustomItemViewerOptions.Create(AOwner: TJvCustomItemViewer);
- begin
-   inherited Create;
-   FOwner := AOwner;
-   FWidth := 120;
-   FHeight := 120;
-   FVertSpacing := 4;
-   FHorzSpacing := 4;
-   FScrollBar := tvVertical;
-   FSmooth := False;
-   FTracking := True;
-   FLazyRead := True;
-   FShowCaptions := False;
-   FAlignment := taCenter;
-   FLayout := tlBottom;
-   FDragAutoScroll := True;
-   FBrushPattern := TJvBrushPattern.Create;
- end;
- 
- destructor TJvCustomItemViewerOptions.Destroy;
- begin
-   FBrushPattern.Free;
-   inherited Destroy;
- end;
- 
  procedure TJvCustomItemViewerOptions.SetAlignment(const Value: TAlignment);
  begin
--- 575,578 ----
***************
*** 594,599 ****
  end;
  
! procedure TJvCustomItemViewerOptions.SetBrushPattern(
!   const Value: TJvBrushPattern);
  begin
    //  FBrushPattern := Value;
--- 594,598 ----
  end;
  
! procedure TJvCustomItemViewerOptions.SetBrushPattern(const Value: TJvBrushPattern);
  begin
    //  FBrushPattern := Value;
***************
*** 657,662 ****
  end;
  
! procedure TJvCustomItemViewerOptions.SetReduceMemoryUsage(
!   const Value: Boolean);
  begin
    if FReduceMemoryUsage <> Value then
--- 656,660 ----
  end;
  
! procedure TJvCustomItemViewerOptions.SetReduceMemoryUsage(const Value: Boolean);
  begin
    if FReduceMemoryUsage <> Value then
***************
*** 731,735 ****
  end;
  
! { TJvViewerItem }
  
  procedure TJvViewerItem.Changed;
--- 729,739 ----
  end;
  
! //=== TJvViewerItem ==========================================================
! 
! constructor TJvViewerItem.Create(AOwner: TJvCustomItemViewer);
! begin
!   inherited Create;
!   FOwner := AOwner;
! end;
  
  procedure TJvViewerItem.Changed;
***************
*** 746,755 ****
  end;
  
- constructor TJvViewerItem.Create(AOwner: TJvCustomItemViewer);
- begin
-   inherited Create;
-   FOwner := AOwner;
- end;
- 
  procedure TJvViewerItem.Delete;
  begin
--- 750,753 ----
***************
*** 784,788 ****
  end;
  
! { TJvCustomItemViewer }
  
  function TJvCustomItemViewer.Add(AItem: TJvViewerItem): Integer;
--- 782,820 ----
  end;
  
! //=== TJvCustomItemViewer ====================================================
! 
! constructor TJvCustomItemViewer.Create(AOwner: TComponent);
! begin
!   inherited Create(AOwner);
!   ParentColor := False;
!   ControlStyle := [csCaptureMouse, csDisplayDragImage, csClickEvents, csOpaque, csDoubleClicks];
!   FItems := TList.Create;
!   FOptions := GetOptionsClass.Create(Self);
!   FCanvas := TControlCanvas.Create;
!   TControlCanvas(FCanvas).Control := Self;
!   FSelectedIndex := -1;
!   FLastHotTrack := -1;
!   AutoScroll := False;
!   HorzScrollBar.Smooth := Options.Smooth;
!   HorzScrollBar.Tracking := Options.Tracking;
!   VertScrollBar.Smooth := Options.Smooth;
!   VertScrollBar.Tracking := Options.Tracking;
!   DoubleBuffered := True;
!   FBorderStyle := bsSingle;
!   Width := 185;
!   Height := 150;
!   TabStop := True;
! end;
! 
! destructor TJvCustomItemViewer.Destroy;
! begin
!   StopScrollTimer;
!   Clear;
!   FItems.Free;
!   FOptions.Free;
!   inherited Destroy;
!   // (rom) destroy Canvas always after inherited
!   FCanvas.Free;
! end;
  
  function TJvCustomItemViewer.Add(AItem: TJvViewerItem): Integer;
***************
*** 803,810 ****
    if FBottomRightIndex < 0 then
      FBottomRightIndex := ItemAtPos(ClientWidth, ClientHeight, False) - 1;
!   if FTopLeftIndex < 0 then FTopLeftIndex := 0;
!   if FTopLeftIndex >= Count then FTopLeftIndex := Count - 1;
!   if FBottomRightIndex < 0 then FBottomRightIndex := 0;
!   if FBottomRightIndex >= Count then FBottomRightIndex := Count - 1;
    DoReduceMemory;
  end;
--- 835,846 ----
    if FBottomRightIndex < 0 then
      FBottomRightIndex := ItemAtPos(ClientWidth, ClientHeight, False) - 1;
!   if FTopLeftIndex < 0 then
!     FTopLeftIndex := 0;
!   if FTopLeftIndex >= Count then
!     FTopLeftIndex := Count - 1;
!   if FBottomRightIndex < 0 then
!     FBottomRightIndex := 0;
!   if FBottomRightIndex >= Count then
!     FBottomRightIndex := Count - 1;
    DoReduceMemory;
  end;
***************
*** 856,870 ****
  end;
  
! procedure TJvCustomItemViewer.CMCtl3DChanged(var Message: TMessage);
  begin
!   if NewStyleControls and (FBorderStyle = bsSingle) then RecreateWnd;
    inherited;
  end;
  
! procedure TJvCustomItemViewer.CMDeleteItem(var Message: TMessage);
  var
    I: Integer;
  begin
!   I := FItems.IndexOf(TObject(Message.wParam));
    if (I >= 0) and (I < Count) then
    begin
--- 892,907 ----
  end;
  
! procedure TJvCustomItemViewer.CMCtl3DChanged(var Msg: TMessage);
  begin
!   if NewStyleControls and (FBorderStyle = bsSingle) then
!     RecreateWnd;
    inherited;
  end;
  
! procedure TJvCustomItemViewer.CMDeleteItem(var Msg: TMessage);
  var
    I: Integer;
  begin
!   I := FItems.IndexOf(TObject(Msg.WParam));
    if (I >= 0) and (I < Count) then
    begin
***************
*** 882,895 ****
  end;
  
! procedure TJvCustomItemViewer.CMUnselectItem(var Message: TMessage);
  var
    I: Integer;
  begin
!   if Message.WParam = Integer(Self) then
    begin
      BeginUpdate;
      try
        for I := 0 to Count - 1 do
!         if (Integer(Items[I]) <> Message.LParam) and
            (cdsSelected in Items[I].State) then
            Items[I].State := Items[I].State - [cdsSelected];
--- 919,932 ----
  end;
  
! procedure TJvCustomItemViewer.CMUnselectItem(var Msg: TMessage);
  var
    I: Integer;
  begin
!   if Msg.WParam = Integer(Self) then
    begin
      BeginUpdate;
      try
        for I := 0 to Count - 1 do
!         if (Integer(Items[I]) <> Msg.LParam) and
            (cdsSelected in Items[I].State) then
            Items[I].State := Items[I].State - [cdsSelected];
***************
*** 905,934 ****
  end;
  
- constructor TJvCustomItemViewer.Create(AOwner: TComponent);
- begin
-   inherited Create(AOwner); 
-   ParentColor := False;
-   ControlStyle := [csCaptureMouse, csDisplayDragImage, csClickEvents, csOpaque, csDoubleClicks];
-   FItems := TList.Create;
-   FOptions := GetOptionsClass.Create(Self);
-   FCanvas := TControlCanvas.Create;
-   TControlCanvas(FCanvas).Control := Self;
-   FSelectedIndex := -1;
-   FLastHotTrack := -1;
-   AutoScroll := False;
-   HorzScrollBar.Smooth := Options.Smooth;
-   HorzScrollBar.Tracking := Options.Tracking;
-   VertScrollBar.Smooth := Options.Smooth;
-   VertScrollBar.Tracking := Options.Tracking;
-   DoubleBuffered := True;
-   FBorderStyle := bsSingle;
-   Width := 185;
-   Height := 150;
-   TabStop := True;
- end;
- 
  procedure TJvCustomItemViewer.CreateParams(var Params: TCreateParams);
  const
!   BorderStyles: array[TBorderStyle] of DWORD = (0, WS_BORDER);
  begin
    inherited CreateParams(Params);
--- 942,948 ----
  end;
  
  procedure TJvCustomItemViewer.CreateParams(var Params: TCreateParams);
  const
!   BorderStyles: array [TBorderStyle] of DWORD = (0, WS_BORDER);
  begin
    inherited CreateParams(Params);
***************
*** 943,947 ****
    end;
    with Params.WindowClass do
!     Style := Style or (CS_HREDRAW or CS_VREDRAW) { or CS_SAVEBITS};
  end;
  
--- 957,961 ----
    end;
    with Params.WindowClass do
!     Style := Style or (CS_HREDRAW or CS_VREDRAW); { or CS_SAVEBITS}
  end;
  
***************
*** 955,968 ****
  end;
  
- destructor TJvCustomItemViewer.Destroy;
- begin
-   StopScrollTimer;
-   Clear;
-   FItems.Free;
-   FOptions.Free;
-   FCanvas.Free;
-   inherited Destroy;
- end;
- 
  function TJvCustomItemViewer.DoMouseWheel(Shift: TShiftState;
    WheelDelta: Integer; MousePos: TPoint): Boolean;
--- 969,972 ----
***************
*** 1159,1163 ****
    // (p3) need to do it like this because items aren't created until Items[] is called
    for Result := 0 to Count - 1 do
!     if Items[Result] = Item then Exit;
    Result := -1;
  end;
--- 1163,1168 ----
    // (p3) need to do it like this because items aren't created until Items[] is called
    for Result := 0 to Count - 1 do
!     if Items[Result] = Item then
!       Exit;
    Result := -1;
  end;
***************
*** 1189,1193 ****
  begin
    Result := -1;
!   if (FItemSize.cx < 1) or (FItemSize.cy < 1) then Exit;
    Dec(X, FTopLeft.X);
    Dec(Y, FTopLeft.Y);
--- 1194,1199 ----
  begin
    Result := -1;
!   if (FItemSize.cx < 1) or (FItemSize.cy < 1) then
!     Exit;
    Dec(X, FTopLeft.X);
    Dec(Y, FTopLeft.Y);
***************
*** 1197,1201 ****
      Exit;
    Result := ColRowToIndex(ACol, ARow);
!   if (Result >= Count) and Existing then Result := -1;
  end;
  
--- 1203,1208 ----
      Exit;
    Result := ColRowToIndex(ACol, ARow);
!   if (Result >= Count) and Existing then
!     Result := -1;
  end;
  
***************
*** 1204,1208 ****
    I: Integer;
  begin
!   if FUpdateCount <> 0 then Exit;
    if (Item <> nil) then
    begin
--- 1211,1216 ----
    I: Integer;
  begin
!   if FUpdateCount <> 0 then
!     Exit;
    if (Item <> nil) then
    begin
***************
*** 1315,1319 ****
    //  Canvas.FillRect(Rect(Left, Top, Width, Height));
    for I := 0 to Count - 1 do
-   begin
      if not Items[I].Deleting then
      begin
--- 1323,1326 ----
***************
*** 1333,1337 ****
        end;
      end;
-   end;
  end;
  
--- 1340,1343 ----
***************
*** 1364,1368 ****
      with HorzScrollBar do
        Position := Position + Rect.Left
!   else if Rect.Right > ClientWidth then
    begin
      if Rect.Right - Rect.Left > ClientWidth then
--- 1370,1375 ----
      with HorzScrollBar do
        Position := Position + Rect.Left
!   else
!   if Rect.Right > ClientWidth then
    begin
      if Rect.Right - Rect.Left > ClientWidth then
***************
*** 1374,1378 ****
      with VertScrollBar do
        Position := Position + Rect.Top
!   else if Rect.Bottom > ClientHeight then
    begin
      if Rect.Bottom - Rect.Top > ClientHeight then
--- 1381,1386 ----
      with VertScrollBar do
        Position := Position + Rect.Top
!   else
!   if Rect.Bottom > ClientHeight then
    begin
      if Rect.Bottom - Rect.Top > ClientHeight then
***************
*** 1470,1475 ****
  end;
  
! procedure TJvCustomItemViewer.ToggleSelection(Index: Integer; SetSelection:
!   Boolean);
  begin
    if cdsSelected in Items[Index].State then
--- 1478,1483 ----
  end;
  
! procedure TJvCustomItemViewer.ToggleSelection(Index: Integer;
!   SetSelection: Boolean);
  begin
    if cdsSelected in Items[Index].State then
***************
*** 1488,1491 ****
--- 1496,1504 ----
  
  procedure TJvCustomItemViewer.ShiftSelection(Index: Integer; SetSelection: Boolean);
+ var
+   I: Integer;
+   AFromCol, AFromRow: Integer;
+   AToCol, AToRow: Integer;
+   ACurrCol, ACurrRow: Integer;
  
    function InRange(Value, Min, Max: Integer): Boolean;
***************
*** 1503,1511 ****
    end;
  
- var
-   I,
-     AFromCol, AFromRow,
-     AToCol, AToRow,
-     ACurrCol, ACurrRow: Integer;
  begin
    BeginUpdate;
--- 1516,1519 ----
***************
*** 1549,1553 ****
      Exit;
    HandleNeeded;
!   if not HandleAllocated then Exit;
  
    HorzScrollBar.Smooth := Options.Smooth;
--- 1557,1562 ----
      Exit;
    HandleNeeded;
!   if not HandleAllocated then
!     Exit;
  
    HorzScrollBar.Smooth := Options.Smooth;
***************
*** 1560,1564 ****
    if Options.ShowCaptions then
      Inc(FItemSize.cy, GetTextHeight);
!   if (FItemSize.cy < 1) or (FItemSize.cx < 1) or (Count < 1) then Exit;
    if Options.ScrollBar = tvHorizontal then
    begin
--- 1569,1574 ----
    if Options.ShowCaptions then
      Inc(FItemSize.cy, GetTextHeight);
!   if (FItemSize.cy < 1) or (FItemSize.cx < 1) or (Count < 1) then
!     Exit;
    if Options.ScrollBar = tvHorizontal then
    begin
***************
*** 1567,1576 ****
      else
        FRows := (Height + FItemSize.cy div 3) div FItemSize.cy;
!     if FRows > Count then FRows := Count;
!     if FRows < 1 then FRows := 1;
      //    if (ClientHeight mod FItemSize.cy > FItemSize.cy div 2) then
      //      Inc(FRows);
      FCols := Count div FRows;
!     if FCols < 1 then FCols := 1;
      while (FRows * FCols) < Count do
        Inc(FCols);
--- 1577,1589 ----
      else
        FRows := (Height + FItemSize.cy div 3) div FItemSize.cy;
!     if FRows > Count then
!       FRows := Count;
!     if FRows < 1 then
!       FRows := 1;
      //    if (ClientHeight mod FItemSize.cy > FItemSize.cy div 2) then
      //      Inc(FRows);
      FCols := Count div FRows;
!     if FCols < 1 then
!       FCols := 1;
      while (FRows * FCols) < Count do
        Inc(FCols);
***************
*** 1584,1593 ****
      else
        FCols := (Width + FItemSize.cx div 3) div FItemSize.cx;
!     if FCols > Count then FCols := Count;
!     if FCols < 1 then FCols := 1;
      //    if (ClientWidth mod FItemSize.cx > FItemSize.cx div 2) then
      //      Inc(FCols);
      FRows := Count div FCols;
!     if FRows < 1 then FRows := 1;
      while (FRows * FCols) < Count do
        Inc(FRows);
--- 1597,1609 ----
      else
        FCols := (Width + FItemSize.cx div 3) div FItemSize.cx;
!     if FCols > Count then
!       FCols := Count;
!     if FCols < 1 then
!       FCols := 1;
      //    if (ClientWidth mod FItemSize.cx > FItemSize.cx div 2) then
      //      Inc(FCols);
      FRows := Count div FCols;
!     if FRows < 1 then
!       FRows := 1;
      while (FRows * FCols) < Count do
        Inc(FRows);
***************
*** 1629,1633 ****
  end;
  
! procedure TJvCustomItemViewer.WMHScroll(var Message: TWMHScroll);
  begin
    inherited;
--- 1645,1649 ----
  end;
  
! procedure TJvCustomItemViewer.WMHScroll(var Msg: TWMHScroll);
  begin
    inherited;
***************
*** 1647,1651 ****
        SetFocus;
    end
!   else if Button = mbRight then
    begin
      StopScrollTimer;
--- 1663,1668 ----
        SetFocus;
    end
!   else
!   if Button = mbRight then
    begin
      StopScrollTimer;
***************
*** 1674,1680 ****
        if Options.MultiSelect then
        begin
!         if (ssCtrl in Shift) then
            ToggleSelection(FTempSelected, True)
!         else if ssShift in Shift then
            ShiftSelection(FTempSelected, True)
          else
--- 1691,1698 ----
        if Options.MultiSelect then
        begin
!         if ssCtrl in Shift then
            ToggleSelection(FTempSelected, True)
!         else
!         if ssShift in Shift then
            ShiftSelection(FTempSelected, True)
          else
***************
*** 1699,1709 ****
  end;
  
! procedure TJvCustomItemViewer.WMNCHitTest(var Message: TMessage);
  begin
    // enable scroll bars at design-time
!   DefaultHandler(Message);
  end;
  
! procedure TJvCustomItemViewer.WMPaint(var Message: TWMPaint);
  begin
    ControlState := ControlState + [csCustomPaint];
--- 1717,1727 ----
  end;
  
! procedure TJvCustomItemViewer.WMNCHitTest(var Msg: TMessage);
  begin
    // enable scroll bars at design-time
!   DefaultHandler(Msg);
  end;
  
! procedure TJvCustomItemViewer.WMPaint(var Msg: TWMPaint);
  begin
    ControlState := ControlState + [csCustomPaint];
***************
*** 1712,1716 ****
  end;
  
! procedure TJvCustomItemViewer.WMVScroll(var Message: TWMVScroll);
  begin
    inherited;
--- 1730,1734 ----
  end;
  
! procedure TJvCustomItemViewer.WMVScroll(var Msg: TWMVScroll);
  begin
    inherited;
***************
*** 1721,1725 ****
  end;
  
! procedure TJvCustomItemViewer.WMCancelMode(var Message: TWMCancelMode);
  begin
    inherited;
--- 1739,1743 ----
  end;
  
! procedure TJvCustomItemViewer.WMCancelMode(var Msg: TWMCancelMode);
  begin
    inherited;
***************
*** 1796,1804 ****
      if X <= cEdgeSize then
        ScrollEdge := Ord(seLeft)
!     else if X >= ClientWidth - cEdgeSize then
        ScrollEdge := Ord(seRight)
!     else if Y <= cEdgeSize then
        ScrollEdge := Ord(seTop)
!     else if Y >= CLientHeight - cEdgeSize then
        ScrollEdge := Ord(seBottom)
      else
--- 1814,1825 ----
      if X <= cEdgeSize then
        ScrollEdge := Ord(seLeft)
!     else
!     if X >= ClientWidth - cEdgeSize then
        ScrollEdge := Ord(seRight)
!     else
!     if Y <= cEdgeSize then
        ScrollEdge := Ord(seTop)
!     else
!     if Y >= CLientHeight - cEdgeSize then
        ScrollEdge := Ord(seBottom)
      else
***************
*** 1806,1810 ****
      if (ScrollEdge = Ord(seNone)) and Assigned(FScrollTimer) then
        StopScrollTimer
!     else if (ScrollEdge <> Ord(seNone)) and not Assigned(FScrollTimer) then
      begin
        FScrollTimer := TTimer.Create(nil);
--- 1827,1832 ----
      if (ScrollEdge = Ord(seNone)) and Assigned(FScrollTimer) then
        StopScrollTimer
!     else
!     if (ScrollEdge <> Ord(seNone)) and not Assigned(FScrollTimer) then
      begin
        FScrollTimer := TTimer.Create(nil);
***************
*** 1892,1930 ****
  
  function TJvCustomItemViewer.HintShow(var HintInfo: THintInfo): Boolean;
! var i:integer;
  begin
    with HintInfo.CursorPos do
!     i := ItemAtPos(X,Y, true);
!   if i >= 0 then
    begin
!     HintInfo.HintStr := Items[i].Hint;
!     HintInfo.CursorRect := ItemRect(i,true);
!     DoItemHint(i, HintInfo);
    end;
    if HintInfo.HintStr = '' then
      HintInfo.HintStr := Hint;
!   Result := false;
  end;
  
  procedure TJvCustomItemViewer.Deleted(Item: TJvViewerItem);
  begin
!   if Assigned(FOnDeletion) then FOnDeletion(Self, Item);
  end;
  
  procedure TJvCustomItemViewer.Inserted(Item: TJvViewerItem);
  begin
!   if Assigned(FOnInsertion) then FOnInsertion(Self, Item);
  end;
  
! 
! function TJvCustomItemViewer.DoItemHint(Index: integer;
!   var HintInfo: THintInfo): boolean;
  begin
!   Result := false;
    if Assigned(FOnItemHint) then
      FOnItemHint(Self, Index, HintInfo, Result);
  end;
  
! procedure TJvCustomItemViewer.ScrollBy(DeltaX, DeltaY: integer);
  begin
    if DeltaX <> 0 then
--- 1914,1954 ----
  
  function TJvCustomItemViewer.HintShow(var HintInfo: THintInfo): Boolean;
! var
!   I: Integer;
  begin
    with HintInfo.CursorPos do
!     I := ItemAtPos(X,Y, True);
!   if I >= 0 then
    begin
!     HintInfo.HintStr := Items[I].Hint;
!     HintInfo.CursorRect := ItemRect(I, True);
!     DoItemHint(I, HintInfo);
    end;
    if HintInfo.HintStr = '' then
      HintInfo.HintStr := Hint;
!   Result := False;
  end;
  
  procedure TJvCustomItemViewer.Deleted(Item: TJvViewerItem);
  begin
!   if Assigned(FOnDeletion) then
!     FOnDeletion(Self, Item);
  end;
  
  procedure TJvCustomItemViewer.Inserted(Item: TJvViewerItem);
  begin
!   if Assigned(FOnInsertion) then
!     FOnInsertion(Self, Item);
  end;
  
! function TJvCustomItemViewer.DoItemHint(Index: Integer;
!   var HintInfo: THintInfo): Boolean;
  begin
!   Result := False;
    if Assigned(FOnItemHint) then
      FOnItemHint(Self, Index, HintInfo, Result);
  end;
  
! procedure TJvCustomItemViewer.ScrollBy(DeltaX, DeltaY: Integer);
  begin
    if DeltaX <> 0 then
***************
*** 1935,1939 ****
  end;
  
! { TViewerDrawImageList }
  
  procedure TViewerDrawImageList.Initialize;
--- 1959,1963 ----
  end;
  
! //=== TViewerDrawImageList ===================================================
  
  procedure TViewerDrawImageList.Initialize;

Index: JvDatePickerEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDatePickerEdit.pas,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** JvDatePickerEdit.pas	20 Apr 2004 10:48:57 -0000	1.34
--- JvDatePickerEdit.pas	11 May 2004 06:43:52 -0000	1.35
***************
*** 57,61 ****
   -the control does (currently) not allow for time entry
    - it really is a control for date entry only.
- 
  }
  
--- 57,60 ----
***************
*** 629,633 ****
      if lFigVal > AMax then
        SetActiveFigVal(AMax)
!     else if lFigVal < AMin then
        SetActiveFigVal(AMin);
    end;
--- 628,633 ----
      if lFigVal > AMax then
        SetActiveFigVal(AMax)
!     else
!     if lFigVal < AMin then
        SetActiveFigVal(AMin);
    end;
***************
*** 655,659 ****
          end;
        end
!       else if (not FDeleting) and EnableValidation then
        begin
          lActFig := ActiveFigure;
--- 655,660 ----
          end;
        end
!       else
!       if (not FDeleting) and EnableValidation then
        begin
          lActFig := ActiveFigure;
***************
*** 1133,1137 ****
  begin
    GetCursorPos(P);
!   if PtInRect(BoundsRect, P) then Exit;
    if Assigned(ANextControl) then
      Self.DoKillFocus(ANextControl.Handle)
--- 1134,1139 ----
  begin
    GetCursorPos(P);
!   if PtInRect(BoundsRect, P) then
!     Exit;
    if Assigned(ANextControl) then
      Self.DoKillFocus(ANextControl.Handle)

Index: JvXPButtons.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvXPButtons.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JvXPButtons.pas	30 Apr 2004 17:45:10 -0000	1.12
--- JvXPButtons.pas	11 May 2004 06:43:53 -0000	1.13
***************
*** 837,841 ****
      if ToolType = ttImage then
      begin
!       if (Images = nil) or (ImageIndex < 0) or (ImageIndex >= Images.Count) then Exit;
        Images.Draw(Canvas,
          (Width - Images.Width) div 2 + Integer(Shifted),
--- 837,842 ----
      if ToolType = ttImage then
      begin
!       if (Images = nil) or (ImageIndex < 0) or (ImageIndex >= Images.Count) then
!         Exit;
        Images.Draw(Canvas,
          (Width - Images.Width) div 2 + Integer(Shifted),
***************
*** 858,864 ****
          if (dsClicked in DrawState) and (dsHighlight in DrawState) then
            JvXPColorizeBitmap(Bitmap, clWhite)
!         else if not Enabled then
            JvXPColorizeBitmap(Bitmap, clGray)
!         else if Color <> clBlack then
            JvXPColorizeBitmap(Bitmap, Color);
          Bitmap.Transparent := True;
--- 859,867 ----
          if (dsClicked in DrawState) and (dsHighlight in DrawState) then
            JvXPColorizeBitmap(Bitmap, clWhite)
!         else
!         if not Enabled then
            JvXPColorizeBitmap(Bitmap, clGray)
!         else
!         if Color <> clBlack then
            JvXPColorizeBitmap(Bitmap, Color);
          Bitmap.Transparent := True;
***************
*** 880,884 ****
      if AComponent = DropDownMenu then
        DropDownMenu := nil
!     else if AComponent = Images then
        Images := nil;
    end;
--- 883,888 ----
      if AComponent = DropDownMenu then
        DropDownMenu := nil
!     else
!     if AComponent = Images then
        Images := nil;
    end;

Index: JvWinDialogs.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvWinDialogs.pas,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JvWinDialogs.pas	7 May 2004 16:51:56 -0000	1.19
--- JvWinDialogs.pas	11 May 2004 06:43:52 -0000	1.20
***************
*** 1576,1580 ****
        FileName := BufW;
    end
!   else if Assigned(SHChangeIcon) then
    begin
      StrPCopy(Buf, FileName);
--- 1576,1581 ----
        FileName := BufW;
    end
!   else
!   if Assigned(SHChangeIcon) then
    begin
      StrPCopy(Buf, FileName);

Index: JvDataProvider.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDataProvider.pas,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** JvDataProvider.pas	6 May 2004 18:37:43 -0000	1.32
--- JvDataProvider.pas	11 May 2004 06:43:52 -0000	1.33
***************
*** 70,74 ****
    TJvDataConsumerClientNotifyItem = class;
  
- 
    // Class references
    TAggregatedPersistentExClass = class of TAggregatedPersistentEx;
--- 70,73 ----
***************
*** 1979,1983 ****
  procedure TExtensibleInterfacedPersistent.BeforeDestruction;
  begin
!   if RefCount <> 0 then RunError(2);
    inherited BeforeDestruction;
  end;
--- 1978,1983 ----
  procedure TExtensibleInterfacedPersistent.BeforeDestruction;
  begin
!   if RefCount <> 0 then
!     RunError(2);
    inherited BeforeDestruction;
  end;
***************
*** 2640,2644 ****
  procedure TJvCustomDataItemStates.Set_Enabled(Value: TDataItemState);
  begin
!   if Value = disNotUsed then Exit;
    if Value <> Get_Enabled then
    begin
--- 2640,2645 ----
  procedure TJvCustomDataItemStates.Set_Enabled(Value: TDataItemState);
  begin
!   if Value = disNotUsed then
!     Exit;
    if Value <> Get_Enabled then
    begin
***************
*** 2656,2660 ****
  procedure TJvCustomDataItemStates.Set_Checked(Value: TDataItemState);
  begin
!   if Value = disNotUsed then Exit;
    if Value <> Get_Checked then
    begin
--- 2657,2662 ----
  procedure TJvCustomDataItemStates.Set_Checked(Value: TDataItemState);
  begin
!   if Value = disNotUsed then
!     Exit;
    if Value <> Get_Checked then
    begin
***************
*** 2672,2676 ****
  procedure TJvCustomDataItemStates.Set_Visible(Value: TDataItemState);
  begin
!   if Value = disNotUsed then Exit;
    if Value <> Get_Visible then
    begin
--- 2674,2679 ----
  procedure TJvCustomDataItemStates.Set_Visible(Value: TDataItemState);
  begin
!   if Value = disNotUsed then
!     Exit;
    if Value <> Get_Visible then
    begin
***************
*** 2799,2803 ****
      Items.Provider.Changed(pcrDelete, nil);
    end
!   else if Items.GetItem(Index) <> nil then
      raise EJVCLDataItems.Create(RsEItemCanNotBeDeleted);
  end;
--- 2802,2807 ----
      Items.Provider.Changed(pcrDelete, nil);
    end
!   else
!   if Items.GetItem(Index) <> nil then
      raise EJVCLDataItems.Create(RsEItemCanNotBeDeleted);
  end;
***************
*** 3416,3420 ****
    if (FConsumerStack <> nil) and (FConsumerStack.Count > 0) then
      FConsumerStack.Delete(0)
!   else if FConsumerStack <> nil then
      raise EJVCLDataProvider.Create(RsEConsumerStackIsEmpty);
  end;
--- 3420,3425 ----
    if (FConsumerStack <> nil) and (FConsumerStack.Count > 0) then
      FConsumerStack.Delete(0)
!   else
!   if FConsumerStack <> nil then
      raise EJVCLDataProvider.Create(RsEConsumerStackIsEmpty);
  end;
***************
*** 3438,3442 ****
    if (FContextStack <> nil) and (FContextStack.Count > 0) then
      FContextStack.Delete(0)
!   else if FContextStack <> nil then
      raise EJVCLDataProvider.Create(RsEContextStackIsEmpty);
  end;
--- 3443,3448 ----
    if (FContextStack <> nil) and (FContextStack.Count > 0) then
      FContextStack.Delete(0)
!   else
!   if FContextStack <> nil then
      raise EJVCLDataProvider.Create(RsEContextStackIsEmpty);
  end;
***************
*** 4625,4629 ****
                      ToggleItem(ParIdx);
                    end
!                   else if ItemIsExpanded(ParIdx) then
                    begin
                      // parent is expanded, add the new item to the view.
--- 4631,4636 ----
                      ToggleItem(ParIdx);
                    end
!                   else
!                   if ItemIsExpanded(ParIdx) then
                    begin
                      // parent is expanded, add the new item to the view.