[JVCL-Checkins] CVS: dev/JVCL3/run JvGrids.pas,1.6,1.7 JvInspector.pas,1.28,1.29 - style cleaning

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

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

Modified Files:
	JvGrids.pas JvInspector.pas 
Log Message:
style cleaning

Index: JvGrids.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGrids.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvGrids.pas	5 Nov 2003 13:33:54 -0000	1.6
--- JvGrids.pas	30 Nov 2003 14:53:25 -0000	1.7
***************
*** 264,268 ****
    end;
  
!   TJvPopupListBox = class(TCustomListbox)
    private
      FSearchText: string;
--- 264,268 ----
    end;
  
!   TJvPopupListBox = class(TCustomListBox)
    private
      FSearchText: string;
***************
*** 275,279 ****
    end;
  
!   //=== TJvPopupListBox ========================================================
  
  procedure TJvPopupListBox.CreateParams(var Params: TCreateParams);
--- 275,279 ----
    end;
  
! //=== TJvPopupListBox ========================================================
  
  procedure TJvPopupListBox.CreateParams(var Params: TCreateParams);

Index: JvInspector.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInspector.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** JvInspector.pas	30 Nov 2003 13:51:46 -0000	1.28
--- JvInspector.pas	30 Nov 2003 14:53:25 -0000	1.29
***************
*** 123,126 ****
--- 123,127 ----
      ScrollCode: Integer;
    end;
+ 
    TCMActivate = packed record
      Msg: Integer;
***************
*** 213,217 ****
    {$ELSE}
    TJvCustomInspector = class(TCustomPanel)
!   {$ENDIF}
    private
      FAfterDataCreate: TInspectorDataEvent;
--- 214,218 ----
    {$ELSE}
    TJvCustomInspector = class(TCustomPanel)
!   {$ENDIF VCL} 
    private
      FAfterDataCreate: TInspectorDataEvent;
***************
*** 262,268 ****
      FOnMouseDown: TOnJvInspectorMouseDown;
      FInspectObject: TObject;
- 
      procedure SetInspectObject(const Value: TObject);
- 
      //    FOnMouseDown: TInspectorMouseDownEvent;
      {$IFDEF VisualCLX}
--- 263,267 ----
***************
*** 271,275 ****
      function ClientWidth: Integer;
      function ClientHeight: Integer;
!     {$ENDIF}
    protected
      function CalcImageHeight: Integer; virtual;
--- 270,274 ----
      function ClientWidth: Integer;
      function ClientHeight: Integer;
!     {$ENDIF VisualCLX}
    protected
      function CalcImageHeight: Integer; virtual;
***************
*** 425,433 ****
      function VisibleIndex(const AItem: TJvCustomInspectorItem): Integer; virtual;
      procedure RefreshValues;
- 
      (* some easier to use methods added by WAP *)
      procedure AddComponent(const AComponent: TComponent; DisplayName: string; Expanded: Boolean);
      procedure Clear;
- 
    published
      { Standard TCustomControl events - these are really events fired by
--- 424,430 ----
***************
*** 439,443 ****
      property OnKeyUp: TKeyEvent read FOnKeyUp write FOnKeyUp;
      property OnMouseDown: TOnJvInspectorMouseDown read FOnMouseDown write FOnMouseDown;
- 
    end;
  
--- 436,439 ----
***************
*** 641,645 ****
      property Sizable: Boolean read GetSizable write SetSizable;
      property SizingFactor: TItemRowSizing read GetSizingFactor write SetSizingFactor;
-   published
    end;
  
--- 637,640 ----
***************
*** 649,653 ****
      FDisplayIndex: Integer;
      FDisplayName: string;
- 
      FDroppedDown: Boolean;
      FEditCtrl: TCustomEdit;
--- 644,647 ----
***************
*** 665,672 ****
      FLastPaintGen: Integer;
      FPressed: Boolean;
!     FRects: array[TInspectorPaintRect] of TRect;
      FRowSizing: TJvInspectorItemSizing;
      FSortKind: TInspectorItemSortKind;
      FTracking: Boolean;
    protected
      function GetName: string; virtual; // NEW: Warren added.
--- 659,667 ----
      FLastPaintGen: Integer;
      FPressed: Boolean;
!     FRects: array [TInspectorPaintRect] of TRect;
      FRowSizing: TJvInspectorItemSizing;
      FSortKind: TInspectorItemSortKind;
      FTracking: Boolean;
+     FUserData: Pointer;
    protected
      function GetName: string; virtual; // NEW: Warren added.
***************
*** 717,723 ****
      function GetDisplayIndex: Integer; virtual;
      function GetDisplayName: string; virtual; // NOTE THIS USES DISPLAY NAME PROPERTIES TO BUILD ITS RESULT
- 
      function GetFullName: string; // NOTE THIS USES THE INTERNAL NAME properties to build its result.
- 
      function GetDisplayParent: TJvCustomInspectorItem; virtual;
      function GetDisplayValue: string; virtual;
--- 712,716 ----
***************
*** 800,807 ****
      property Pressed: Boolean read FPressed write FPressed;
      property Tracking: Boolean read FTracking write FTracking;
- 
    public
-     UserData: Pointer; // new: End user data pointer. WAP
- 
      constructor Create(const AParent: TJvCustomInspectorItem; const AData: TJvCustomInspectorData); virtual;
      destructor Destroy; override;
--- 793,797 ----
***************
*** 824,840 ****
      procedure ScrollInView;
      procedure Sort;
      property AutoUpdate: Boolean read GetAutoUpdate write SetAutoUpdate;
      property Count: Integer read GetCount;
      property Data: TJvCustomInspectorData read GetData;
      property DisplayIndex: Integer read GetDisplayIndex write SetDisplayIndex;
-     property Name: string read GetName; // WAP.Aug2003
- 
      property DisplayName: string read GetDisplayName write SetDisplayName;
      property FullName: string read GetFullName;
      property DisplayValue: string read GetDisplayValue write SetDisplayValue;
      property Editing: Boolean read GetEditing;
- 
-     function GetEditorText: string;
- 
      property Expanded: Boolean read GetExpanded write SetExpanded;
      property Flags: TInspectorItemFlags read GetFlags write SetFlags;
--- 814,826 ----
      procedure ScrollInView;
      procedure Sort;
+     function GetEditorText: string;
      property AutoUpdate: Boolean read GetAutoUpdate write SetAutoUpdate;
      property Count: Integer read GetCount;
      property Data: TJvCustomInspectorData read GetData;
      property DisplayIndex: Integer read GetDisplayIndex write SetDisplayIndex;
      property DisplayName: string read GetDisplayName write SetDisplayName;
      property FullName: string read GetFullName;
      property DisplayValue: string read GetDisplayValue write SetDisplayValue;
      property Editing: Boolean read GetEditing;
      property Expanded: Boolean read GetExpanded write SetExpanded;
      property Flags: TInspectorItemFlags read GetFlags write SetFlags;
***************
*** 846,849 ****
--- 832,836 ----
      property Level: Integer read GetLevel;
      property Multiline: Boolean read GetMultiline write SetMultiline;
+     property Name: string read GetName; // WAP.Aug2003
      property Parent: TJvCustomInspectorItem read GetParent;
      property QualifiedNames: Boolean read GetQualifiedNames write SetQualifiedNames;
***************
*** 852,855 ****
--- 839,843 ----
      property RowSizing: TJvInspectorItemSizing read GetRowSizing write SetRowSizing;
      property SortKind: TInspectorItemSortKind read GetSortKind write SetSortKind;
+     property UserData: Pointer read FUserData write FUserData; // new: End user data pointer. WAP
      property Visible: Boolean read GetVisible write SetVisible;
      property OnCompare: TInspectorItemSortCompare read FOnCompare write SetOnCompare;
***************
*** 886,890 ****
      destructor Destroy; override;
      procedure BeforeDestruction; override;
- 
      property Item: TJvCustomInspectorItem read GetItem write SetItem;
      property Width: Integer read GetWidth write SetWidthExternal;
--- 874,877 ----
***************
*** 1062,1069 ****
      constructor Create(const AParent: TJvCustomInspectorItem;
        const AData: TJvCustomInspectorData); override;
!     property CreateMemberItems: Boolean read GetCreateMemberItems
!       write SetCreateMemberItems;
!     property ItemClassFlags: TInspectorClassFlags read GetItemClassFlags
!       write SetItemClassFlags;
      property OnGetValueList;
      property ShowClassName: Boolean read GetShowClassName write SetShowClassName;
--- 1049,1054 ----
      constructor Create(const AParent: TJvCustomInspectorItem;
        const AData: TJvCustomInspectorData); override;
!     property CreateMemberItems: Boolean read GetCreateMemberItems write SetCreateMemberItems;
!     property ItemClassFlags: TInspectorClassFlags read GetItemClassFlags write SetItemClassFlags;
      property OnGetValueList;
      property ShowClassName: Boolean read GetShowClassName write SetShowClassName;
***************
*** 1149,1154 ****
      procedure DrawValue(const ACanvas: TCanvas); override;
      procedure InitEdit; override;
!     property ShowAsCheckbox: Boolean read GetShowAsCheckBox
!       write SetShowAsCheckBox;
    end;
  
--- 1134,1138 ----
      procedure DrawValue(const ACanvas: TCanvas); override;
      procedure InitEdit; override;
!     property ShowAsCheckbox: Boolean read GetShowAsCheckBox write SetShowAsCheckBox;
    end;
  
***************
*** 1408,1412 ****
      // REMOVED BECAUSE OF A BCB INCOMPATIBILITY:
      //    class function New(const AParent: TJvCustomInspectorItem; const AName: string; const ATypeInfo: PTypeInfo; const AVar): TJvCustomInspectorItem; overload;
- 
      procedure SetAsSet(const Buf); override;
      property Address: Pointer read GetAddress write SetAddress;
--- 1392,1395 ----
***************
*** 1550,1554 ****
      function GetAsOrdinal: Int64; override;
      function ForceString: string;
!       // NEW: Display something from an INI section that isn't the type it's supposed to be without exceptions and component failures.
      function GetAsString: string; override;
      function IsEqualReference(const Ref: TJvCustomInspectorData): Boolean; override;
--- 1533,1537 ----
      function GetAsOrdinal: Int64; override;
      function ForceString: string;
!     // NEW: Display something from an INI section that isn't the type it's supposed to be without exceptions and component failures.
      function GetAsString: string; override;
      function IsEqualReference(const Ref: TJvCustomInspectorData): Boolean; override;
***************
*** 1563,1567 ****
    public
      function ReadValue: string; virtual; abstract; // made public to help fix a bug. WAP.
- 
      procedure GetAsSet(var Buf); override;
      function HasValue: Boolean; override;
--- 1546,1549 ----
***************
*** 1679,1683 ****
      FName: string;
      FTypeInfo: PTypeInfo;
-   protected
    public
      constructor Create(const AItemClass: TJvInspectorItemClass; const AObjectClass: TClass;
--- 1661,1664 ----
***************
*** 1706,1710 ****
    QDialogs, QForms, QButtons,
    {$ENDIF VisualCLX}
!   JclRTTI, JclLogic, JvJCLUtils, JvThemes;
  
  type
--- 1687,1692 ----
    QDialogs, QForms, QButtons,
    {$ENDIF VisualCLX}
!   JclRTTI, JclLogic,
!   JvJCLUtils, JvThemes;
  
  type
***************
*** 1719,1723 ****
    FPropItemReg: TJvInspectorRegister;
  
!   //=== TJvPopupListBox ========================================================
  
  {$IFDEF VCL}
--- 1701,1705 ----
    FPropItemReg: TJvInspectorRegister;
  
! //=== TJvPopupListBox ========================================================
  
  {$IFDEF VCL}
***************
*** 1759,1766 ****
    TickCount: Integer;
  begin
!   case Key of
!     #8, #27:
        FSearchText := '';
!     #32..#255:
        begin
          TickCount := GetTickCount;
--- 1741,1748 ----
    TickCount: Integer;
  begin
!   case Word(Key) of
!     VK_BACK, VK_ESCAPE:
        FSearchText := '';
!     32..255:
        begin
          TickCount := GetTickCount;
***************
*** 3467,3471 ****
  {$ELSE}
  procedure TJvCustomInspector.DoEnter;
! {$ENDIF}
  begin
    inherited;
--- 3449,3453 ----
  {$ELSE}
  procedure TJvCustomInspector.DoEnter;
! {$ENDIF VCL}
  begin
    inherited;
***************
*** 4745,4751 ****
    I: Integer;
    Item: TJvCustomInspectorItem;
! {$IFNDEF COMPILER6_UP}
    J: Integer;
! {$ENDIF}
  begin
    TempList := TList.Create;
--- 4727,4733 ----
    I: Integer;
    Item: TJvCustomInspectorItem;
!   {$IFNDEF COMPILER6_UP}
    J: Integer;
!   {$ENDIF COMPILER6_UP}
  begin
    TempList := TList.Create;
***************
*** 4762,4772 ****
        begin
          Item.BuildDisplayableList(TempList);
! {$IFNDEF COMPILER6_UP}
          for J := 0 to TempList.Count - 1 do
            if ItemList.IndexOf(TempList[J]) = -1 then
              ItemList.Add(TempList[J]);
! {$ELSE}
!         ItemList.Assign(TempList, laOr);
! {$ENDIF}
          TempList.Clear;
        end;
--- 4744,4754 ----
        begin
          Item.BuildDisplayableList(TempList);
!         {$IFDEF COMPILER6_UP}
!         ItemList.Assign(TempList, laOr);
!         {$ELSE}
          for J := 0 to TempList.Count - 1 do
            if ItemList.IndexOf(TempList[J]) = -1 then
              ItemList.Add(TempList[J]);
!         {$ENDIF COMPILER6_UP}
          TempList.Clear;
        end;