[JVCL-Checkins] dev/JVCL3/qdesign JvQCmpReg.pas,1.14,1.15 JvQSpeedbarForm.pas,1.7,1.8 JvQSystemReg.pas,1.14,1.15 - fix for vcl-clx package conflicts

[Andr? S. <asn...@us...>]

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

Modified Files:
	JvQCmpReg.pas JvQSpeedbarForm.pas JvQSystemReg.pas 
Log Message:
fix for  vcl-clx package conflicts


Index: JvQCmpReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/qdesign/JvQCmpReg.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvQCmpReg.pas	31 May 2004 17:50:56 -0000	1.14
--- JvQCmpReg.pas	31 May 2004 23:03:15 -0000	1.15
***************
*** 40,46 ****
  
  uses
!   Classes,  
!   QControls,  
!   DesignEditors, DesignIntf, 
    JvQDsgnConsts,
    {$IFDEF USEWINDOWS}
--- 40,46 ----
  
  uses
!   Classes,
!   QControls,
!   DesignEditors, DesignIntf,
    JvQDsgnConsts,
    {$IFDEF USEWINDOWS}
***************
*** 61,68 ****
  
  procedure Register;
! begin 
    GroupDescendentsWith(TJvDataEmbedded, TControl);
!   GroupDescendentsWith(TJvStrHolder, TControl); 
! 
    RegisterComponents(RsPaletteNonVisual, [TJvAlarms, TJvConverter,
      TJvDataEmbedded,
--- 61,70 ----
  
  procedure Register;
! begin
!   {$IFDEF MSWINDOWS}
    GroupDescendentsWith(TJvDataEmbedded, TControl);
!   GroupDescendentsWith(TJvStrHolder, TControl);
!   GroupDescendentsWith(TJvPageManager, TControl);
!   {$ENDIF MSWINDOWS}
    RegisterComponents(RsPaletteNonVisual, [TJvAlarms, TJvConverter,
      TJvDataEmbedded,
***************
*** 72,76 ****
    {$IFDEF USEWINDOWS}
    RegisterComponents(RsPaletteNonVisual, [TJvCreateProcess, TJvWinHelp]);
!   {$ENDIF USEWINDOWS}
  
  
--- 74,78 ----
    {$IFDEF USEWINDOWS}
    RegisterComponents(RsPaletteNonVisual, [TJvCreateProcess, TJvWinHelp]);
!   {$ENDIF USWINDOWS}
  
  

Index: JvQSpeedbarForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/qdesign/JvQSpeedbarForm.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvQSpeedbarForm.pas	24 May 2004 10:39:27 -0000	1.7
--- JvQSpeedbarForm.pas	31 May 2004 23:03:15 -0000	1.8
***************
*** 37,45 ****
    SysUtils, Classes,
    QWindows, Types, QGraphics, QControls, QForms, QDialogs,
!   QStdCtrls, QButtons, QGrids, QMenus, QMessages, 
    DesignIntf, DesignEditors,
!   QDesignWindows,
    {$IFDEF MSWINDOWS}
!   JvQAppRegistryStorage,
    {$ENDIF MSWINDOWS}
    JvQSpeedButton, JvQSpeedBar, JvQFormPlacement,
--- 37,45 ----
    SysUtils, Classes,
    QWindows, Types, QGraphics, QControls, QForms, QDialogs,
!   QStdCtrls, QButtons, QGrids, QMenus, QMessages,
    DesignIntf, DesignEditors,
!   QDesignWindows, 
    {$IFDEF MSWINDOWS}
! //  JvAppRegistryStorage,
    {$ENDIF MSWINDOWS}
    JvQSpeedButton, JvQSpeedBar, JvQFormPlacement,
***************
*** 73,78 ****
      PasteMenu: TMenuItem;
      CutMenu: TMenuItem;
-     FormPlacement1: TJvFormStorage;
-     AppStorage: TJvAppRegistryStorage;
      procedure DelSectionClick(Sender: TObject);
      procedure AddButtonClick(Sender: TObject);
--- 73,76 ----
***************
*** 982,986 ****
    if NewStyleControls then
      Font.Style := [];
!   AppStorage.Root := SDelphiKey;
  end;
  
--- 980,984 ----
    if NewStyleControls then
      Font.Style := [];
!  // AppStorage.Root := SDelphiKey;
  end;
  

Index: JvQSystemReg.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/qdesign/JvQSystemReg.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvQSystemReg.pas	18 May 2004 14:35:39 -0000	1.14
--- JvQSystemReg.pas	31 May 2004 23:03:16 -0000	1.15
***************
*** 1,6 ****
- {**************************************************************************************************}
- {  WARNING:  JEDI preprocessor generated unit.  Do not edit.                                       }
- {**************************************************************************************************}
- 
  {-----------------------------------------------------------------------------
  The contents of this file are subject to the Mozilla Public License
--- 1,2 ----
***************
*** 34,37 ****
--- 30,37 ----
  interface
  
+ {$IFDEF MSWINDOWS}
+ {$DEFINE USEWINDOWS}
+ {$ENDIF MSWINDOWS}
+ 
  procedure Register;
  
***************
*** 40,53 ****
  uses
    Classes,
!   
!   
    QControls,
!   
  
    DesignEditors, DesignIntf,
!   
    JvQDsgnConsts,
!   
!   {$IFDEF MSWINDOWS}
    JvQMRUList, JvQMRUManager,
    JvQCommStatus, {JvComputerInfo,}
--- 40,53 ----
  uses
    Classes,
! 
! 
    QControls,
! 
  
    DesignEditors, DesignIntf,
! 
    JvQDsgnConsts,
! 
!   {$IFDEF USEWINDOWS}
    JvQMRUList, JvQMRUManager,
    JvQCommStatus, {JvComputerInfo,}
***************
*** 57,61 ****
    JvQPerfMon95, JvQComputerInfoEx,
    JvQChangeNotifyEditor, JvQPerfStatEditor, JvQTimerList, JvQTimerListEditor,
!   {$ENDIF MSWINDOWS}
    JvQThread, JvQThreadTimer, JvQTimer, JvQSimpleXml, JvQXMLDatabase,
    JvQFormPlacement, JvQAppXMLStorage, JvQFormPlacementSelectList,
--- 57,61 ----
    JvQPerfMon95, JvQComputerInfoEx,
    JvQChangeNotifyEditor, JvQPerfStatEditor, JvQTimerList, JvQTimerListEditor,
!   {$ENDIF USEWINDOWS}
    JvQThread, JvQThreadTimer, JvQTimer, JvQSimpleXml, JvQXMLDatabase,
    JvQFormPlacement, JvQAppXMLStorage, JvQFormPlacementSelectList,
***************
*** 71,84 ****
  procedure Register;
  begin
!   
    GroupDescendentsWith(TJvSimpleXML, TControl);
    GroupDescendentsWith(TJvTimer, TControl);
!   
  
    RegisterComponents(RsPalettePersistence, [TJvFormStorage, TJvFormStorageSelectList,
        TJvAppXMLFileStorage]);
    RegisterComponents(RsPaletteInternetWork, [TJvSimpleXML, TJvXMLDatabase]);
!   
!   {$IFDEF MSWINDOWS}
    RegisterComponents(RsPaletteSystem, [{TJvComputerInfo, // - do not register this component as default}
      TJvSHFileOperation, TJvChangeNotify, TJvAppInstances, TJvNTEventLog,
--- 71,86 ----
  procedure Register;
  begin
!   {$IFDEF MSWINDOWS}
    GroupDescendentsWith(TJvSimpleXML, TControl);
    GroupDescendentsWith(TJvTimer, TControl);
!   GroupDescendentsWith(TJvAppInstances, TControl);
!   GroupDescendentsWith(TJvTimerList, TControl);
!   {$ENDIF MSWINDOWS}
  
    RegisterComponents(RsPalettePersistence, [TJvFormStorage, TJvFormStorageSelectList,
        TJvAppXMLFileStorage]);
    RegisterComponents(RsPaletteInternetWork, [TJvSimpleXML, TJvXMLDatabase]);
! 
!   {$IFDEF USEWINDOWS}
    RegisterComponents(RsPaletteSystem, [{TJvComputerInfo, // - do not register this component as default}
      TJvSHFileOperation, TJvChangeNotify, TJvAppInstances, TJvNTEventLog,
***************
*** 87,98 ****
      TJvPerfStat95, TJvComputerInfoEx]);
    RegisterComponents(RsPaletteInternetWork, [TJvRas32, TJvCommStatus]);
!   {$ENDIF MSWINDOWS}
    RegisterComponents(RsPaletteNonVisual, [
!     {$IFDEF MSWINDOWS}
      TJvSearchFiles, TJvMRUList, TJvMRUManager, TJvShellHook,
!     {$ENDIF MSWINDOWS}
  
      TJvTimer, TJvThread, TJvThreadTimer
!     {$IFDEF WINDOWS}, TJvTimerList {$ENDIF}
      ]);
  
--- 89,100 ----
      TJvPerfStat95, TJvComputerInfoEx]);
    RegisterComponents(RsPaletteInternetWork, [TJvRas32, TJvCommStatus]);
!   {$ENDIF USEWINDOWS}
    RegisterComponents(RsPaletteNonVisual, [
!     {$IFDEF USEWINDOWS}
      TJvSearchFiles, TJvMRUList, TJvMRUManager, TJvShellHook,
!     {$ENDIF USEWINDOWS}
  
      TJvTimer, TJvThread, TJvThreadTimer
!     {$IFDEF USEWINDOWS}, TJvTimerList {$ENDIF}
      ]);
  
***************
*** 101,106 ****
    RegisterPropertyEditor(TypeInfo(TStrings), TJvFormStorage,
      'StoredProps', TJvStoredPropsProperty);
!   
!   {$IFDEF MSWINDOWS}
    RegisterPropertyEditor(TypeInfo(string), TJvChangeItem,
      'Directory', TJvDirectoryProperty);
--- 103,108 ----
    RegisterPropertyEditor(TypeInfo(TStrings), TJvFormStorage,
      'StoredProps', TJvStoredPropsProperty);
! 
!   {$IFDEF USEWINDOWS}
    RegisterPropertyEditor(TypeInfo(string), TJvChangeItem,
      'Directory', TJvDirectoryProperty);
***************
*** 111,115 ****
    RegisterComponentEditor(TJvChangeNotify, TJvChangeNotifyEditor);
    RegisterComponentEditor(TJvTimerList, TJvTimerListDefaultEditor);
!   {$ENDIF MSWINDOWS}
  
    RegisterComponentEditor(TJvFormStorage, TJvFormStorageEditor);
--- 113,117 ----
    RegisterComponentEditor(TJvChangeNotify, TJvChangeNotifyEditor);
    RegisterComponentEditor(TJvTimerList, TJvTimerListDefaultEditor);
!   {$ENDIF USEWINDOWS}
  
    RegisterComponentEditor(TJvFormStorage, TJvFormStorageEditor);