[JVCL-Checkins] CVS: rm/source JvPerfMon95.pas,1.2,1.3 JvPerforated.pas,1.1,1.2 JvPgMngrEd.dfm,1.1,1.2 JvPgMngrEd.pas,1.1,1.2 JvPicclip.pas,1.1,1.2 JvPictEdit.dfm,1.1,1.2 JvPictEdit.pas,1.1,1.2 JvPlacemnt.pas,1.1,1.2 JvPlaylist.pas,1.1,1.2 JvPlugCommon.pas,1.1,1.2 JvPlugin.pas,1.1,1.2 JvPluginMan.pas,1.3,1.4

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

Update of /cvsroot/jvcl/rm/source
In directory sc8-pr-cvs1:/tmp/cvs-serv24957/source

Modified Files:
	JvPerfMon95.pas JvPerforated.pas JvPgMngrEd.dfm JvPgMngrEd.pas 
	JvPicclip.pas JvPictEdit.dfm JvPictEdit.pas JvPlacemnt.pas 
	JvPlaylist.pas JvPlugCommon.pas JvPlugin.pas JvPluginMan.pas 
Log Message:
cleaned

Index: JvPerfMon95.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPerfMon95.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JvPerfMon95.pas	2 Feb 2003 18:44:45 -0000	1.2
--- JvPerfMon95.pas	9 Feb 2003 15:54:18 -0000	1.3
***************
*** 271,275 ****
  var
    Size: Integer;
!   Value: LongWord;
    CurrentTickCount: DWORD;
  begin
--- 271,275 ----
  var
    Size: Integer;
!   Value: Longword;
    CurrentTickCount: DWORD;
  begin

Index: JvPerforated.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPerforated.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPerforated.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPerforated.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 29,38 ****
  unit JvPerforated;
  
- 
- 
  interface
  
  uses
!   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, JvComponent;
  
  type
--- 29,37 ----
  unit JvPerforated;
  
  interface
  
  uses
!   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
!   JvComponent;
  
  type
***************
*** 65,73 ****
    JvWndProcHook;
  
- {*******************************************************}
- 
  constructor TJvPerforated.Create(AOwner: TComponent);
  begin
!   inherited;
    FTransparent := False;
    FForm := GetParentForm(TControl(AOwner));
--- 64,70 ----
    JvWndProcHook;
  
  constructor TJvPerforated.Create(AOwner: TComponent);
  begin
!   inherited Create(AOwner);
    FTransparent := False;
    FForm := GetParentForm(TControl(AOwner));
***************
*** 85,90 ****
  end;
  
- {*******************************************************}
- 
  destructor TJvPerforated.Destroy;
  begin
--- 82,85 ----
***************
*** 94,110 ****
      UnRegisterWndProcHook(FForm, FormPosSizeChange, hoAfterMsg);
    end;
!   inherited;
  end;
  
- {*******************************************************}
- 
  procedure TJvPerforated.Resize;
  begin
!   inherited;
    SetTransparent(FTransparent);
  end;
  
- {*******************************************************}
- 
  procedure TJvPerforated.WMMove(var Msg: TWMMove);
  begin
--- 89,101 ----
      UnRegisterWndProcHook(FForm, FormPosSizeChange, hoAfterMsg);
    end;
!   inherited Destroy;
  end;
  
  procedure TJvPerforated.Resize;
  begin
!   inherited Resize;
    SetTransparent(FTransparent);
  end;
  
  procedure TJvPerforated.WMMove(var Msg: TWMMove);
  begin
***************
*** 113,127 ****
  end;
  
- {*******************************************************}
- 
  function TJvPerforated.FormPosSizeChange(var Msg: TMessage): Boolean;
  begin
    if (Msg.Msg = WM_MOVE) or (Msg.Msg = WM_SIZE) then
      SetTransparent(FTransparent);
!   Result := false;
  end;
  
- {*******************************************************}
- 
  procedure TJvPerforated.SetTransparent(Value: Boolean);
  var
--- 104,114 ----
  end;
  
  function TJvPerforated.FormPosSizeChange(var Msg: TMessage): Boolean;
  begin
    if (Msg.Msg = WM_MOVE) or (Msg.Msg = WM_SIZE) then
      SetTransparent(FTransparent);
!   Result := False;
  end;
  
  procedure TJvPerforated.SetTransparent(Value: Boolean);
  var
***************
*** 157,158 ****
--- 144,146 ----
  
  end.
+ 

Index: JvPgMngrEd.dfm
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPgMngrEd.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPgMngrEd.dfm	9 Jan 2003 13:36:08 -0000	1.1
--- JvPgMngrEd.dfm	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
    Width = 514
    Height = 331
+   BorderIcons = [biSystemMenu]
    Caption = 'Page Proxy Editor'
    Color = clBtnFace
***************
*** 10,14 ****
    Font.Height = -11
    Font.Name = 'MS Sans Serif'
!   Font.Style = [fsBold]
    Icon.Data = {
      0000010001002020100000000000E80200001600000028000000200000004000
--- 11,15 ----
    Font.Height = -11
    Font.Name = 'MS Sans Serif'
!   Font.Style = []
    Icon.Data = {
      0000010001002020100000000000E80200001600000028000000200000004000
***************
*** 47,54 ****
      Top = 0
      Width = 97
!     Height = 304
      Align = alRight
      BevelOuter = bvNone
      TabOrder = 0
      object CloseBtn: TButton
        Left = 11
--- 48,58 ----
      Top = 0
      Width = 97
!     Height = 301
      Align = alRight
      BevelOuter = bvNone
      TabOrder = 0
+     DesignSize = (
+       97
+       301)
      object CloseBtn: TButton
        Left = 11
***************
*** 56,59 ****
--- 60,64 ----
        Width = 77
        Height = 25
+       Anchors = [akTop, akRight]
        Caption = 'Close'
        TabOrder = 0
***************
*** 65,68 ****
--- 70,74 ----
        Width = 77
        Height = 25
+       Anchors = [akTop, akRight]
        Caption = 'Delete'
        TabOrder = 1
***************
*** 74,78 ****
      Top = 0
      Width = 409
!     Height = 304
      Align = alClient
      ColCount = 2
--- 80,84 ----
      Top = 0
      Width = 409
!     Height = 301
      Align = alClient
      ColCount = 2

Index: JvPgMngrEd.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPgMngrEd.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPgMngrEd.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPgMngrEd.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 26,30 ****
  {$I JVCL.INC}
  
- 
  unit JvPgMngrEd;
  
--- 26,29 ----
***************
*** 32,48 ****
  
  uses
! {$IFDEF WIN32}
    Windows,
! {$ELSE}
    WinTypes, WinProcs,
! {$ENDIF}
    SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs, Grids,
! {$IFDEF COMPILER6_UP}
!     RTLConsts, DesignIntf, DesignEditors,  VCLEditors, DesignWindows,
! {$ELSE}
    LibIntf, DsgnIntf, DsgnWnds,
! {$ENDIF}
!   JvPageMngr, StdCtrls, JvPlacemnt, ExtCtrls,
!   JvVCLUtils;
  
  type
--- 31,47 ----
  
  uses
!   {$IFDEF WIN32}
    Windows,
!   {$ELSE}
    WinTypes, WinProcs,
!   {$ENDIF}
    SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs, Grids,
!   {$IFDEF COMPILER6_UP}
!   RTLConsts, DesignIntf, DesignEditors, VCLEditors, DesignWindows,
!   {$ELSE}
    LibIntf, DsgnIntf, DsgnWnds,
!   {$ENDIF}
!   StdCtrls, ExtCtrls,
!   JvPageMngr, JvPlacemnt, JvVCLUtils;
  
  type
***************
*** 76,108 ****
    public
      procedure NameProxy(Sender: TObject);
! {$IFDEF COMPILER6_UP}
      procedure ItemsModified(const Designer: IDesigner); override;
      procedure DesignerClosed(const ADesigner: IDesigner; AGoingDormant: Boolean); override;
! {$ELSE}
      procedure FormModified; override;
! {$IFDEF COMPILER3_UP}
      procedure FormClosed(Form: TCustomForm); override;
! {$ELSE}
      procedure FormClosed(Form: TForm); override;
! {$ENDIF}
! {$ENDIF}
      function GetEditState: TEditState; override;
! {$IFDEF COMPILER6_UP}
      procedure ItemDeleted(const ADesigner: IDesigner; Item: TPersistent); override;
! {$ELSE}
! {$IFDEF COMPILER4_UP}
      procedure ComponentDeleted(Component: IPersistent); override;
! {$ELSE}
      procedure ComponentDeleted(Component: TComponent); override;
! {$ENDIF}
! {$ENDIF}
! 
! 
      property PageManager: TJvPageManager read FPageManager write SeTJvPageManager;
      property OwnerForm: TCustomForm read GetForm;
    end;
  
- { TJvProxyListProperty }
- 
    TJvProxyListProperty = class(TPropertyEditor)
      function GetAttributes: TPropertyAttributes; override;
--- 75,103 ----
    public
      procedure NameProxy(Sender: TObject);
!     {$IFDEF COMPILER6_UP}
      procedure ItemsModified(const Designer: IDesigner); override;
      procedure DesignerClosed(const ADesigner: IDesigner; AGoingDormant: Boolean); override;
!     {$ELSE}
      procedure FormModified; override;
!     {$IFDEF COMPILER3_UP}
      procedure FormClosed(Form: TCustomForm); override;
!     {$ELSE}
      procedure FormClosed(Form: TForm); override;
!     {$ENDIF}
!     {$ENDIF}
      function GetEditState: TEditState; override;
!     {$IFDEF COMPILER6_UP}
      procedure ItemDeleted(const ADesigner: IDesigner; Item: TPersistent); override;
!     {$ELSE}
!     {$IFDEF COMPILER4_UP}
      procedure ComponentDeleted(Component: IPersistent); override;
!     {$ELSE}
      procedure ComponentDeleted(Component: TComponent); override;
!     {$ENDIF}
!     {$ENDIF}
      property PageManager: TJvPageManager read FPageManager write SeTJvPageManager;
      property OwnerForm: TCustomForm read GetForm;
    end;
  
    TJvProxyListProperty = class(TPropertyEditor)
      function GetAttributes: TPropertyAttributes; override;
***************
*** 111,116 ****
    end;
  
- { TJvPageManagerEditor }
- 
    TJvPageManagerEditor = class(TComponentEditor)
      procedure ExecuteVerb(Index: Integer); override;
--- 106,109 ----
***************
*** 119,124 ****
    end;
  
- { TJvPageNameProperty }
- 
    TJvPageNameProperty = class(TStringProperty)
      function GetAttributes: TPropertyAttributes; override;
--- 112,115 ----
***************
*** 126,131 ****
    end;
  
- { TJvPageBtnProperty }
- 
    TJvPageBtnProperty = class(TComponentProperty)
      procedure GetValues(Proc: TGetStrProc); override;
--- 117,120 ----
***************
*** 134,143 ****
  implementation
  
! uses Consts, Buttons, JvxCtrls, JvConst, JvxConst, JvDsgn;
  
  {$R *.DFM}
  
  {$IFDEF WIN32}
!  {$D-}
  {$ENDIF}
  
--- 123,134 ----
  implementation
  
! uses
!   Consts, Buttons,
!   JvxCtrls, JvConst, JvxConst, JvDsgn;
  
  {$R *.DFM}
  
  {$IFDEF WIN32}
! {$D-}
  {$ENDIF}
  
***************
*** 154,158 ****
  {$ENDIF}
  
- 
  function FindEditor(Manager: TJvPageManager): TJvProxyEditor;
  var
--- 145,148 ----
***************
*** 160,165 ****
  begin
    Result := nil;
!   for I := 0 to Screen.FormCount - 1 do begin
!     if Screen.Forms[I] is TJvProxyEditor then begin
        if TJvProxyEditor(Screen.Forms[I]).PageManager = Manager then
        begin
--- 150,155 ----
  begin
    Result := nil;
!   for I := 0 to Screen.FormCount - 1 do
!     if Screen.Forms[I] is TJvProxyEditor then
        if TJvProxyEditor(Screen.Forms[I]).PageManager = Manager then
        begin
***************
*** 167,172 ****
          Break;
        end;
-     end;
-   end;
  end;
  
--- 157,160 ----
***************
*** 175,185 ****
    Editor: TJvProxyEditor;
  begin
!   if Manager = nil then Exit;
    Editor := FindEditor(Manager);
!   if Editor <> nil then begin
      Editor.Show;
!     if Editor.WindowState = wsMinimized then Editor.WindowState := wsNormal;
    end
!   else begin
      Editor := TJvProxyEditor.Create(Application);
      try
--- 163,177 ----
    Editor: TJvProxyEditor;
  begin
!   if Manager = nil then
!     Exit;
    Editor := FindEditor(Manager);
!   if Editor <> nil then
!   begin
      Editor.Show;
!     if Editor.WindowState = wsMinimized then
!       Editor.WindowState := wsNormal;
    end
!   else
!   begin
      Editor := TJvProxyEditor.Create(Application);
      try
***************
*** 194,199 ****
  end;
  
- { TJvProxyListProperty }
- 
  function TJvProxyListProperty.GetAttributes: TPropertyAttributes;
  begin
--- 186,189 ----
***************
*** 208,212 ****
    if (List = nil) or (List.Count = 0) then
      Result := ResStr(srNone)
!   else FmtStr(Result, '(%s)', [GetPropType^.Name]);
  end;
  
--- 198,203 ----
    if (List = nil) or (List.Count = 0) then
      Result := ResStr(srNone)
!   else
!     FmtStr(Result, '(%s)', [GetPropType^.Name]);
  end;
  
***************
*** 216,221 ****
  end;
  
- { TJvPageBtnProperty }
- 
  procedure TJvPageBtnProperty.GetValues(Proc: TGetStrProc);
  var
--- 207,210 ----
***************
*** 223,238 ****
    Component: TComponent;
  begin
!   for I := 0 to Designer.{$IFDEF COMPILER6_UP}Root{$ELSE}Form{$ENDIF}.ComponentCount - 1 do begin
!     Component := Designer.{$IFDEF COMPILER6_UP}Root{$ELSE}Form{$ENDIF}.Components[I];
  
!     if (Component.InheritsFrom(TButtonControl) or 
!       Component.InheritsFrom(TSpeedButton) or 
!       Component.InheritsFrom(TJvxSpeedButton)) and 
!       (Component.Name <> '') then Proc(Component.Name);
    end;
  end;
  
- { TJvPageNameProperty }
- 
  function TJvPageNameProperty.GetAttributes: TPropertyAttributes;
  begin
--- 212,235 ----
    Component: TComponent;
  begin
!   {$IFDEF COMPILER6_UP}
!   for I := 0 to Designer.Root.ComponentCount - 1 do
!   {$ELSE}
!   for I := 0 to Designer.Form.ComponentCount - 1 do
!   {$ENDIF}
!   begin
!     {$IFDEF COMPILER6_UP}
!     Component := Designer.Root.Components[I];
!     {$ELSE}
!     Component := Designer.Form.Components[I];
!     {$ENDIF}
  
!     if (Component.InheritsFrom(TButtonControl) or
!       Component.InheritsFrom(TSpeedButton) or
!       Component.InheritsFrom(TJvxSpeedButton)) and
!       (Component.Name <> '') then
!       Proc(Component.Name);
    end;
  end;
  
  function TJvPageNameProperty.GetAttributes: TPropertyAttributes;
  begin
***************
*** 248,264 ****
    if (PageProxy <> nil) and (PageProxy.PageManager <> nil) and
      (PageProxy.PageManager.PageOwner <> nil) then
!   begin
!     for I := 0 to PageProxy.PageManager.PageCount - 1 do begin
        Proc(PageProxy.PageManager.PageNames[I]);
-     end;
-   end;
  end;
  
- { TJvPageManagerEditor }
- 
  procedure TJvPageManagerEditor.ExecuteVerb(Index: Integer);
  begin
    case Index of
!     0: ShowProxyEditor(Designer, TJvPageManager(Component));
    end;
  end;
--- 245,257 ----
    if (PageProxy <> nil) and (PageProxy.PageManager <> nil) and
      (PageProxy.PageManager.PageOwner <> nil) then
!     for I := 0 to PageProxy.PageManager.PageCount - 1 do
        Proc(PageProxy.PageManager.PageNames[I]);
  end;
  
  procedure TJvPageManagerEditor.ExecuteVerb(Index: Integer);
  begin
    case Index of
!     0:
!       ShowProxyEditor(Designer, TJvPageManager(Component));
    end;
  end;
***************
*** 267,271 ****
  begin
    case Index of
!     0: Result := srProxyEditor;
    end;
  end;
--- 260,265 ----
  begin
    case Index of
!     0:
!       Result := srProxyEditor;
    end;
  end;
***************
*** 276,287 ****
  end;
  
- { TJvProxyEditor }
- 
  procedure TJvProxyEditor.SeTJvPageManager(Value: TJvPageManager);
  begin
!   if FPageManager <> Value then begin
!     if FPageManager <> nil then FPageManager.OnCheckProxy := nil;
      FPageManager := Value;
!     if FPageManager <> nil then FPageManager.OnCheckProxy := NameProxy;
      UpdateData;
    end;
--- 270,282 ----
  end;
  
  procedure TJvProxyEditor.SeTJvPageManager(Value: TJvPageManager);
  begin
!   if FPageManager <> Value then
!   begin
!     if FPageManager <> nil then
!       FPageManager.OnCheckProxy := nil;
      FPageManager := Value;
!     if FPageManager <> nil then
!       FPageManager.OnCheckProxy := NameProxy;
      UpdateData;
    end;
***************
*** 291,307 ****
  var
    Temp: string;
! {$IFNDEF WIN32}
    I: Integer;
    Comp: TComponent;
! {$ENDIF}
  begin
    Result := '';
!   if (Component <> nil) then Temp := Component.ClassName
!   else Temp := TJvPageProxy.ClassName;
    if (UpCase(Temp[1]) = 'T') and (Length(Temp) > 1) then
      System.Delete(Temp, 1, 1);
! {$IFDEF WIN32}
    Result := Designer.UniqueName(Temp);
! {$ELSE}
    I := 1;
    repeat
--- 286,304 ----
  var
    Temp: string;
!   {$IFNDEF WIN32}
    I: Integer;
    Comp: TComponent;
!   {$ENDIF}
  begin
    Result := '';
!   if (Component <> nil) then
!     Temp := Component.ClassName
!   else
!     Temp := TJvPageProxy.ClassName;
    if (UpCase(Temp[1]) = 'T') and (Length(Temp) > 1) then
      System.Delete(Temp, 1, 1);
!   {$IFDEF WIN32}
    Result := Designer.UniqueName(Temp);
!   {$ELSE}
    I := 1;
    repeat
***************
*** 310,314 ****
      Inc(I);
    until (Comp = nil) or (Comp = Component);
! {$ENDIF}
  end;
  
--- 307,311 ----
      Inc(I);
    until (Comp = nil) or (Comp = Component);
!   {$ENDIF}
  end;
  
***************
*** 324,328 ****
  end;
  
- 
  {$IFDEF COMPILER6_UP}
  procedure TJvProxyEditor.DesignerClosed(const ADesigner: IDesigner; AGoingDormant: Boolean);
--- 321,324 ----
***************
*** 335,339 ****
  {$ENDIF}
  begin
!   if {$IFDEF COMPILER6_UP}ADesigner.Root{$ELSE}Form{$ENDIF} = OwnerForm then Free;
  end;
  
--- 331,340 ----
  {$ENDIF}
  begin
!   {$IFDEF COMPILER6_UP}
!   if ADesigner.Root = OwnerForm then
!   {$ELSE}
!   if ADesigner.Form = OwnerForm then
!   {$ENDIF}
!     Free;
  end;
  
***************
*** 344,352 ****
  {$ENDIF}
  begin
!   if not (csDestroying in ComponentState) then UpdateData;
  end;
  
- 
- 
  procedure TJvProxyEditor.Activated;
  begin
--- 345,352 ----
  {$ENDIF}
  begin
!   if not (csDestroying in ComponentState) then
!     UpdateData;
  end;
  
  procedure TJvProxyEditor.Activated;
  begin
***************
*** 357,370 ****
  procedure TJvProxyEditor.ItemDeleted(const ADesigner: IDesigner; Item: TPersistent);
  begin
!   if Item = FPageManager then begin
  {$ELSE}
  {$IFDEF COMPILER4_UP}
  procedure TJvProxyEditor.ComponentDeleted(Component: IPersistent);
  begin
!   if ExtractPersistent(Component) = FPageManager then begin
  {$ELSE}
  procedure TJvProxyEditor.ComponentDeleted(Component: TComponent);
  begin
!   if Component = FPageManager then begin
  {$ENDIF}
  {$ENDIF}
--- 357,373 ----
  procedure TJvProxyEditor.ItemDeleted(const ADesigner: IDesigner; Item: TPersistent);
  begin
!   if Item = FPageManager then
!   begin
  {$ELSE}
  {$IFDEF COMPILER4_UP}
  procedure TJvProxyEditor.ComponentDeleted(Component: IPersistent);
  begin
!   if ExtractPersistent(Component) = FPageManager then
!   begin
  {$ELSE}
  procedure TJvProxyEditor.ComponentDeleted(Component: TComponent);
  begin
!   if Component = FPageManager then
!   begin
  {$ENDIF}
  {$ENDIF}
***************
*** 378,389 ****
    ProxyCount: Integer;
  begin
!   if CheckPageManager then begin
!     if not FDeleting then FPageManager.Resync;
      ProxyCount := FPageManager.PageProxies.Count;
!     if ProxyCount = 0 then begin
        ProxyGrid.RowCount := 2;
        SelectProxy(nil);
      end
!     else begin
        ProxyGrid.RowCount := 1 + ProxyCount;
      end;
--- 381,396 ----
    ProxyCount: Integer;
  begin
!   if CheckPageManager then
!   begin
!     if not FDeleting then
!       FPageManager.Resync;
      ProxyCount := FPageManager.PageProxies.Count;
!     if ProxyCount = 0 then
!     begin
        ProxyGrid.RowCount := 2;
        SelectProxy(nil);
      end
!     else
!     begin
        ProxyGrid.RowCount := 1 + ProxyCount;
      end;
***************
*** 395,399 ****
  function TJvProxyEditor.GetForm: TCustomForm;
  begin
!   Result := {$IFDEF COMPILER6_UP}TCustomForm(Designer.Root){$ELSE}Designer.Form{$ENDIF}; { GetParentForm(FBar) }
  end;
  
--- 402,410 ----
  function TJvProxyEditor.GetForm: TCustomForm;
  begin
!   {$IFDEF COMPILER6_UP}
!   Result := TCustomForm(Designer.Root); { GetParentForm(FBar) }
!   {$ELSE}
!   Result := Designer.Form; { GetParentForm(FBar) }
!   {$ENDIF}
  end;
  
***************
*** 401,410 ****
  begin
    Action := caFree;
!   if FPageManager <> nil then FPageManager.OnCheckProxy := nil;
  end;
  
  procedure TJvProxyEditor.FormShow(Sender: TObject);
  begin
!   if FPageManager.PageOwner <> nil then begin
      Caption := Format(srPageProxies, [FPageManager.PageOwner.Name]);
    end;
--- 412,423 ----
  begin
    Action := caFree;
!   if FPageManager <> nil then
!     FPageManager.OnCheckProxy := nil;
  end;
  
  procedure TJvProxyEditor.FormShow(Sender: TObject);
  begin
!   if FPageManager.PageOwner <> nil then
!   begin
      Caption := Format(srPageProxies, [FPageManager.PageOwner.Name]);
    end;
***************
*** 414,418 ****
  begin
    Result := (FPageManager <> nil) and (FPageManager.Owner <> nil) and
!     (Designer.{$IFDEF COMPILER6_UP}Root{$ELSE}Form{$ENDIF} <> nil);
  end;
  
--- 427,435 ----
  begin
    Result := (FPageManager <> nil) and (FPageManager.Owner <> nil) and
!     {$IFDEF COMPILER6_UP}
!     (Designer.Root <> nil);
!     {$ELSE}
!     (Designer.Form <> nil);
!     {$ENDIF}
  end;
  
***************
*** 426,431 ****
    FComponents: TDesignerSelectionList;
  begin
!   if CheckPageManager and Active then begin
!     FComponents := {$IFDEF COMPILER6_UP}TDesignerSelections{$ELSE}TDesignerSelectionList{$ENDIF}.Create;
      if Proxy <> nil then
        FComponents.Add(Proxy)
--- 443,453 ----
    FComponents: TDesignerSelectionList;
  begin
!   if CheckPageManager and Active then
!   begin
!     {$IFDEF COMPILER6_UP}
!     FComponents := TDesignerSelections.Create;
!     {$ELSE}
!     FComponents := TDesignerSelectionList.Create;
!     {$ENDIF}
      if Proxy <> nil then
        FComponents.Add(Proxy)
***************
*** 453,468 ****
  begin
    CellText := '';
!   if gdFixed in State then begin
      case Col of
!       0: CellText := srProxyName;
!       1: CellText := srPageName;
      end;
    end
!   else begin
      Proxy := ProxyByRow(Row - 1);
!     if Proxy <> nil then begin
        case Col of
!         0: CellText := Proxy.Name;
!         1: CellText := Proxy.PageName;
        end;
      end;
--- 475,497 ----
  begin
    CellText := '';
!   if gdFixed in State then
!   begin
      case Col of
!       0:
!         CellText := srProxyName;
!       1:
!         CellText := srPageName;
      end;
    end
!   else
!   begin
      Proxy := ProxyByRow(Row - 1);
!     if Proxy <> nil then
!     begin
        case Col of
!         0:
!           CellText := Proxy.Name;
!         1:
!           CellText := Proxy.PageName;
        end;
      end;
***************
*** 487,492 ****
  begin
    Proxy := ProxyByRow(ProxyGrid.Row - 1);
!   if Proxy <> nil then begin
!     {$IFDEF COMPILER6_UP}TCustomForm(Designer.Root).Designer{$ELSE}Designer{$ENDIF}.ValidateRename(Proxy, Proxy.Name, '');
      FDeleting := True;
      try
--- 516,526 ----
  begin
    Proxy := ProxyByRow(ProxyGrid.Row - 1);
!   if Proxy <> nil then
!   begin
!     {$IFDEF COMPILER6_UP}
!     TCustomForm(Designer.Root).Designer.ValidateRename(Proxy, Proxy.Name, '');
!     {$ELSE}
!     Designer.ValidateRename(Proxy, Proxy.Name, '');
!     {$ENDIF}
      FDeleting := True;
      try
***************
*** 502,511 ****
    Shift: TShiftState);
  begin
!   if Shift = [] then begin
      case Key of
        VK_RETURN:
!         if ProxyByRow(ProxyGrid.Row - 1) <> nil then begin
            ActivateInspector(#0);
-         end;
        VK_DELETE:
          DeleteBtnClick(nil);
--- 536,545 ----
    Shift: TShiftState);
  begin
!   if Shift = [] then
!   begin
      case Key of
        VK_RETURN:
!         if ProxyByRow(ProxyGrid.Row - 1) <> nil then
            ActivateInspector(#0);
        VK_DELETE:
          DeleteBtnClick(nil);
***************
*** 516,520 ****
  procedure TJvProxyEditor.FormResize(Sender: TObject);
  begin
!   with ProxyGrid do begin
      DefaultColWidth := (ClientWidth - 1) div 2;
      ColWidths[1] := ClientWidth - ColWidths[0] - 1;
--- 550,555 ----
  procedure TJvProxyEditor.FormResize(Sender: TObject);
  begin
!   with ProxyGrid do
!   begin
      DefaultColWidth := (ClientWidth - 1) div 2;
      ColWidths[1] := ClientWidth - ColWidths[0] - 1;
***************
*** 524,535 ****
  procedure TJvProxyEditor.FormCreate(Sender: TObject);
  begin
!   if NewStyleControls then Font.Style := [];
! {$IFDEF WIN32}
!   with FormStorage do begin
      UseRegistry := True;
      IniFileName := SDelphiKey;
    end;
! {$ENDIF}
  end;
  
  end.
--- 559,573 ----
  procedure TJvProxyEditor.FormCreate(Sender: TObject);
  begin
!   if NewStyleControls then
!     Font.Style := [];
!   {$IFDEF WIN32}
!   with FormStorage do
!   begin
      UseRegistry := True;
      IniFileName := SDelphiKey;
    end;
!   {$ENDIF}
  end;
  
  end.
+ 

Index: JvPicclip.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPicclip.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPicclip.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPicclip.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 13,17 ****
  The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
  Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software          
  All Rights Reserved.
  
--- 13,17 ----
  The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
  Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software
  All Rights Reserved.
  
***************
*** 26,43 ****
  {$I JVCL.INC}
  
- 
  unit JvPicClip;
  
  interface
  
! uses Messages, Classes, Controls, Windows,
! {$IFDEF COMPILER6_UP}
! RTLConsts,
! {$ENDIF}
! Graphics{, JvComponent};
  
  type
- 
- { TJvPicClip }
    TCellRange = 1..MaxInt;
  
--- 26,41 ----
  {$I JVCL.INC}
  
  unit JvPicClip;
  
  interface
  
! uses
!   Messages, Classes, Controls, Windows,
!   {$IFDEF COMPILER6_UP}
!   RTLConsts,
!   {$ENDIF}
!   Graphics {, JvComponent};
  
  type
    TCellRange = 1..MaxInt;
  
***************
*** 95,101 ****
  {$B-}
  
! uses SysUtils, JvVCLUtils, Consts, JvConst;
! 
! { TJvPicClip }
  
  constructor TJvPicClip.Create(AOwner: TComponent);
--- 93,99 ----
  {$B-}
  
! uses
!   SysUtils, Consts,
!   JvVCLUtils, JvConst;
  
  constructor TJvPicClip.Create(AOwner: TComponent);
***************
*** 122,127 ****
  procedure TJvPicClip.Assign(Source: TPersistent);
  begin
!   if Source is TJvPicClip then begin
!     with TJvPicClip(Source) do begin
        Self.FRows := Rows;
        Self.FCols := Cols;
--- 120,127 ----
  procedure TJvPicClip.Assign(Source: TPersistent);
  begin
!   if Source is TJvPicClip then
!   begin
!     with TJvPicClip(Source) do
!     begin
        Self.FRows := Rows;
        Self.FCols := Cols;
***************
*** 131,137 ****
      end;
    end
!   else if (Source is TPicture) or (Source is TGraphic) then
      FPicture.Assign(Source)
!   else inherited Assign(Source);
  end;
  
--- 131,139 ----
      end;
    end
!   else
!   if (Source is TPicture) or (Source is TGraphic) then
      FPicture.Assign(Source)
!   else
!     inherited Assign(Source);
  end;
  
***************
*** 148,158 ****
  {$ENDIF}
  begin
!   if (Dest is TPicture) then Dest.Assign(FPicture)
!   else if (Dest is TGraphic) and (FPicture.Graphic <> nil) and
      (FPicture.Graphic is TGraphic(Dest).ClassType) then
      Dest.Assign(FPicture.Graphic)
! {$IFDEF WIN32}
!   else if (Dest is TImageList) and not IsEmpty then begin
!     with TImageList(Dest) do begin
        SaveChange := OnChange;
        try
--- 150,165 ----
  {$ENDIF}
  begin
!   if (Dest is TPicture) then
!     Dest.Assign(FPicture)
!   else
!   if (Dest is TGraphic) and (FPicture.Graphic <> nil) and
      (FPicture.Graphic is TGraphic(Dest).ClassType) then
      Dest.Assign(FPicture.Graphic)
!   {$IFDEF WIN32}
!   else
!   if (Dest is TImageList) and not IsEmpty then
!   begin
!     with TImageList(Dest) do
!     begin
        SaveChange := OnChange;
        try
***************
*** 161,169 ****
          Width := Self.Width;
          Height := Self.Height;
!         for I := 0 to Self.Count - 1 do begin
            if Self.Masked and (MaskColor <> clNone) then
              TImageList(Dest).AddMasked(GraphicCell[I], MaskColor)
!           else TImageList(Dest).Add(GraphicCell[I], nil);
!         end;
          Masked := Self.Masked;
        finally
--- 168,176 ----
          Width := Self.Width;
          Height := Self.Height;
!         for I := 0 to Self.Count - 1 do
            if Self.Masked and (MaskColor <> clNone) then
              TImageList(Dest).AddMasked(GraphicCell[I], MaskColor)
!           else
!             TImageList(Dest).Add(GraphicCell[I], nil);
          Masked := Self.Masked;
        finally
***************
*** 173,183 ****
      end;
    end
! {$ENDIF}
!   else inherited AssignTo(Dest);
  end;
  
  procedure TJvPicClip.Changed;
  begin
!   if Assigned(FOnChange) then FOnChange(Self);
  end;
  
--- 180,192 ----
      end;
    end
!   {$ENDIF}
!   else
!     inherited AssignTo(Dest);
  end;
  
  procedure TJvPicClip.Changed;
  begin
!   if Assigned(FOnChange) then
!     FOnChange(Self);
  end;
  
***************
*** 189,194 ****
  function TJvPicClip.GetCount: Integer;
  begin
!   if IsEmpty then Result := 0
!   else Result := Cols * Rows;
  end;
  
--- 198,205 ----
  function TJvPicClip.GetCount: Integer;
  begin
!   if IsEmpty then
!     Result := 0
!   else
!     Result := Cols * Rows;
  end;
  
***************
*** 197,208 ****
    Image: TGraphic;
  begin
!   if Index < 0 then Image := Picture.Graphic
!   else Image := GraphicCell[Index];
!   if (Image <> nil) and not Image.Empty then begin
      if FMasked and (FMaskColor <> clNone) and
        (Picture.Graphic is TBitmap) then
        DrawBitmapTransparent(Canvas, X, Y, TBitmap(Image), FMaskColor)
!     else Canvas.Draw(X, Y, Image);
!   end;
  end;
  
--- 208,221 ----
    Image: TGraphic;
  begin
!   if Index < 0 then
!     Image := Picture.Graphic
!   else
!     Image := GraphicCell[Index];
!   if (Image <> nil) and not Image.Empty then
      if FMasked and (FMaskColor <> clNone) and
        (Picture.Graphic is TBitmap) then
        DrawBitmapTransparent(Canvas, X, Y, TBitmap(Image), FMaskColor)
!     else
!       Canvas.Draw(X, Y, Image);
  end;
  
***************
*** 231,239 ****
  begin
    if (Index >= Cols * Rows) or (Index < 0) then
! {$IFDEF COMPILER3_UP}
      raise EListError.CreateFmt(SListIndexError, [Index]);
! {$ELSE}
      raise EListError.CreateFmt('%s (%d)', [LoadStr(SListIndexError), Index]);
! {$ENDIF}
  end;
  
--- 244,252 ----
  begin
    if (Index >= Cols * Rows) or (Index < 0) then
!     {$IFDEF COMPILER3_UP}
      raise EListError.CreateFmt(SListIndexError, [Index]);
!     {$ELSE}
      raise EListError.CreateFmt('%s (%d)', [LoadStr(SListIndexError), Index]);
!     {$ENDIF}
  end;
  
***************
*** 241,245 ****
  begin
    Result := Col + (Row * Cols);
!   if (Result >= Cols * Rows) or IsEmpty then Result := -1;
  end;
  
--- 254,259 ----
  begin
    Result := Col + (Row * Cols);
!   if (Result >= Cols * Rows) or IsEmpty then
!     Result := -1;
  end;
  
***************
*** 253,257 ****
    CheckIndex(Index);
    AssignBitmapCell(Picture.Graphic, FBitmap, Cols, Rows, Index);
! {$IFDEF COMPILER3_UP}
    if Picture.Graphic is TBitmap then
      if FBitmap.PixelFormat <> pfDevice then
--- 267,271 ----
    CheckIndex(Index);
    AssignBitmapCell(Picture.Graphic, FBitmap, Cols, Rows, Index);
!   {$IFDEF COMPILER3_UP}
    if Picture.Graphic is TBitmap then
      if FBitmap.PixelFormat <> pfDevice then
***************
*** 259,267 ****
    FBitmap.TransparentColor := FMaskColor or PaletteMask;
    FBitmap.Transparent := (FMaskColor <> clNone) and Masked;
! {$ELSE}
    if Masked and (FMaskColor <> clNone) then
      with FBitmap do
!       if not Empty then Canvas.Pixels[0, Height - 1] := FMaskColor;
! {$ENDIF}
    Result := FBitmap;
  end;
--- 273,282 ----
    FBitmap.TransparentColor := FMaskColor or PaletteMask;
    FBitmap.Transparent := (FMaskColor <> clNone) and Masked;
!   {$ELSE}
    if Masked and (FMaskColor <> clNone) then
      with FBitmap do
!       if not Empty then
!         Canvas.Pixels[0, Height - 1] := FMaskColor;
!   {$ENDIF}
    Result := FBitmap;
  end;
***************
*** 292,296 ****
  procedure TJvPicClip.SetMaskColor(Value: TColor);
  begin
!   if Value <> FMaskColor then begin
      FMaskColor := Value;
      Changed;
--- 307,312 ----
  procedure TJvPicClip.SetMaskColor(Value: TColor);
  begin
!   if Value <> FMaskColor then
!   begin
      FMaskColor := Value;
      Changed;
***************
*** 301,305 ****
  begin
    FMaskColor := GetDefaultMaskColor;
!   if not (csReading in ComponentState) then Changed;
  end;
  
--- 317,322 ----
  begin
    FMaskColor := GetDefaultMaskColor;
!   if not (csReading in ComponentState) then
!     Changed;
  end;
  
***************
*** 322,323 ****
--- 339,341 ----
  
  end.
+ 

Index: JvPictEdit.dfm
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPictEdit.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPictEdit.dfm	9 Jan 2003 13:36:08 -0000	1.1
--- JvPictEdit.dfm	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 3,7 ****
    Top = 102
    BorderIcons = [biSystemMenu]
!   BorderStyle = bsDialog
    Caption = 'Picture Editor'
    ClientHeight = 335
--- 3,7 ----
    Top = 102
    BorderIcons = [biSystemMenu]
!   BorderStyle = bsSingle
    Caption = 'Picture Editor'
    ClientHeight = 335
***************
*** 12,16 ****
    Font.Height = -11
    Font.Name = 'MS Sans Serif'
!   Font.Style = [fsBold]
    OldCreateOrder = True
    Position = poScreenCenter
--- 12,27 ----
    Font.Height = -11
    Font.Name = 'MS Sans Serif'
!   Font.Style = []
!   Icon.Data = {
!     0000010001001010100001001000280100001600000028000000100000002000
!     00000100040000000000C0000000000000000000000000000000000000000000
!     0000000080000080000000808000800000008000800080800000C0C0C0008080
!     80000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF000000
!     00000000000000000BBBB0000000000BB000BB000000000BB0000B000000000B
!     BB000BB00000000BBB000BB00000000000000BB00000000000000BB000000000
!     00000BB00000000000000BB00000000000000BB00000000000000BB000000000
!     00000BB0000000000000BBBB00000000000BBBBBB0000000000000000000FFFF
!     0000F87F0000E73F0000E7BF0000E39F0000E39F0000FF9F0000FF9F0000FF9F
!     0000FF9F0000FF9F0000FF9F0000FF9F0000FF0F0000FE070000FFFF0000}
    OldCreateOrder = True
    Position = poScreenCenter
***************
*** 182,185 ****
--- 193,197 ----
    end
    object PathsMRU: TJvMRUManager
+     Duplicates = dupIgnore
      Capacity = 30
      IniStorage = FormStorage

Index: JvPictEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPictEdit.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPictEdit.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPictEdit.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 28,48 ****
  unit JvPictEdit;
  
- 
  interface
  
! uses {$IFDEF WIN32} Windows, {$ELSE} WinTypes, WinProcs, {$ENDIF}
!   Messages, Classes, Graphics, Forms, Controls, Dialogs, Buttons,
!   {$IFDEF COMPILER6_UP}RTLConsts, DesignIntf, DesignEditors, VCLEditors,
!   {$ELSE} 
    DsgnIntf,
    {$ENDIF}
!   StdCtrls, ExtCtrls, 
!   {$IFDEF COMPILER3} ExtDlgs, ComCtrls, {$ELSE} JvImagPrvw, {$ENDIF} Menus,
    JvMRUList, JvPlacemnt, JvxCtrls, JvClipMon, JvComponent;
  
  type
- 
- { TPictureEditDialog }
- 
    TPictureEditDialog = class(TForm)
      Load: TButton;
--- 28,54 ----
  unit JvPictEdit;
  
  interface
  
! uses
!   {$IFDEF WIN32}
!   Windows,
!   {$ELSE}
!   WinTypes, WinProcs,
!   {$ENDIF}
!   Messages, Classes, Graphics, Forms, Controls, Dialogs, Buttons, Menus,
!   {$IFDEF COMPILER6_UP}
!   RTLConsts, DesignIntf, DesignEditors, VCLEditors,
!   {$ELSE}
    DsgnIntf,
    {$ENDIF}
!   StdCtrls, ExtCtrls,
!   {$IFDEF COMPILER3}
!   ExtDlgs, ComCtrls,
!   {$ELSE}
!   JvImagPrvw,
!   {$ENDIF}
    JvMRUList, JvPlacemnt, JvxCtrls, JvClipMon, JvComponent;
  
  type
    TPictureEditDialog = class(TForm)
      Load: TButton;
***************
*** 86,98 ****
      FIconColor: TColor;
      FClipMonitor: TJvClipboardMonitor;
! {$IFDEF COMPILER3}
      FProgress: TProgressBar;
      FProgressPos: Integer;
      FileDialog: TOpenPictureDialog;
      SaveDialog: TSavePictureDialog;
! {$ELSE}
      FileDialog: TOpenDialog;
      SaveDialog: TSaveDialog;
! {$ENDIF}
      procedure CheckEnablePaste;
      procedure ValidateImage;
--- 92,104 ----
      FIconColor: TColor;
      FClipMonitor: TJvClipboardMonitor;
!     {$IFDEF COMPILER3}
      FProgress: TProgressBar;
      FProgressPos: Integer;
      FileDialog: TOpenPictureDialog;
      SaveDialog: TSavePictureDialog;
!     {$ELSE}
      FileDialog: TOpenDialog;
      SaveDialog: TSaveDialog;
!     {$ENDIF}
      procedure CheckEnablePaste;
      procedure ValidateImage;
***************
*** 105,112 ****
      procedure WMDropFiles(var Msg: TWMDropFiles); message WM_DROPFILES;
      procedure WMDestroy(var Msg: TMessage); message WM_DESTROY;
! {$IFDEF COMPILER3}
      procedure GraphicProgress(Sender: TObject; Stage: TProgressStage;
        PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string);
! {$ENDIF}
    protected
      procedure CreateHandle; override;
--- 111,118 ----
      procedure WMDropFiles(var Msg: TWMDropFiles); message WM_DROPFILES;
      procedure WMDestroy(var Msg: TMessage); message WM_DESTROY;
!     {$IFDEF COMPILER3}
      procedure GraphicProgress(Sender: TObject; Stage: TProgressStage;
        PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string);
!     {$ENDIF}
    protected
      procedure CreateHandle; override;
***************
*** 116,121 ****
    end;
  
- { TJvPictEditor }
- 
    TJvPictEditor = class(TComponent)
    private
--- 122,125 ----
***************
*** 135,142 ****
    end;
  
! { TJvPictProperty }
! 
! { Property editor the TPicture properties (e.g. the Picture property). Brings
!   up a file open dialog allowing loading a picture file. }
  
    TJvPictProperty = class(TPropertyEditor)
--- 139,144 ----
    end;
  
!   { Property editor the TPicture properties (e.g. the Picture property). Brings
!     up a file open dialog allowing loading a picture file. }
  
    TJvPictProperty = class(TPropertyEditor)
***************
*** 148,153 ****
    end;
  
- { TJvGraphicPropertyEditor }
- 
    TJvGraphicPropertyEditor = class(TClassProperty)
    public
--- 150,153 ----
***************
*** 158,163 ****
    end;
  
- { TJvGraphicsEditor }
- 
    TJvGraphicsEditor = class(TDefaultEditor)
    public
--- 158,161 ----
***************
*** 174,183 ****
  implementation
  
! uses TypInfo, SysUtils, Clipbrd, Consts, ShellApi, LibHelp, JvClipIcon, JvGraph,
!   JvVCLUtils, JvAppUtils, JvConst, JvDirFrm, JvFileUtil, JvTypes;
  
  {$B-}
  {$IFDEF WIN32}
!  {$D-}
  {$ENDIF}
  
--- 172,182 ----
  implementation
  
! uses
!   TypInfo, SysUtils, Clipbrd, Consts, ShellApi, LibHelp,
!   JvClipIcon, JvGraph, JvVCLUtils, JvAppUtils, JvConst, JvDirFrm, JvFileUtil, JvTypes;
  
  {$B-}
  {$IFDEF WIN32}
! {$D-}
  {$ENDIF}
  
***************
*** 186,193 ****
  procedure CopyPicture(Pict: TPicture; BackColor: TColor);
  begin
!   if Pict.Graphic <> nil then begin
!     if Pict.Graphic is TIcon then CopyIconToClipboard(Pict.Icon, BackColor)
      { check another specific graphic types here }
!     else Clipboard.Assign(Pict);
    end;
  end;
--- 185,195 ----
  procedure CopyPicture(Pict: TPicture; BackColor: TColor);
  begin
!   if Pict.Graphic <> nil then
!   begin
!     if Pict.Graphic is TIcon then
!       CopyIconToClipboard(Pict.Icon, BackColor)
      { check another specific graphic types here }
!     else
!       Clipboard.Assign(Pict);
    end;
  end;
***************
*** 197,201 ****
    NewGraphic: TGraphic;
  begin
!   if (Pict <> nil) then begin
      if Clipboard.HasFormat(CF_ICON) and ((GraphicClass = TIcon) or
        (GraphicClass = TGraphic)) then
--- 199,204 ----
    NewGraphic: TGraphic;
  begin
!   if Pict <> nil then
!   begin
      if Clipboard.HasFormat(CF_ICON) and ((GraphicClass = TIcon) or
        (GraphicClass = TGraphic)) then
***************
*** 203,214 ****
        NewGraphic := CreateIconFromClipboard;
        if NewGraphic <> nil then
!         try
!           Pict.Assign(NewGraphic);
!         finally
!           NewGraphic.Free;
!         end;
      end
      { check another specific graphic types here }
!     else if Clipboard.HasFormat(CF_PICTURE) then
        Pict.Assign(Clipboard);
    end;
--- 206,218 ----
        NewGraphic := CreateIconFromClipboard;
        if NewGraphic <> nil then
!       try
!         Pict.Assign(NewGraphic);
!       finally
!         NewGraphic.Free;
!       end;
      end
      { check another specific graphic types here }
!     else
!     if Clipboard.HasFormat(CF_PICTURE) then
        Pict.Assign(Clipboard);
    end;
***************
*** 217,226 ****
  function EnablePaste(Graph: TGraphicClass): Boolean;
  begin
!   if (Graph = TBitmap) then Result := Clipboard.HasFormat(CF_BITMAP)
!   else if (Graph = TMetafile) then Result := Clipboard.HasFormat(CF_METAFILEPICT)
!   else if (Graph = TIcon) then Result := Clipboard.HasFormat(CF_ICON)
    { check another graphic types here }
!   else if (Graph = TGraphic) then Result := Clipboard.HasFormat(CF_PICTURE)
!   else Result := Clipboard.HasFormat(CF_PICTURE);
  end;
  
--- 221,238 ----
  function EnablePaste(Graph: TGraphicClass): Boolean;
  begin
!   if Graph = TBitmap then
!     Result := Clipboard.HasFormat(CF_BITMAP)
!   else
!   if Graph = TMetaFile then
!     Result := Clipboard.HasFormat(CF_METAFILEPICT)
!   else
!   if Graph = TIcon then
!     Result := Clipboard.HasFormat(CF_ICON)
    { check another graphic types here }
!   else
!   if Graph = TGraphic then
!     Result := Clipboard.HasFormat(CF_PICTURE)
!   else
!     Result := Clipboard.HasFormat(CF_PICTURE);
  end;
  
***************
*** 230,235 ****
  end;
  
- { TJvPictEditor }
- 
  constructor TJvPictEditor.Create(AOwner: TComponent);
  begin
--- 242,245 ----
***************
*** 276,281 ****
    end;
    FDecreaseColors := FPicDlg.DecreaseColors;
!   if Result then begin
!     if FPicDlg.Pic.Graphic <> nil then begin
        if (GraphicClass = TBitmap) and (FPicDlg.Pic.Graphic is TIcon) then
        begin
--- 286,293 ----
    end;
    FDecreaseColors := FPicDlg.DecreaseColors;
!   if Result then
!   begin
!     if FPicDlg.Pic.Graphic <> nil then
!     begin
        if (GraphicClass = TBitmap) and (FPicDlg.Pic.Graphic is TIcon) then
        begin
***************
*** 289,295 ****
          end;
        end
!       else FPicture.Assign(FPicDlg.Pic);
      end
!     else FPicture.Graphic := nil;
    end;
  end;
--- 301,309 ----
          end;
        end
!       else
!         FPicture.Assign(FPicDlg.Pic);
      end
!     else
!       FPicture.Graphic := nil;
    end;
  end;
***************
*** 298,302 ****
  begin
    FGraphicClass := Value;
!   if FPicDlg <> nil then FPicDlg.GraphicClass := Value;
  end;
  
--- 312,317 ----
  begin
    FGraphicClass := Value;
!   if FPicDlg <> nil then
!     FPicDlg.GraphicClass := Value;
  end;
  
***************
*** 314,318 ****
  begin
    Result := False;
!   if Graphic = nil then Exit;
    PictureEditor := TJvPictEditor.Create(nil);
    try
--- 329,334 ----
  begin
    Result := False;
!   if Graphic = nil then
!     Exit;
    PictureEditor := TJvPictEditor.Create(nil);
    try
***************
*** 325,331 ****
      if Result then
        if (PictureEditor.Picture.Graphic = nil) or
!          (PictureEditor.Picture.Graphic is PictureEditor.GraphicClass) then
          Graphic.Assign(PictureEditor.Picture.Graphic)
!       else Result := False;
    finally
      PictureEditor.Free;
--- 341,348 ----
      if Result then
        if (PictureEditor.Picture.Graphic = nil) or
!         (PictureEditor.Picture.Graphic is PictureEditor.GraphicClass) then
          Graphic.Assign(PictureEditor.Picture.Graphic)
!       else
!         Result := False;
    finally
      PictureEditor.Free;
***************
*** 333,338 ****
  end;
  
- { TJvPictProperty }
- 
  procedure TJvPictProperty.Edit;
  var
--- 350,353 ----
***************
*** 363,377 ****
  begin
    Picture := TPicture(GetOrdValue);
!   if Picture.Graphic = nil then Result := ResStr(srNone)
!   else Result := '(' + Picture.Graphic.ClassName + ')';
  end;
  
  procedure TJvPictProperty.SetValue(const Value: string);
  begin
!   if Value = '' then SetOrdValue(0);
  end;
  
- { TJvGraphicPropertyEditor }
- 
  procedure TJvGraphicPropertyEditor.Edit;
  var
--- 378,393 ----
  begin
    Picture := TPicture(GetOrdValue);
!   if Picture.Graphic = nil then
!     Result := ResStr(srNone)
!   else
!     Result := '(' + Picture.Graphic.ClassName + ')';
  end;
  
  procedure TJvPictProperty.SetValue(const Value: string);
  begin
!   if Value = '' then
!     SetOrdValue(0);
  end;
  
  procedure TJvGraphicPropertyEditor.Edit;
  var
***************
*** 384,395 ****
      if Comp is TComponent then
        PictureEditor.FPicDlg.Caption := TComponent(Comp).Name + '.' + GetName
!     else PictureEditor.FPicDlg.Caption := GetName;
      PictureEditor.GraphicClass := TGraphicClass(GetTypeData(GetPropType)^.ClassType);
      PictureEditor.Picture.Graphic := TGraphic(Pointer(GetOrdValue));
      if PictureEditor.Execute then
        if (PictureEditor.Picture.Graphic = nil) or
!          (PictureEditor.Picture.Graphic is PictureEditor.GraphicClass) then
          SetOrdValue(LongInt(PictureEditor.Picture.Graphic))
!       else raise EJVCLException.Create(ResStr(SInvalidPropertyValue));
    finally
      PictureEditor.Free;
--- 400,413 ----
      if Comp is TComponent then
        PictureEditor.FPicDlg.Caption := TComponent(Comp).Name + '.' + GetName
!     else
!       PictureEditor.FPicDlg.Caption := GetName;
      PictureEditor.GraphicClass := TGraphicClass(GetTypeData(GetPropType)^.ClassType);
      PictureEditor.Picture.Graphic := TGraphic(Pointer(GetOrdValue));
      if PictureEditor.Execute then
        if (PictureEditor.Picture.Graphic = nil) or
!         (PictureEditor.Picture.Graphic is PictureEditor.GraphicClass) then
          SetOrdValue(LongInt(PictureEditor.Picture.Graphic))
!       else
!         raise EJVCLException.Create(ResStr(SInvalidPropertyValue));
    finally
      PictureEditor.Free;
***************
*** 407,425 ****
  begin
    Graphic := TGraphic(GetOrdValue);
!   if (Graphic = nil) or Graphic.Empty then Result := ResStr(srNone)
!   else Result := '(' + Graphic.ClassName + ')';
  end;
  
  procedure TJvGraphicPropertyEditor.SetValue(const Value: string);
  begin
!   if Value = '' then SetOrdValue(0);
  end;
  
- { TJvGraphicsEditor }
- 
  {$IFDEF COMPILER6_UP}
! procedure TJvGraphicsEditor.EditProperty(const Prop: IProperty; var Continue: Boolean); 
  {$ELSE}
! procedure TJvGraphicsEditor.EditProperty(Prop: TPropertyEditor; var Continue, FreeEditor: Boolean); 
  {$ENDIF}
  var
--- 425,444 ----
  begin
    Graphic := TGraphic(GetOrdValue);
!   if (Graphic = nil) or Graphic.Empty then
!     Result := ResStr(srNone)
!   else
!     Result := '(' + Graphic.ClassName + ')';
  end;
  
  procedure TJvGraphicPropertyEditor.SetValue(const Value: string);
  begin
!   if Value = '' then
!     SetOrdValue(0);
  end;
  
  {$IFDEF COMPILER6_UP}
! procedure TJvGraphicsEditor.EditProperty(const Prop: IProperty; var Continue: Boolean);
  {$ELSE}
! procedure TJvGraphicsEditor.EditProperty(Prop: TPropertyEditor; var Continue, FreeEditor: Boolean);
  {$ENDIF}
  var
***************
*** 436,441 ****
  end;
  
- { TPictureEditDialog }
- 
  procedure TPictureEditDialog.SetGraphicClass(Value: TGraphicClass);
  begin
--- 455,458 ----
***************
*** 464,478 ****
    PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string);
  begin
!   if Stage in [psStarting, psEnding] then begin
      FProgressPos := 0;
      FProgress.Position := 0;
    end
!   else if Stage = psRunning then begin
!     if PercentDone >= FProgressPos + 10 then begin
        FProgress.Position := PercentDone;
        FProgressPos := PercentDone;
      end;
    end;
!   if RedrawNow then ImagePaintBox.Update;
  end;
  {$ENDIF}
--- 481,500 ----
    PercentDone: Byte; RedrawNow: Boolean; const R: TRect; const Msg: string);
  begin
!   if Stage in [psStarting, psEnding] then
!   begin
      FProgressPos := 0;
      FProgress.Position := 0;
    end
!   else
!   if Stage = psRunning then
!   begin
!     if PercentDone >= FProgressPos + 10 then
!     begin
        FProgress.Position := PercentDone;
        FProgressPos := PercentDone;
      end;
    end;
!   if RedrawNow then
!     ImagePaintBox.Update;
  end;
  {$ENDIF}
***************
*** 486,518 ****
  begin
    Pic := TPicture.Create;
! {$IFDEF COMPILER3}
    FileDialog := TOpenPictureDialog.Create(Self);
    SaveDialog := TSavePictureDialog.Create(Self);
    UsePreviewBox.Visible := False;
    FProgress := TProgressBar.Create(Self);
!   with FProgress do begin
      SetBounds(UsePreviewBox.Left, UsePreviewBox.Top, UsePreviewBox.Width,
        UsePreviewBox.Height);
      Parent := Self;
!     Min := 0; Max := 100;
      Position := 0;
    end;
    Pic.OnProgress := GraphicProgress;
! {$ELSE}
    FileDialog := TOpenDialog.Create(Self);
    SaveDialog := TSaveDialog.Create(Self);
! {$ENDIF}
    FileDialog.Title := 'Load picture';
    SaveDialog.Title := 'Save picture as';
! {$IFDEF WIN32}
    Bevel.Visible := False;
    Font.Style := [];
!   with FormStorage do begin
      UseRegistry := True;
      IniFileName := SDelphiKey;
    end;
! {$ELSE}
!   if NewStyleControls then Font.Style := [];
! {$ENDIF}
    PathsMRU.RecentMenu := PathsMenu.Items;
    FIconColor := clBtnFace;
--- 508,544 ----
  begin
    Pic := TPicture.Create;
!   {$IFDEF COMPILER3}
    FileDialog := TOpenPictureDialog.Create(Self);
    SaveDialog := TSavePictureDialog.Create(Self);
    UsePreviewBox.Visible := False;
    FProgress := TProgressBar.Create(Self);
!   with FProgress do
!   begin
      SetBounds(UsePreviewBox.Left, UsePreviewBox.Top, UsePreviewBox.Width,
        UsePreviewBox.Height);
      Parent := Self;
!     Min := 0;
!     Max := 100;
      Position := 0;
    end;
    Pic.OnProgress := GraphicProgress;
!   {$ELSE}
    FileDialog := TOpenDialog.Create(Self);
    SaveDialog := TSaveDialog.Create(Self);
!   {$ENDIF}
    FileDialog.Title := 'Load picture';
    SaveDialog.Title := 'Save picture as';
!   {$IFDEF WIN32}
    Bevel.Visible := False;
    Font.Style := [];
!   with FormStorage do
!   begin
      UseRegistry := True;
      IniFileName := SDelphiKey;
    end;
!   {$ELSE}
!   if NewStyleControls then
!     Font.Style := [];
!   {$ENDIF}
    PathsMRU.RecentMenu := PathsMenu.Items;
    FIconColor := clBtnFace;
***************
*** 556,561 ****
  {$ENDIF}
  begin
! {$IFNDEF DELPHI_D3}
!   if UsePreviewBox.Checked then begin
      FileName := '';
      if DirExists(FileDialog.InitialDir) then
--- 582,588 ----
  {$ENDIF}
  begin
!   {$IFNDEF DELPHI_D3}
!   if UsePreviewBox.Checked then
!   begin
      FileName := '';
      if DirExists(FileDialog.InitialDir) then
***************
*** 568,588 ****
      end;
    end
!   else begin
! {$ENDIF}
!     if FileDialog.Execute then begin
        Self.LoadFile(FileDialog.Filename);
      end;
! {$IFNDEF DELPHI_D3}
    end;
! {$ENDIF}
  end;
  
  procedure TPictureEditDialog.SaveClick(Sender: TObject);
  begin
!   if (Pic.Graphic <> nil) and not Pic.Graphic.Empty then begin
!     with SaveDialog do begin
        DefaultExt := GraphicExtension(TGraphicClass(Pic.Graphic.ClassType));
        Filter := GraphicFilter(TGraphicClass(Pic.Graphic.ClassType));
!       if Execute then begin
          StartWait;
          try
--- 595,620 ----
      end;
    end
!   else
!   begin
!   {$ENDIF}
!     if FileDialog.Execute then
!     begin
        Self.LoadFile(FileDialog.Filename);
      end;
!   {$IFNDEF DELPHI_D3}
    end;
!   {$ENDIF}
  end;
  
  procedure TPictureEditDialog.SaveClick(Sender: TObject);
  begin
!   if (Pic.Graphic <> nil) and not Pic.Graphic.Empty then
!   begin
!     with SaveDialog do
!     begin
        DefaultExt := GraphicExtension(TGraphicClass(Pic.Graphic.ClassType));
        Filter := GraphicFilter(TGraphicClass(Pic.Graphic.ClassType));
!       if Execute then
!       begin
          StartWait;
          try
***************
*** 609,613 ****
  procedure TPictureEditDialog.PasteClick(Sender: TObject);
  begin
!   if (Pic <> nil) then begin
      PastePicture(Pic, GraphicClass);
      DecreaseBMPColors;
--- 641,646 ----
  procedure TPictureEditDialog.PasteClick(Sender: TObject);
  begin
!   if Pic <> nil then
!   begin
      PastePicture(Pic, GraphicClass);
      DecreaseBMPColors;
***************
*** 621,633 ****
    DrawRect: TRect;
    SNone: string;
! {$IFDEF WIN32}
!   Ico: HIcon;
    W, H: Integer;
! {$ENDIF}
  begin
!   with TPaintBox(Sender) do begin
      Canvas.Brush.Color := Color;
      DrawRect := ClientRect;
!     if ValidPicture(Pic) then begin
        with DrawRect do
          if (Pic.Width > Right - Left) or (Pic.Height > Bottom - Top) then
--- 654,668 ----
    DrawRect: TRect;
    SNone: string;
!   {$IFDEF WIN32}
!   Ico: HICON;
    W, H: Integer;
!   {$ENDIF}
  begin
!   with TPaintBox(Sender) do
!   begin
      Canvas.Brush.Color := Color;
      DrawRect := ClientRect;
!     if ValidPicture(Pic) then
!     begin
        with DrawRect do
          if (Pic.Width > Right - Left) or (Pic.Height > Bottom - Top) then
***************
*** 639,646 ****
            Canvas.StretchDraw(DrawRect, Pic.Graphic);
          end
!         else begin
!           with DrawRect do begin
! {$IFDEF WIN32}
!             if Pic.Graphic is TIcon then begin
                Ico := CreateRealSizeIcon(Pic.Icon);
                try
--- 674,684 ----
            Canvas.StretchDraw(DrawRect, Pic.Graphic);
          end
!         else
!         begin
!           with DrawRect do
!           begin
!             {$IFDEF WIN32}
!             if Pic.Graphic is TIcon then
!             begin
                Ico := CreateRealSizeIcon(Pic.Icon);
                try
***************
*** 651,663 ****
                  DestroyIcon(Ico);
                end;
!             end else
! {$ENDIF}
!             Canvas.Draw((Right + Left - Pic.Width) div 2,
!               (Bottom + Top - Pic.Height) div 2, Pic.Graphic);
            end;
          end;
      end
      else
!       with DrawRect, Canvas do begin
          SNone := ResStr(srNone);
          TextOut(Left + (Right - Left - TextWidth(SNone)) div 2, Top + (Bottom -
--- 689,703 ----
                  DestroyIcon(Ico);
                end;
!             end
!             else
!             {$ENDIF}
!               Canvas.Draw((Right + Left - Pic.Width) div 2,
!                 (Bottom + Top - Pic.Height) div 2, Pic.Graphic);
            end;
          end;
      end
      else
!       with DrawRect, Canvas do
!       begin
          SNone := ResStr(srNone);
          TextOut(Left + (Right - Left - TextWidth(SNone)) div 2, Top + (Bottom -
***************
*** 681,692 ****
  procedure TPictureEditDialog.WMDropFiles(var Msg: TWMDropFiles);
  var
!   AFileName: array[0..255] of Char;
    Num: Cardinal;
  begin
    Msg.Result := 0;
    try
!     Num := DragQueryFile(Msg.Drop, {$IFDEF WIN32} $FFFFFFFF {$ELSE}
!       $FFFF {$ENDIF}, nil, 0);
!     if Num > 0 then begin
        DragQueryFile(Msg.Drop, 0, PChar(@AFileName), Pred(SizeOf(AFileName)));
        Application.BringToFront;
--- 721,732 ----
  procedure TPictureEditDialog.WMDropFiles(var Msg: TWMDropFiles);
  var
!   AFileName: array [0..255] of Char;
    Num: Cardinal;
  begin
    Msg.Result := 0;
    try
!     Num := DragQueryFile(Msg.Drop, {$IFDEF WIN32} $FFFFFFFF {$ELSE} $FFFF {$ENDIF}, nil, 0);
!     if Num > 0 then
!     begin
        DragQueryFile(Msg.Drop, 0, PChar(@AFileName), Pred(SizeOf(AFileName)));
        Application.BringToFront;
***************
*** 702,706 ****
    I: Integer;
  begin
!   for I := 0 to PathsMenu.Items.Count - 1 do begin
      PathsMenu.Items[I].Checked := CompareText(PathsMenu.Items[I].Caption,
        FileDialog.InitialDir) = 0;
--- 742,747 ----
    I: Integer;
  begin
!   for I := 0 to PathsMenu.Items.Count - 1 do
!   begin
      PathsMenu.Items[I].Checked := CompareText(PathsMenu.Items[I].Caption,
        FileDialog.InitialDir) = 0;
***************
*** 751,761 ****
    const RecentName, Caption: string; UserData: Longint);
  begin
!   if DirExists(RecentName) then begin
      {SetCurrentDir(RecentName);}
!     FileDialog.InitialDir := RecentName;
!   end
!   else begin
      PathsMRU.Remove(RecentName);
-   end;
    UpdatePathsMenu;
  end;
--- 792,800 ----
    const RecentName, Caption: string; UserData: Longint);
  begin
!   if DirExists(RecentName) then
      {SetCurrentDir(RecentName);}
!     FileDialog.InitialDir := RecentName
!   else
      PathsMRU.Remove(RecentName);
    UpdatePathsMenu;
  end;
***************
*** 772,773 ****
--- 811,813 ----
  
  end.
+ 

Index: JvPlacemnt.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPlacemnt.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPlacemnt.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPlacemnt.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 13,17 ****
  The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
  Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software          
  All Rights Reserved.
  
--- 13,17 ----
  The Initial Developers of the Original Code are: Fedor Koshevnikov, Igor Pavluk and Serge Korolev
  Copyright (c) 1997, 1998 Fedor Koshevnikov, Igor Pavluk and Serge Korolev
! Copyright (c) 2001,2002 SGB Software
  All Rights Reserved.
[...1593 lines suppressed...]
  
--- 1332,1343 ----
  begin
    StoredValue := GetValue(Name);
!   if StoredValue = nil then
!   begin
      StoredValue := TJvStoredValue(Add);
!     StoredValue.Name := Name;
      StoredValue.Value := Value;
    end
!   else
!     StoredValue.Value := Value;
  end;
  
***************
*** 1288,1289 ****
--- 1381,1383 ----
  
  end.
+ 

Index: JvPlaylist.pas
===================================================================
RCS file: /cvsroot/jvcl/rm/source/JvPlaylist.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvPlaylist.pas	9 Jan 2003 13:36:08 -0000	1.1
--- JvPlaylist.pas	9 Feb 2003 15:54:18 -0000	1.2
***************
*** 29,34 ****
  unit JvPlaylist;
  
- 
- 
  interface
  
--- 29,32 ----
***************
*** 40,54 ****
    TJvPlaylist = class(TJvListbox)
    private
!     FShow: Boolean;
      FItems: TStringList;
!     FShowExt: Boolean;
      FRefresh: Boolean;
!     procedure SetShow(const Value: Boolean);
      procedure SetItems(const Value: TStringList);
!     procedure SetShowExt(const Value: Boolean);
    protected
      procedure LBDeleteString(var Msg: TMessage); message LB_DELETESTRING;
      procedure Changed; override;
- 
      function GetPath(Value: string; Position: Integer): string;
      procedure Refresh;
--- 38,51 ----
    TJvPlaylist = class(TJvListbox)
    private
!     FShowNumbers: Boolean;
      FItems: TStringList;
!     FShowExtension: Boolean;
      FRefresh: Boolean;
!     procedure SetShowNumbers(const Value: Boolean);
      procedure SetItems(const Value: TStringList);
!     procedure SetShowExtension(const Value: Boolean);
    protected
      procedure LBDeleteString(var Msg: TMessage); message LB_DELETESTRING;
      procedure Changed; override;
      function GetPath(Value: string; Position: Integer): string;
      procedure Refresh;
***************
*** 57,62 ****
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
! 
!     procedure AddItem(Item: String; AObject: TObject); {$IFDEF COMPILER6_UP}override;{$ENDIF}
      procedure AddItems(Value: TStrings);
      function GetItem(Index: Integer): string;
--- 54,59 ----
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
!     procedure AddItem(Item: string; AObject: TObject);
!       {$IFDEF COMPILER6_UP} override; {$ENDIF}
      procedure AddItems(Value: TStrings);
      function GetItem(Index: Integer): string;
***************
*** 73,78 ****
      procedure LoadPlaylist(FileName: string);
    published
!     property ShowNumbers: Boolean read FShow write SetShow default False;
!     property ShowExtension: Boolean read FShowExt write SetShowExt default False;
      property Items: TStringList read FItems write SetItems;
    end;
--- 70,75 ----
      procedure LoadPlaylist(FileName: string);
    published
!     property ShowNumbers: Boolean read FShowNumbers write SetShowNumbers default False;
!     property ShowExtension: Boolean read FShowExtension write SetShowExtension default False;
      property Items: TStringList read FItems write SetItems;
    end;
***************
*** 80,90 ****
  imp...
 
[truncated message content]