Update of /cvsroot/jvcl/rm/source In directory sc8-pr-cvs1:/tmp/cvs-serv20732/source Modified Files: JvEditor.pas JvFavoritesButton.pas JvFileUtil.pas JvFooter.pas JvFormAnimation.pas JvFtpGrabber.pas JvGIF.pas JvGammaPanel.pas JvGradedit.pas JvGraph.pas JvGroupHeader.pas JvHLEdPropDlg.pas JvHLEditor.pas JvHLParser.pas JvHighlighter.pas JvHint.pas JvHotKey.pas JvHtControls.pas JvHtmlParser.pas JvHttpGrabber.pas JvIColEdit.pas JvId3v2.pas JvImage.pas JvImageDrawThread.pas JvImageWindow.pas JvInspDB.pas JvInspExtraEditors.pas JvInspector.pas Jvgrdcpt.pas Jvgrids.pas JvhtHintEditor.pas Log Message: divider lines Index: JvEditor.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvEditor.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvEditor.pas 12 Feb 2003 19:53:06 -0000 1.5 --- JvEditor.pas 16 Feb 2003 07:34:35 -0000 1.6 *************** *** 1172,1179 **** {$ENDIF COMPILER2} ! {************************* TJvControlScrollBar95 ****************************} constructor TJvControlScrollBar95.Create; begin FPage := 1; FSmallChange := 1; --- 1172,1180 ---- {$ENDIF COMPILER2} ! //=== TJvControlScrollBar95 ================================================== constructor TJvControlScrollBar95.Create; begin + inherited Create; FPage := 1; FSmallChange := 1; *************** *** 1298,1302 **** FOnScroll(Self, ScrollCode, ScrollPos); end; ! {######################### TJvControlScrollBar95 #########################} constructor TJvEditorStrings.Create; --- 1299,1304 ---- FOnScroll(Self, ScrollCode, ScrollPos); end; ! ! //=== TJvEditorStrings ======================================================= constructor TJvEditorStrings.Create; *************** *** 1413,1416 **** --- 1415,1420 ---- end; + //=== TJvEditorClient ======================================================== + function TJvEditorClient.GetCanvas: TCanvas; begin *************** *** 1453,1456 **** --- 1457,1462 ---- end; + //=== TJvGutter ============================================================== + procedure TJvGutter.Invalidate; {var *************** *** 1486,1490 **** end; ! {*********************** TJvCustomEditor ***********************} constructor TJvCustomEditor.Create(AOwner: TComponent); --- 1492,1496 ---- end; ! //=== TJvCustomEditor ======================================================== constructor TJvCustomEditor.Create(AOwner: TComponent); *************** *** 1994,1999 **** end; - {************************** Scroll **************************} - procedure TJvCustomEditor.WMHScroll(var Msg: TWMHScroll); begin --- 2000,2003 ---- *************** *** 2109,2116 **** // EndTick; end; - {####################### Scroll #########################} - {####################### Painting - Otrisovka [translated] ##################} - - {************** Caret ***************} procedure TJvCustomEditor.PaintCaret(const bShow: Boolean); --- 2113,2116 ---- *************** *** 2209,2216 **** end; - {############### Caret ###############} - - {************** Keyboard ***************} - procedure TJvCustomEditor.WMGetDlgCode(var Msg: TWMGetDlgCode); begin --- 2209,2212 ---- *************** *** 3131,3136 **** end; - {############### Keyboard [translated] ###############} - procedure TJvCustomEditor.SelectionChanged; begin --- 3127,3130 ---- *************** *** 3243,3248 **** end; - {************** Mouse [translated] ***************} - procedure TJvCustomEditor.Mouse2Cell(const X, Y: Integer; var CX, CY: Integer); begin --- 3237,3240 ---- *************** *** 3419,3424 **** {############## Mouse [translated] ###############} - {************** ClipBoard ***************} - function TJvCustomEditor.GetClipboardBlockFormat: TSelBlockFormat; var --- 3411,3414 ---- *************** *** 3800,3805 **** end; - {############### ClipBoard ###############} - procedure TJvCustomEditor.SetGutterWidth(AWidth: Integer); begin --- 3790,3793 ---- *************** *** 3967,3972 **** // ending add by patofan - { ************************ triggers ************************ } - procedure TJvCustomEditor.TextModified(Pos: Integer; Action: TModifiedAction; Text: string); --- 3955,3958 ---- *************** *** 4320,4328 **** end; ! {************************** TJvEditKey ***************************} constructor TJvEditKey.Create(const ACommand: TEditCommand; const AKey1: Word; const AShift1: TShiftState); begin Key1 := AKey1; Shift1 := AShift1; --- 4306,4373 ---- end; ! procedure TJvCustomEditor.NotUndoable; ! begin ! FUndoBuffer.Clear; ! end; ! ! {$IFDEF RAEDITOR_COMPLETION} ! ! procedure TJvCustomEditor.CompletionIdentifer(var Cancel: Boolean); ! begin ! {abstract} ! end; ! ! procedure TJvCustomEditor.CompletionTemplate(var Cancel: Boolean); ! begin ! {abstract} ! end; ! ! procedure TJvCustomEditor.DoCompletionIdentifer(var Cancel: Boolean); ! begin ! CompletionIdentifer(Cancel); ! if Assigned(FOnCompletionIdentifer) then ! FOnCompletionIdentifer(Self, Cancel); ! end; ! ! procedure TJvCustomEditor.DoCompletionTemplate(var Cancel: Boolean); ! begin ! CompletionTemplate(Cancel); ! if Assigned(FOnCompletionTemplate) then ! FOnCompletionTemplate(Self, Cancel); ! end; ! ! {$ENDIF RAEDITOR_COMPLETION} ! ! { TIEditReader support } ! ! procedure TJvCustomEditor.ValidateEditBuffer; ! begin ! if FPEditBuffer = nil then ! begin ! FEditBuffer := Lines.Text; ! FPEditBuffer := PChar(FEditBuffer); ! FEditBufferSize := Length(FEditBuffer); ! end; ! end; ! ! function TJvCustomEditor.GetText(Position: Longint; Buffer: PChar; ! Count: Longint): Longint; ! begin ! ValidateEditBuffer; ! if Position <= FEditBufferSize then ! begin ! Result := Min(FEditBufferSize - Position, Count); ! Move(FPEditBuffer[Position], Buffer[0], Result); ! end ! else ! Result := 0; ! end; ! ! //=== TJvEditKey ============================================================= constructor TJvEditKey.Create(const ACommand: TEditCommand; const AKey1: Word; const AShift1: TShiftState); begin + inherited Create; Key1 := AKey1; Shift1 := AShift1; *************** *** 4333,4336 **** --- 4378,4382 ---- const AShift1: TShiftState; const AKey2: Word; const AShift2: TShiftState); begin + inherited Create; Key1 := AKey1; Shift1 := AShift1; *************** *** 4340,4345 **** --- 4386,4394 ---- end; + //=== TJvKeyboard ============================================================ + constructor TJvKeyboard.Create; begin + inherited Create; List := TList.Create; end; *************** *** 4349,4352 **** --- 4398,4402 ---- Clear; List.Free; + inherited Destroy; end; *************** *** 4574,4577 **** --- 4624,4629 ---- {$IFDEF RAEDITOR_UNDO} + //=== TUndoBuffer ============================================================ + procedure RedoNotImplemented; begin *************** *** 4579,4587 **** end; - procedure TJvCustomEditor.NotUndoable; - begin - FUndoBuffer.Clear; - end; - procedure TUndoBuffer.Add(AUndo: TUndo); begin --- 4631,4634 ---- *************** *** 4685,4690 **** --- 4732,4740 ---- end; + //=== TUndo ================================================================== + constructor TUndo.Create(ARAEditor: TJvCustomEditor); begin + inherited Create; FRAEditor := ARAEditor; UndoBuffer.Add(Self); *************** *** 4699,4702 **** --- 4749,4754 ---- end; + //=== TJvCaretUndo =========================================================== + constructor TJvCaretUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer); *************** *** 4725,4728 **** --- 4777,4782 ---- end; + //=== TJvInsertUndo ========================================================== + constructor TJvInsertUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer; AText: string); *************** *** 4759,4762 **** --- 4813,4818 ---- end; + //=== TJvInsertColumnUndo ==================================================== + procedure TJvInsertColumnUndo.Undo; var *************** *** 4781,4784 **** --- 4837,4842 ---- end; + //=== TJvOverwriteUndo ======================================================= + constructor TJvOverwriteUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer; AOldText, ANewText: string); *************** *** 4800,4803 **** --- 4858,4863 ---- end; + //=== TJvDeleteUndo ========================================================== + procedure TJvDeleteUndo.Undo; var *************** *** 4827,4830 **** --- 4887,4892 ---- end; + //=== TJvBackspaceUndo ======================================================= + procedure TJvBackspaceUndo.Undo; var *************** *** 4854,4857 **** --- 4916,4921 ---- end; + //=== TJvReplaceUndo ========================================================= + constructor TJvReplaceUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer; ABeg, AEnd: Integer; AText, ANewText: string); *************** *** 4875,4878 **** --- 4939,4944 ---- end; + //=== TJvDeleteSelectedUndo ================================================== + constructor TJvDeleteSelectedUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer; AText: string; ASelBlockFormat: TSelBlockFormat; *************** *** 4919,4922 **** --- 4985,4990 ---- end; + //=== TJvSelectUndo ========================================================== + constructor TJvSelectUndo.Create(ARAEditor: TJvCustomEditor; ACaretX, ACaretY: Integer; ASelected: Boolean; ASelBlockFormat: TSelBlockFormat; *************** *** 4943,4946 **** --- 5011,5016 ---- end; + //=== TJvBeginCompoundUndo =================================================== + procedure TJvBeginCompoundUndo.Undo; begin *************** *** 4950,4982 **** {$ENDIF RAEDITOR_UNDO} ! {##################### Undo #####################} - {********************* Code Completion *********************} {$IFDEF RAEDITOR_COMPLETION} - procedure TJvCustomEditor.CompletionIdentifer(var Cancel: Boolean); - begin - {abstract} - end; - - procedure TJvCustomEditor.CompletionTemplate(var Cancel: Boolean); - begin - {abstract} - end; - - procedure TJvCustomEditor.DoCompletionIdentifer(var Cancel: Boolean); - begin - CompletionIdentifer(Cancel); - if Assigned(FOnCompletionIdentifer) then - FOnCompletionIdentifer(Self, Cancel); - end; - - procedure TJvCustomEditor.DoCompletionTemplate(var Cancel: Boolean); - begin - CompletionTemplate(Cancel); - if Assigned(FOnCompletionTemplate) then - FOnCompletionTemplate(Self, Cancel); - end; - type TJvEditorCompletionList = class(TListBox) --- 5020,5027 ---- {$ENDIF RAEDITOR_UNDO} ! //=== TJvEditorCompletion ==================================================== {$IFDEF RAEDITOR_COMPLETION} type TJvEditorCompletionList = class(TListBox) *************** *** 5374,5378 **** end; ! {************** TJvEditorCompletionList *************} constructor TJvEditorCompletionList.Create(AOwner: TComponent); --- 5419,5423 ---- end; ! //=== TJvEditorCompletionList ================================================ constructor TJvEditorCompletionList.Create(AOwner: TComponent); *************** *** 5521,5549 **** {$ENDIF RAEDITOR_COMPLETION} {$ENDIF RAEDITOR_EDITOR} - - { TIEditReader support } - - procedure TJvCustomEditor.ValidateEditBuffer; - begin - if FPEditBuffer = nil then - begin - FEditBuffer := Lines.Text; - FPEditBuffer := PChar(FEditBuffer); - FEditBufferSize := Length(FEditBuffer); - end; - end; - - function TJvCustomEditor.GetText(Position: Longint; Buffer: PChar; - Count: Longint): Longint; - begin - ValidateEditBuffer; - if Position <= FEditBufferSize then - begin - Result := Min(FEditBufferSize - Position, Count); - Move(FPEditBuffer[Position], Buffer[0], Result); - end - else - Result := 0; - end; end. --- 5566,5569 ---- Index: JvFavoritesButton.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvFavoritesButton.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvFavoritesButton.pas 13 Feb 2003 08:08:24 -0000 1.6 --- JvFavoritesButton.pas 16 Feb 2003 07:34:35 -0000 1.7 *************** *** 53,59 **** procedure AddIconFrom(Path: string); public - procedure Click; override; constructor Create(AOwner: TComponent); override; destructor Destroy; override; published property OnUrlClick: TOnUrlClick read FOnUrlClick write FOnUrlClick; --- 53,59 ---- procedure AddIconFrom(Path: string); public constructor Create(AOwner: TComponent); override; destructor Destroy; override; + procedure Click; override; published property OnUrlClick: TOnUrlClick read FOnUrlClick write FOnUrlClick; Index: JvFileUtil.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvFileUtil.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvFileUtil.pas 13 Feb 2003 08:08:24 -0000 1.5 --- JvFileUtil.pas 16 Feb 2003 07:34:35 -0000 1.6 *************** *** 247,250 **** --- 247,252 ---- HelpButtonId = $FFFF; + //=== TJvBrowseFolderDlg ===================================================== + constructor TJvBrowseFolderDlg.Create(AOwner: TComponent); begin *************** *** 481,484 **** --- 483,488 ---- end; end; + + //=== TJvFileOperator ======================================================== type Index: JvFooter.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvFooter.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvFooter.pas 11 Feb 2003 14:23:26 -0000 1.3 --- JvFooter.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 133,136 **** --- 133,138 ---- implementation + //=== TJvFooterBtn =========================================================== + const DefFootWidth = 350; *************** *** 226,229 **** --- 228,233 ---- inherited SetParent(AParent); end; + + //=== TJvFooter ============================================================== constructor TJvFooter.Create(AOwner: TComponent); Index: JvFormAnimation.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvFormAnimation.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvFormAnimation.pas 11 Feb 2003 14:23:26 -0000 1.3 --- JvFormAnimation.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 39,42 **** --- 39,43 ---- FForm: TCustomForm; FRegions: array of HRGN; + // (rom) simplified procedure AnimateDisappear(N: Integer); procedure AnimateAppear(N: Integer); Index: JvFtpGrabber.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvFtpGrabber.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvFtpGrabber.pas 13 Feb 2003 17:40:33 -0000 1.4 --- JvFtpGrabber.pas 16 Feb 2003 07:34:35 -0000 1.5 *************** *** 152,155 **** --- 152,157 ---- {$ENDIF} + //=== TJvFtpGrabber ========================================================== + constructor TJvFtpGrabber.Create(AOwner: TComponent); begin *************** *** 276,279 **** --- 278,283 ---- end; + //=== TJvFtpThread =========================================================== + constructor TJvFtpThread.Create(Url, UserName, FileName, Password: string; OutputMode: TJvOutputMode; OnError: TOnError; *************** *** 335,340 **** FOnStatus(TJvFtpThread(Context), Status, FUrl); end; - - {*************************************************} procedure TJvFtpThread.Execute; --- 339,342 ---- Index: JvGIF.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvGIF.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvGIF.pas 13 Feb 2003 17:40:35 -0000 1.6 --- JvGIF.pas 16 Feb 2003 07:34:35 -0000 1.7 *************** *** 275,286 **** end; - { Clipboard format for GIF image } - var ! CF_GIF: Word; { Load incomplete or corrupted images without exceptions } ! const GIFLoadCorrupted: Boolean = True; --- 275,285 ---- end; var ! CF_GIF: Word; { Clipboard format for GIF image } { Load incomplete or corrupted images without exceptions } ! // (rom) changed to var to allow changes ! var GIFLoadCorrupted: Boolean = True; *************** *** 322,325 **** --- 321,326 ---- end; + //=== TSharedImage =========================================================== + {$IFNDEF COMPILER3_UP} *************** *** 539,542 **** --- 540,545 ---- end; + //=== TExtension ============================================================= + TExtension = class(TPersistent) private *************** *** 1254,1257 **** --- 1257,1262 ---- end; + //=== TGIFItem =============================================================== + destructor TGIFItem.Destroy; begin *************** *** 1266,1269 **** --- 1271,1276 ---- end; + //=== TGIFData =============================================================== + constructor TGIFData.Create; begin *************** *** 1284,1287 **** --- 1291,1296 ---- end; + //=== TJvGIFFrame ============================================================ + constructor TJvGIFFrame.Create(AOwner: TJvGIFImage); begin *************** *** 1938,1941 **** --- 1947,1952 ---- ACanvas.StretchDraw(ARect, Bitmap); end; + + //=== TJvGIFImage ============================================================ constructor TJvGIFImage.Create; Index: JvGammaPanel.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvGammaPanel.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvGammaPanel.pas 13 Feb 2003 17:40:40 -0000 1.3 --- JvGammaPanel.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 69,73 **** procedure Color1Click(Sender: TObject); procedure Color2Click(Sender: TObject); - protected public constructor Create(AOwner: TComponent); override; --- 69,72 ---- Index: JvGradedit.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvGradedit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvGradedit.pas 11 Feb 2003 07:34:20 -0000 1.3 --- JvGradedit.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 135,138 **** --- 135,140 ---- end; + //=== TGradientCaptionEditor ================================================= + procedure TGradientCaptionEditor.Edit; begin *************** *** 159,162 **** --- 161,166 ---- end; + //=== TGradientCaptionsProperty ============================================== + {$IFNDEF COMPILER3_UP} *************** *** 174,178 **** {$ENDIF COMPILER3_UP} ! { TGradCaptionsEditor } procedure TGradCaptionsEditor.UpdateCaptionList(Index: Integer); --- 178,182 ---- {$ENDIF COMPILER3_UP} ! //=== TGradCaptionsEditor ==================================================== procedure TGradCaptionsEditor.UpdateCaptionList(Index: Integer); Index: JvGraph.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvGraph.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvGraph.pas 9 Feb 2003 06:05:09 -0000 1.3 --- JvGraph.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 1561,1564 **** --- 1561,1566 ---- end; + //=== TJvGradient ============================================================ + constructor TJvGradient.Create; begin Index: JvGroupHeader.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvGroupHeader.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvGroupHeader.pas 27 Jan 2003 18:00:44 -0000 1.2 --- JvGroupHeader.pas 16 Feb 2003 07:34:35 -0000 1.3 *************** *** 128,131 **** --- 128,133 ---- implementation + //=== TJvGroupHeaderOptions ================================================== + constructor TJvGroupHeaderOptions.Create; begin *************** *** 184,187 **** --- 186,191 ---- FOnChange(Self); end; + + //=== TJvGroupHeader ========================================================= constructor TJvGroupHeader.Create(AOwner: TComponent); Index: JvHLEdPropDlg.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHLEdPropDlg.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHLEdPropDlg.pas 13 Feb 2003 17:40:44 -0000 1.3 --- JvHLEdPropDlg.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 178,182 **** uses - {Consts,} JvCtlConst, JvStrUtil, JvMaxMin; --- 178,181 ---- *************** *** 196,199 **** --- 195,200 ---- end; + //=== TJvSampleViewer ======================================================== + type TJvSampleViewer = class(TJvHLEditor) *************** *** 207,210 **** --- 208,272 ---- end; + constructor TJvSampleViewer.Create(AOwner: TComponent); + begin + inherited Create(AOwner); + TmpEd := TJvHLEditor.Create(Self); + TmpEd.Visible := False; + TmpEd.Parent := Self; + end; + + procedure TJvSampleViewer.WndProc(var Msg: TMessage); + begin + case Msg.Msg of + {WM_LBUTTONDOWN,} WM_LBUTTONUP, WM_RBUTTONDOWN, WM_RBUTTONUP, + WM_MOUSEMOVE, WM_LBUTTONDBLCLK, WM_RBUTTONDBLCLK: + { nothing - prevent user interact }; + else + inherited WndProc(Msg); + end; + end; + + procedure TJvSampleViewer.WMLButtonDown(var Msg: TWMLButtonDown); + var + XX, YY: Integer; + F: Integer; + Str: string; + begin + { also prevent user interact } + { detect symbol type } + Mouse2Caret(Msg.XPos, Msg.YPos, XX, YY); + if (XX = RightMargin) or (XX - 1 = RightMargin) then + F := 13 + else + begin + TmpEd.Lines := Lines; + TmpEd.HighLighter := HighLighter; + { color values corresponds to lbElements ListBox } + TmpEd.Font.Color := 0; + with TmpEd.Colors do + begin + Comment.ForeColor := 1; + Reserved.ForeColor := 2; + Identifer.ForeColor := 3; + Symbol.ForeColor := 4; + Strings.ForeColor := 5; + Number.ForeColor := 6; + Preproc.ForeColor := 7; + Declaration.ForeColor := 8; + FunctionCall.ForeColor := 9; + Statement.ForeColor := 10; + PlainText.ForeColor := 11; + end; + TmpEd.SelForeColor := 12; + Str := TmpEd.Lines[YY]; + TJvSampleViewer(TmpEd).GetLineAttr(Str, YY, 0, JvEditor.Max_X - 1); + F := TJvSampleViewer(TmpEd).LineAttrs[XX].FC; + end; + (Owner as TJvHLEditorParamsForm).lbElements.ItemIndex := F; + (Owner as TJvHLEditorParamsForm).lbElementsClick((Owner as TJvHLEditorParamsForm).lbElements); + end; + + //=== TJvHLEdPropDlg ========================================================= + constructor TJvHLEdPropDlg.Create(AOwner: TComponent); begin *************** *** 440,443 **** --- 502,507 ---- end; + //=== TJvHLEditorParamsForm ================================================== + procedure TJvHLEditorParamsForm.ParamsToControls; var *************** *** 817,876 **** bOK.Caption := SOk; bCancel.Caption := SCancel; - end; - - constructor TJvSampleViewer.Create(AOwner: TComponent); - begin - inherited Create(AOwner); - TmpEd := TJvHLEditor.Create(Self); - TmpEd.Visible := False; - TmpEd.Parent := Self; - end; - - procedure TJvSampleViewer.WndProc(var Msg: TMessage); - begin - case Msg.Msg of - {WM_LBUTTONDOWN,} WM_LBUTTONUP, WM_RBUTTONDOWN, WM_RBUTTONUP, - WM_MOUSEMOVE, WM_LBUTTONDBLCLK, WM_RBUTTONDBLCLK: - { nothing - prevent user interact }; - else - inherited WndProc(Msg); - end; - end; - - procedure TJvSampleViewer.WMLButtonDown(var Msg: TWMLButtonDown); - var - XX, YY: Integer; - F: Integer; - Str: string; - begin - { also prevent user interact } - { detect symbol type } - Mouse2Caret(Msg.XPos, Msg.YPos, XX, YY); - if (XX = RightMargin) or (XX - 1 = RightMargin) then - F := 13 - else - begin - TmpEd.Lines := Lines; - TmpEd.HighLighter := HighLighter; - { color values corresponds to lbElements ListBox } - TmpEd.Font.Color := 0; - TmpEd.Colors.Comment.ForeColor := 1; - TmpEd.Colors.Reserved.ForeColor := 2; - TmpEd.Colors.Identifer.ForeColor := 3; - TmpEd.Colors.Symbol.ForeColor := 4; - TmpEd.Colors.Strings.ForeColor := 5; - TmpEd.Colors.Number.ForeColor := 6; - TmpEd.Colors.Preproc.ForeColor := 7; - TmpEd.Colors.Declaration.ForeColor := 8; - TmpEd.Colors.FunctionCall.ForeColor := 9; - TmpEd.Colors.Statement.ForeColor := 10; - TmpEd.Colors.PlainText.ForeColor := 11; - TmpEd.SelForeColor := 12; - Str := TmpEd.Lines[YY]; - TJvSampleViewer(TmpEd).GetLineAttr(Str, YY, 0, JvEditor.Max_X - 1); - F := TJvSampleViewer(TmpEd).LineAttrs[XX].FC; - end; - (Owner as TJvHLEditorParamsForm).lbElements.ItemIndex := F; - (Owner as TJvHLEditorParamsForm).lbElementsClick((Owner as TJvHLEditorParamsForm).lbElements); end; --- 881,884 ---- Index: JvHLEditor.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHLEditor.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHLEditor.pas 13 Feb 2003 17:40:46 -0000 1.3 --- JvHLEditor.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 90,99 **** FBackColor: TColor; public procedure SetColor(const ForeColor, BackColor: TColor; const Style: TFontStyles); procedure Assign(Source: TPersistent); override; published ! property Style: TFontStyles read FStyle write FStyle; ! property ForeColor: TColor read FForeColor write FForeColor; ! property BackColor: TColor read FBackColor write FBackColor; end; --- 90,101 ---- FBackColor: TColor; public + constructor Create; procedure SetColor(const ForeColor, BackColor: TColor; const Style: TFontStyles); procedure Assign(Source: TPersistent); override; published ! // (rom) defaults and constructor added ! property Style: TFontStyles read FStyle write FStyle default []; ! property ForeColor: TColor read FForeColor write FForeColor default clWindowText; ! property BackColor: TColor read FBackColor write FBackColor default clWindow; end; *************** *** 174,177 **** --- 176,189 ---- JvStrUtil, JvMaxMin; + //=== TJvSymbolColor ========================================================= + + constructor TJvSymbolColor.Create; + begin + inherited Create; + FStyle := []; + FForeColor := clWindowText; + FBackColor := clWindow; + end; + procedure TJvSymbolColor.SetColor(const ForeColor, BackColor: TColor; const Style: TFontStyles); begin *************** *** 193,196 **** --- 205,210 ---- end; + //=== TJvColors ============================================================== + constructor TJvColors.Create; begin *************** *** 255,258 **** --- 269,274 ---- inherited Assign(Source); end; + + //=== TJvHLEditor ============================================================ constructor TJvHLEditor.Create(AOwner: TComponent); Index: JvHLParser.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHLParser.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHLParser.pas 28 Jan 2003 21:58:51 -0000 1.3 --- JvHLParser.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 120,123 **** --- 120,125 ---- end; + //=== EJvIParserError ======================================================== + constructor EJvIParserError.Create(AErrCode: Integer; APos: Integer); begin *************** *** 125,128 **** --- 127,132 ---- Pos := APos; end; + + //=== TJvIParser ============================================================= constructor TJvIParser.Create; Index: JvHighlighter.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHighlighter.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHighlighter.pas 13 Feb 2003 17:40:53 -0000 1.3 --- JvHighlighter.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 45,50 **** procedure SetExtraBorder(Value: Integer); public - procedure Paint; override; constructor Create(AOwner: TComponent); override; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; --- 45,50 ---- procedure SetExtraBorder(Value: Integer); public constructor Create(AOwner: TComponent); override; + procedure Paint; override; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; *************** *** 52,55 **** --- 52,57 ---- property Color; property ExtraBorder: Integer read FExtraBorder write SetExtraBorder default 4; + property Height default 30; + property Width default 30; end; Index: JvHint.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHint.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvHint.pas 14 Feb 2003 10:53:34 -0000 1.4 --- JvHint.pas 16 Feb 2003 07:34:35 -0000 1.5 *************** *** 79,82 **** --- 79,84 ---- implementation + //=== TJvHint ================================================================ + constructor TJvHint.Create(AOwner: TComponent); begin *************** *** 207,210 **** --- 209,214 ---- HintWindow.Caption := ''; end; + + //=== TJvHTHintWindow ======================================================== constructor TJvHTHintWindow.Create(AOwner: TComponent); Index: JvHotKey.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHotKey.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHotKey.pas 13 Feb 2003 17:40:55 -0000 1.3 --- JvHotKey.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 47,51 **** procedure MouseLeave(var Msg: TMessage); message CM_MOUSELEAVE; procedure CMParentColorChanged(var Msg: TMessage); message CM_PARENTCOLORCHANGED; - protected public constructor Create(AOwner: TComponent); override; --- 47,50 ---- Index: JvHtControls.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHtControls.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvHtControls.pas 14 Feb 2003 10:53:34 -0000 1.3 --- JvHtControls.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 503,506 **** --- 503,508 ---- end; + //=== TJvHtListBox =========================================================== + constructor TJvHtListBox.Create(AOwner: TComponent); begin *************** *** 547,550 **** --- 549,554 ---- end; + //=== TJvHTComboBox ========================================================== + constructor TJvHTComboBox.Create(AOwner: TComponent); begin *************** *** 623,626 **** --- 627,632 ---- end; end; + + //=== TJvHTLabel ============================================================= {$IFNDEF COMPILER4_UP} Index: JvHtmlParser.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHtmlParser.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvHtmlParser.pas 13 Feb 2003 17:40:56 -0000 1.4 --- JvHtmlParser.pas 16 Feb 2003 07:34:35 -0000 1.5 *************** *** 50,54 **** TTagInfoList = class(TList) public ! procedure AddValue(Value: TTagInfo); procedure Clear; override; end; --- 50,54 ---- TTagInfoList = class(TList) public ! procedure AddValue(const Value: TTagInfo); procedure Clear; override; end; *************** *** 97,100 **** --- 97,102 ---- end; + //=== TJvHtmlParser ========================================================== + constructor TJvHtmlParser.Create(AOwner: TComponent); begin *************** *** 295,301 **** end; ! // (rom) this is not good. Better make it a normal TList. ! procedure TTagInfoList.AddValue(Value: TTagInfo); var P: PTagInfo; --- 297,303 ---- end; ! //=== TTagInfoList =========================================================== ! procedure TTagInfoList.AddValue(const Value: TTagInfo); var P: PTagInfo; *************** *** 304,315 **** if P <> nil then begin ! with P^ do ! begin ! BeginPos := Value.BeginPos; ! EndPos := Value.EndPos; ! BeginContext := Value.BeginContext; ! EndContext := Value.EndContext; ! Key := Value.Key; ! end; Add(P); end; --- 306,311 ---- if P <> nil then begin ! // (rom) simplified ! System.Move(Value, P^, SizeOf(TTagInfo)); Add(P); end; Index: JvHttpGrabber.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvHttpGrabber.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvHttpGrabber.pas 13 Feb 2003 17:40:56 -0000 1.4 --- JvHttpGrabber.pas 16 Feb 2003 07:34:35 -0000 1.5 *************** *** 138,141 **** --- 138,143 ---- implementation + //=== TJvHttpGrabber ========================================================= + constructor TJvHttpGrabber.Create(AOwner: TComponent); begin *************** *** 271,274 **** --- 273,278 ---- FThread := nil; end; + + //=== TJvHttpThread ========================================================== constructor TJvHttpThread.Create(Url, Referer, Username, FileName, Index: JvIColEdit.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvIColEdit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvIColEdit.pas 11 Feb 2003 07:34:20 -0000 1.3 --- JvIColEdit.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 152,155 **** --- 152,157 ---- end; + //=== TIconListProperty ====================================================== + procedure TIconListProperty.Edit; var *************** *** 203,206 **** --- 205,210 ---- SetOrdValue(0); end; + + //=== TIconListDialog ======================================================== procedure TIconListDialog.LoadAniFile; Index: JvId3v2.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvId3v2.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvId3v2.pas 13 Feb 2003 17:40:58 -0000 1.3 --- JvId3v2.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 492,509 **** implementation ! procedure TJvId3v2.CheckEvent(CurrentTime: Integer); ! var ! I: Integer; ! begin ! if (FEventsCount > 0) and Assigned(FEventTiming) then ! begin ! if CurrentTime < FCount then ! FCount := 0; ! for I := 0 to FEventsCount - 1 do ! if FEvents[I].TimeStamp in [FCount..CurrentTime] then ! FEventTiming(Self, FEvents[I].TimeStamp, FEvents[I].EventType); ! end; ! FCount := CurrentTime; ! end; constructor TJvId3v2.Create(AOwner: TComponent); --- 492,496 ---- implementation ! //=== TJvId3v2 =============================================================== constructor TJvId3v2.Create(AOwner: TComponent); *************** *** 537,540 **** --- 524,542 ---- end; + procedure TJvId3v2.CheckEvent(CurrentTime: Integer); + var + I: Integer; + begin + if (FEventsCount > 0) and Assigned(FEventTiming) then + begin + if CurrentTime < FCount then + FCount := 0; + for I := 0 to FEventsCount - 1 do + if FEvents[I].TimeStamp in [FCount..CurrentTime] then + FEventTiming(Self, FEvents[I].TimeStamp, FEvents[I].EventType); + end; + FCount := CurrentTime; + end; + type TShortToLongName = record *************** *** 2227,2230 **** --- 2229,2234 ---- end; + //=== TJvId3Text ============================================================= + constructor TJvId3Text.Create; begin *************** *** 2292,2295 **** --- 2296,2301 ---- end; + //=== TJvId3Web ============================================================== + procedure TJvId3Web.ResetFields; begin *************** *** 2304,2314 **** end; ! procedure TJvID3UDText.AddItem(Desc, Value: string); ! begin ! FStrings.Add(Value); ! FDescriptions.Add(Desc); ! SetItem(0); ! FItemCount := FStrings.Count; ! end; constructor TJvID3UDText.Create; --- 2310,2314 ---- end; ! //=== TJvID3UDText =========================================================== constructor TJvID3UDText.Create; *************** *** 2326,2329 **** --- 2326,2337 ---- end; + procedure TJvID3UDText.AddItem(Desc, Value: string); + begin + FStrings.Add(Value); + FDescriptions.Add(Desc); + SetItem(0); + FItemCount := FStrings.Count; + end; + procedure TJvID3UDText.ResetFields; begin *************** *** 2347,2350 **** --- 2355,2360 ---- end; + //=== TJvID3UDUrl ============================================================ + constructor TJvID3UDUrl.Create; begin *************** *** 2390,2393 **** --- 2400,2405 ---- end; + //=== TJvIdPictures ========================================================== + constructor TJvIdPictures.Create; begin *************** *** 2548,2551 **** --- 2560,2565 ---- end; + //=== TJvIdImages ============================================================ + constructor TJvIdImages.Create; begin *************** *** 2608,2611 **** --- 2622,2627 ---- end; + //=== TJvIdIpl =============================================================== + constructor TJvIdIpl.Create; begin *************** *** 2650,2653 **** --- 2666,2671 ---- end; end; + + //=== TJvId3Owner ============================================================ procedure TJvId3Owner.ResetFields; Index: JvImage.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvImage.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvImage.pas 13 Feb 2003 17:40:59 -0000 1.3 --- JvImage.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 104,107 **** --- 104,109 ---- implementation + //=== TJvImage =============================================================== + constructor TJvImage.Create(AOwner: TComponent); begin *************** *** 272,275 **** --- 274,279 ---- FOnStateChanged(Self); end; + + //=== TJvPictures ============================================================ constructor TJvPictures.Create; Index: JvImageDrawThread.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvImageDrawThread.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvImageDrawThread.pas 2 Feb 2003 05:19:03 -0000 1.2 --- JvImageDrawThread.pas 16 Feb 2003 07:34:35 -0000 1.3 *************** *** 52,56 **** end; - implementation --- 52,55 ---- Index: JvImageWindow.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvImageWindow.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvImageWindow.pas 13 Feb 2003 19:31:44 -0000 1.3 --- JvImageWindow.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 192,195 **** --- 192,197 ---- JvTypes, JvMaxMin; + //=== TJvImageWindow ========================================================= + constructor TJvImageWindow.Create(AOwner: TComponent); begin *************** *** 576,579 **** --- 578,583 ---- end; + //=== TJvImageSquare ========================================================= + constructor TJvImageSquare.Create(AOwner: TComponent); begin *************** *** 592,604 **** end; - procedure TJvImageSquare.ImageListChange(Sender: Tobject); - begin - Repaint; - end; - destructor TJvImageSquare.Destroy; begin FImageChangeLink.Free; inherited Destroy; end; --- 596,608 ---- end; destructor TJvImageSquare.Destroy; begin FImageChangeLink.Free; inherited Destroy; + end; + + procedure TJvImageSquare.ImageListChange(Sender: Tobject); + begin + Repaint; end; Index: JvInspDB.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvInspDB.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvInspDB.pas 2 Feb 2003 05:19:03 -0000 1.2 --- JvInspDB.pas 16 Feb 2003 07:34:35 -0000 1.3 *************** *** 133,136 **** --- 133,145 ---- end; + //=== TJvInspectorDBData ===================================================== + + destructor TJvInspectorDBData.Destroy; + begin + inherited Destroy; + DataLink.Free; + FDataLink := nil; + end; + procedure TJvInspectorDBData.ActiveChange(Sender: TObject); begin *************** *** 430,440 **** end; - destructor TJvInspectorDBData.Destroy; - begin - inherited Destroy; - DataLink.Free; - FDataLink := nil; - end; - class function TJvInspectorDBData.FieldTypeMapping: TJvInspectorRegister; begin --- 439,442 ---- *************** *** 567,570 **** --- 569,574 ---- Field.AsInteger := TmpInt; end; + + //=== TJvInspectorTFieldTypeRegItem ========================================== constructor TJvInspectorTFieldTypeRegItem.Create(const AFieldName, AFieldTable: string; Index: JvInspExtraEditors.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvInspExtraEditors.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JvInspExtraEditors.pas 2 Feb 2003 05:19:03 -0000 1.2 --- JvInspExtraEditors.pas 16 Feb 2003 07:34:35 -0000 1.3 *************** *** 157,160 **** --- 157,162 ---- end; + //=== TJvInspectorAlignItem ================================================== + procedure TJvInspectorAlignItem.EditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); var *************** *** 355,358 **** --- 357,362 ---- end; + //=== TJvInspectorColorItem ================================================== + procedure TJvInspectorColorItem.AddStdColor(const S: string); begin *************** *** 590,593 **** --- 594,599 ---- end; + //=== TJvInspectorAnchorsItem ================================================ + procedure TJvInspectorAnchorsItem.EditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); var *************** *** 775,778 **** --- 781,786 ---- TJvCustomInspectorData.ItemRegister.Delete(Self); end; + + //=== TJvInspectorTImageIndexItem ============================================ procedure TJvInspectorTImageIndexItem.PaintValue(const ImgNum: Integer; const ImgName: string; Index: JvInspector.pas =================================================================== RCS file: /cvsroot/jvcl/rm/source/JvInspector.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvInspector.pas 12 Feb 2003 19:53:12 -0000 1.3 --- JvInspector.pas 16 Feb 2003 07:34:35 -0000 1.4 *************** *** 1526,1529 **** --- 1526,1531 ---- FPropItemReg: TJvInspectorRegister; + //=== TJvPopupListBox ======================================================== + type TJvPopupListBox = class(TCustomListBox) *************** *** 1582,1585 **** --- 1584,1589 ---- end; + //=== TCanvasStack =========================================================== + function HeightOf(const Rect: TRect): Integer; begin *************** *** 1675,1678 **** --- 1679,1684 ---- end; + //=== TCanvasState =========================================================== + constructor TCanvasState.Create(const Canvas: TCanvas); begin *************** *** 1740,1743 **** --- 1746,1751 ---- end; + //=== TInspReg =============================================================== + type TInspReg = class(TObject) *************** *** 1799,1802 **** --- 1807,1812 ---- end; + //=== TJvInspDataReg ========================================================= + type TJvInspDataReg = class(TPersistent) *************** *** 1824,1839 **** end; - function TJvInspDataReg.GetCount: Integer; - begin - Result := Length(FInstanceList); - end; - - function TJvInspDataReg.GetItems(I: Integer): TJvCustomInspectorData; - begin - if (I < Low(FInstanceList)) or (I > High(FInstanceList)) then - TList.Error(SListIndexError, I); - Result := FInstanceList[I]; - end; - constructor TJvInspDataReg.Create; begin --- 1834,1837 ---- *************** *** 1848,1851 **** --- 1846,1861 ---- end; + function TJvInspDataReg.GetCount: Integer; + begin + Result := Length(FInstanceList); + end; + + function TJvInspDataReg.GetItems(I: Integer): TJvCustomInspectorData; + begin + if (I < Low(FInstanceList)) or (I > High(FInstanceList)) then + TList.Error(SListIndexError, I); + Result := FInstanceList[I]; + end; + function TJvInspDataReg.Add(Instance: TJvCustomInspectorData): TJvCustomInspectorData; var *************** *** 1917,1921 **** var DataRegister: TJvInspDataReg; ! function TJvCustomInspector.CalcImageHeight: Integer; var --- 1927,1933 ---- var DataRegister: TJvInspDataReg; ! ! //=== TJvCustomInspector ===================================================== ! function TJvCustomInspector.CalcImageHeight: Integer; var *************** *** 1992,1997 **** end; ! function TJvCustomInspector.CalcItemRect( ! const Item: TJvCustomInspectorItem): TRect; begin Result := Item.Rects[iprItem]; --- 2004,2008 ---- end; ! function TJvCustomInspector.CalcItemRect(const Item: TJvCustomInspectorItem): TRect; begin Result := Item.Rects[iprItem]; *************** *** 3263,3266 **** --- 3274,3286 ---- end; + //=== TJvInspectorPainter ==================================================== + + destructor TJvInspectorPainter.Destroy; + begin + FInternalCollapseButton.Free; + FInternalExpandButton.Free; + inherited Destroy; + end; + procedure TJvInspectorPainter.ApplyNameFont; begin *************** *** 3693,3703 **** end; - destructor TJvInspectorPainter.Destroy; - begin - FInternalCollapseButton.Free; - FInternalExpandButton.Free; - inherited Destroy; - end; - procedure TJvInspectorPainter.SetInspector(const AInspector: TJvCustomInspector); begin --- 3713,3716 ---- *************** *** 3712,3715 **** --- 3725,3730 ---- end; + //=== TJvInspectorBorlandNETBasePainter ====================================== + procedure TJvInspectorBorlandNETBasePainter.ApplyNameFont; begin *************** *** 3874,3877 **** --- 3889,3894 ---- end; + //=== TJvInspectorBorlandPainter ============================================= + function TJvInspectorBorlandPainter.DividerWidth: Integer; begin *************** *** 3974,3977 **** --- 3991,3996 ---- end; + //=== TJvInspectorDotNETPainter ============================================== + procedure TJvInspectorDotNETPainter.ApplyNameFont; begin *************** *** 4082,4085 **** --- 4101,4106 ---- end; + //=== TJvInspectorItemSizing ================================================= + function TJvInspectorItemSizing.GetMinHeight: TItemRowSizing; begin *************** *** 4201,4204 **** --- 4222,4227 ---- end; + //=== TJvCustomInspectorItem ================================================= + procedure TJvCustomInspectorItem.AlphaSort; var *************** *** 5721,5724 **** --- 5744,5749 ---- end; + //=== TJvInspectorCustomCategoryItem ========================================= + procedure TJvInspectorCustomCategoryItem.SetFlags(const Value: TInspectorItemFlags); var *************** *** 5731,5734 **** --- 5756,5774 ---- end; + //=== TJvInspectorCompoundColumn ============================================= + + constructor TJvInspectorCompoundColumn.Create(const AParent: TJvInspectorCustomCompoundItem; + const AItem: TJvCustomInspectorItem); + begin + inherited Create; + FParent := AParent; + Item := AItem; + end; + + destructor TJvInspectorCompoundColumn.Destroy; + begin + inherited Destroy; + end; + function TJvInspectorCompoundColumn.GetItem: TJvCustomInspectorItem; begin *************** *** 5787,5803 **** end; - constructor TJvInspectorCompoundColumn.Create(const AParent: TJvInspectorCustomCompoundItem; - const AItem: TJvCustomInspectorItem); - begin - inherited Create; - FParent := AParent; - Item := AItem; - end; - - destructor TJvInspectorCompoundColumn.Destroy; - begin - inherited Destroy; - end; - procedure TJvInspectorCompoundColumn.BeforeDestruction; begin --- 5827,5830 ---- *************** *** 5806,5809 **** --- 5833,5838 ---- end; + //=== TJvInspectorCustomCompoundItem ========================================= + function TJvInspectorCustomCompoundItem.AddColumnPrim(const Item: TJvCustomInspectorItem): Integer; begin *************** *** 6284,6287 **** --- 6313,6318 ---- end; + //=== TJvInspectorCompoundItem =============================================== + function TJvInspectorCompoundItem.AddColumn(const Item: TJvCustomInspectorItem): Integer; begin *************** *** 6329,6332 **** --- 6360,6365 ---- end; + //=== TJvInspectorIntegerItem ================================================ + function TJvInspectorIntegerItem.GetDisplayValue: string; begin *************** *** 6345,6348 **** --- 6378,6383 ---- end; + //=== TJvInspectorEnumItem =================================================== + function TJvInspectorEnumItem.GetDisplayValue: string; begin *************** *** 6381,6384 **** --- 6416,6421 ---- end; + //=== TJvInspectorFloatItem ================================================== + function TJvInspectorFloatItem.GetDisplayValue: string; begin *************** *** 6391,6394 **** --- 6428,6433 ---- end; + //=== TJvInspectorSetMemberData ============================================== + function TJvInspectorSetMemberData.GetAsFloat: Extended; begin *************** *** 6523,6526 **** --- 6562,6574 ---- end; + //=== TJvInspectorSetItem ==================================================== + + constructor TJvInspectorSetItem.Create(const AParent: TJvCustomInspectorItem; + const AData: TJvCustomInspectorData); + begin + inherited Create(AParent, AData); + ItemSetFlags := [isfCreateMemberItems]; + end; + function TJvInspectorSetItem.CanEdit: Boolean; begin *************** *** 6646,6655 **** end; ! constructor TJvInspectorSetItem.Create(const AParent: TJvCustomInspectorItem; ! const AData: TJvCustomInspectorData); ! begin ! inherited Create(AParent, AData); ! ItemSetFlags := [isfCreateMemberItems]; ! end; function TJvInspectorCharItem.GetDisplayValue: string; --- 6694,6698 ---- end; ! //=== TJvInspectorCharItem =================================================== function TJvInspectorCharItem.GetDisplayValue: string; *************** *** 6678,6681 **** --- 6721,6726 ---- end; + //=== TJvInspectorInt64Item ================================================== + function TJvInspectorInt64Item.GetDisplayValue: string; begin *************** *** 6688,6691 **** --- 6733,6738 ---- end; + //=== TJvInspectorStringItem ================================================= + function TJvInspectorStringItem.GetDisplayValue: string; begin *************** *** 6698,6701 **** --- 6745,6766 ---- end; + //=== TJvInspectorClassItem ================================================== + + constructor TJvInspectorClassItem.Create(const AParent: TJvCustomInspectorItem; + const AData: TJvCustomInspectorData); + begin + inherited Create(AParent, AData); + if GetTypeData(Data.TypeInfo).ClassType.InheritsFrom(Classes.TComponent) then + begin + ItemClassFlags := [icfCreateMemberItems]; + Flags := Flags + [iifValueList]; + end + else + if GetTypeData(Data.TypeInfo).ClassType.InheritsFrom(TPersistent) then + ItemClassFlags := [icfCreateMemberItems, icfShowClassName] + else + ItemClassFlags := [icfShowClassName]; + end; + procedure TJvInspectorClassItem.CreateMembers; begin *************** *** 6856,6874 **** end; ! constructor TJvInspectorClassItem.Create(const AParent: TJvCustomInspectorItem; ! const AData: TJvCustomInspectorData); ! begin ! inherited Create(AParent, AData); ! if GetTypeData(Data.TypeInfo).ClassType.InheritsFrom(Classes.TComponent) then ! begin ! ItemClassFlags := [icfCreateMemberItems]; ! Flags := Flags + [iifValueList]; ! end ! else ! if GetTypeData(Data.TypeInfo).ClassType.InheritsFrom(TPersistent) then ! ItemClassFlags := [icfCreateMemberItems, icfShowClassName] ! else ! ItemClassFlags := [icfShowClassName]; ! end; function TJvInspectorComponentItem.GetItemComponentFlags: TInspectorComponentFlags; --- 6921,6925 ---- end; ! //=== TJvInspectorComponentItem ============================================== function TJvInspectorComponentItem.GetItemComponentFlags: TInspectorComponentFlags; *************** *** 7078,7081 **** --- 7129,7134 ---- end; + //=== TJvInspectorFontItem =================================================== + procedure TJvInspectorFontItem.Edit; begin *************** *** 7103,7106 **** --- 7156,7161 ---- end; + //=== TJvInspectorFontNameItem =============================================== + procedure TJvInspectorFontNameItem.DoDrawListItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState); *************** *** 7155,7158 **** --- 7210,7215 ---- end; + //=== TJvInspectorBooleanItem ================================================ + function TJvInspectorBooleanItem.GetShowAsCheckbox: Boolean; begin *************** *** 7300,7303 **** --- 7357,7369 ---- end; + //=== TJvInspectorDateItem =================================================== + + constructor TJvInspectorDateItem.Create(const AParent: TJvCustomInspectorItem; + const AData: TJvCustomInspectorData); + begin + inherited Create(AParent, AData); + FFormat := ShortDateFormat; + end; + function TJvInspectorDateItem.GetDisplayValue: string; begin *************** *** 7395,7403 **** end; ! constructor TJvInspectorDateItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); begin inherited Create(AParent, AData); ! FFormat := ShortDateFormat; end; --- 7461,7473 ---- end; ! //=== TJvInspectorTimeItem =================================================== ! ! constructor TJvInspectorTimeItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); begin inherited Create(AParent, AData); ! FShowSeconds := True; ! FShowAMPM := False; ! SetFormat; end; *************** *** 7454,7464 **** end; ! constructor TJvInspectorTimeItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); begin inherited Create(AParent, AData); ! FShowSeconds := True; ! FShowAMPM := False; ! SetFormat; end; --- 7524,7538 ---- end; ! //=== TJvInspectorDateTimeItem =============================================== ! ! constructor TJvInspectorDateTimeItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); begin inherited Create(AParent, AData); ! SingleNameUseFirstCol := True; ! FDate := TJvInspectorDateItem.Create(Self, AData); ! FTime := TJvInspectorTimeItem.Create(Self, AData); ! AddColumnPrim(FDate); ! AddColumnPrim(FTime); end; *************** *** 7493,7530 **** end; ! constructor TJvInspectorDateTimeItem.Create(const AParent: TJvCustomInspectorItem; ! const AData: TJvCustomInspectorData); ! begin ! inherited Create(AParent, AData); ! SingleNameUseFirstCol := True; ! FDate := TJvInspectorDateItem.Create(Self, AData); ! FTime := TJvInspectorTimeItem.Create(Self, AData); ! AddColumnPrim(FDate); ! AddColumnPrim(FTime); ! end; ! ! procedure TJvInspectorTStringsItem.ContentsChanged(Sender: TObject); ! var ! Obj: TStrings; ! begin ! Obj := TStrings(Data.AsOrdinal); ! Obj.Text := TMemo(Sender).Lines.Text; ! end; ! ! function TJvInspectorTStringsItem.GetDisplayValue: string; ! var ! Obj: TObject; ! begin ! Obj := TObject(Data.AsOrdinal); ! if not Multiline then ! begin ! if Obj <> nil then ! Result := Result + '('+ Obj.ClassName + ')' ! else ! Result := Result + '(' + GetTypeData(Data.TypeInfo).ClassType.ClassName + ')'; ! end ! else ! Result := TStrings(Obj).Text ! end; type --- 7567,7571 ---- end; ! //=== TSLEditorForm ========================================================== type *************** *** 7608,7611 **** --- 7649,7685 ---- end; + //=== TJvInspectorTStringsItem =============================================== + + constructor TJvInspectorTStringsItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); + begin + inherited Create(AParent, AData); + RowSizing.MinHeight := irsItemHeight; + Flags := Flags + [iifEditButton]; + end; + + procedure TJvInspectorTStringsItem.ContentsChanged(Sender: TObject); + var + Obj: TStrings; + begin + Obj := TStrings(Data.AsOrdinal); + Obj.Text := TMemo(Sender).Lines.Text; + end; + + function TJvInspectorTStringsItem.GetDisplayValue: string; + var + Obj: TObject; + begin + Obj := TObject(Data.AsOrdinal); + if not Multiline then + begin + if Obj <> nil then + Result := Result + '('+ Obj.ClassName + ')' + else + Result := Result + '(' + GetTypeData(Data.TypeInfo).ClassType.ClassName + ')'; + end + else + Result := TStrings(Obj).Text + end; + procedure TJvInspectorTStringsItem.Edit; var *************** *** 7667,7676 **** end; ! constructor TJvInspectorTStringsItem.Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); ! begin ! inherited Create(AParent, AData); ! RowSizing.MinHeight := irsItemHeight; ! Flags := Flags + [iifEditButton]; ! end; type --- 7741,7745 ---- end; ! //=== TInstanceItem ========================================================== type *************** *** 7767,7770 **** --- 7836,7841 ---- end; + //=== TJvInspectorTMethodItem ================================================ + function TJvInspectorTMethodItem.GetInstanceCount: Integer; begin *************** *** 8313,8316 **** --- 8384,8389 ---- end; + //=== TJvCustomInspectorData ================================================= + constructor TJvCustomInspectorData.CreatePrim(const AName: string; const ATypeInfo: PTypeInfo); *************** *** 8538,8541 **** --- 8611,8616 ---- end; + //=== TJvInspectorVarData ==================================================== + function TJvInspectorVarData.GetAddress: Pointer; begin *************** *** 8876,8879 **** --- 8951,8956 ---- end; + //=== TJvInspectorPropData =================================================== + function TJvInspectorPropData.GetAsFloat: Extended; begin *************** *** 9166,9169 **** --- 9243,9248 ---- end; + //=== TJvInspectorEventData ================================================== + function TJvInspectorEventData.DoGetAsFloat: Extended; begin *************** *** 9642,9645 **** --- 9721,9726 ---- end; + //=== TJvInspectorCustomConfData ============================================= + constructor TJvInspectorCustomConfData.CreatePrim(const AName, ASection, AKey: string; const ATypeInfo: PTypeInfo); *************** *** 9860,9863 **** --- 9941,9946 ---- end; + //=== TJvInspectorINIFileData ================================================ + function TJvInspectorINIFileData.ExistingValue: Boolean; begin *************** *** 9982,9985 **** --- 10065,10070 ---- end; + //=== TJvInspectorRegister =================================================== + function TJvInspectorRegister.Compare(const ADataObj: TJvCust... [truncated message content] |