From: <ah...@us...> - 2009-07-09 11:15:53
|
Revision: 12392 http://jvcl.svn.sourceforge.net/jvcl/?rev=12392&view=rev Author: ahuser Date: 2009-07-09 11:15:37 +0000 (Thu, 09 Jul 2009) Log Message: ----------- - Removed .NET support - Fixed Delphi 6 compilation Modified Paths: -------------- trunk/jvcl/common/jvcl.inc trunk/jvcl/run/JvCaptionButton.pas trunk/jvcl/run/JvColorCombo.pas trunk/jvcl/run/JvDynControlEngineIntf.pas trunk/jvcl/run/JvListComb.pas trunk/jvcl/run/JvTranslateString.pas trunk/jvcl/run/JvxCheckListBox.pas Removed Paths: ------------- trunk/jvcl/design/Jedi.Jvcl.Design.RegisterComponents.pas trunk/jvcl/packages/D10.Net Packages.bdsgroup trunk/jvcl/packages/D9.Net Packages.bdsgroup trunk/jvcl/packages/d10.net/ trunk/jvcl/packages/d11.net/ trunk/jvcl/packages/d9.net/ Modified: trunk/jvcl/common/jvcl.inc =================================================================== --- trunk/jvcl/common/jvcl.inc 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/common/jvcl.inc 2009-07-09 11:15:37 UTC (rev 12392) @@ -155,17 +155,3 @@ {$UNDEF JVCLThemesEnabledD56} {$ENDIF !VCL} -{$IFDEF CLR} - {$WARN UNSAFE_TYPE ON} - {$WARN UNSAFE_CODE ON} - {$WARN UNSAFE_CAST ON} - {$WARN UNIT_PLATFORM OFF} - - {$UNDEF JvInterpreter_OLEAUTO} - {$UNDEF JVCLThemesEnabledD56} - {$UNDEF UNITVERSIONING} - {$UNDEF USE_DXGETTEXT} - {$DEFINE USEJVCL} - {$DEFINE MSWINDOWS} -{$ENDIF CLR} - Deleted: trunk/jvcl/design/Jedi.Jvcl.Design.RegisterComponents.pas =================================================================== --- trunk/jvcl/design/Jedi.Jvcl.Design.RegisterComponents.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/design/Jedi.Jvcl.Design.RegisterComponents.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,121 +0,0 @@ -{----------------------------------------------------------------------------- -The contents of this file are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/MPL-1.1.html - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for -the specific language governing rights and limitations under the License. - -The Original Code is: Jedi.Jvcl.Design.RegisterComponents.PAS, released on 2006-04-19. - -The Initial Developers of the Original Code are: ahuser -All Rights Reserved. - -Contributor(s): - -You may retrieve the latest version of this file at the Project JEDI's JVCL home page, -located at http://jvcl.sourceforge.net - -description : - -Known Issues: ------------------------------------------------------------------------------} - -unit Jedi.Jvcl.Design.RegisterComponents; - -interface - -uses - SysUtils, Classes; - -procedure Register; - -implementation - -{$R JvCoreReg.dcr} - -uses - DbClient, - // Core - Jedi.Jvcl.JvPoweredBy, - Jedi.Jvcl.JvAppStorage, - Jedi.Jvcl.JvAppIniStorage, - Jedi.Jvcl.JvAppXMLStorage, - Jedi.Jvcl.JvAppStorageSelectList, - Jedi.Jvcl.JvAutoComplete, - // Components - Jedi.Jvcl.JvAlarm, - Jedi.Jvcl.JvConverter, - Jedi.Jvcl.JvDataEmbedded, - Jedi.Jvcl.JvEnterTab, - Jedi.Jvcl.JvMergeManager, - Jedi.Jvcl.JvPageManager; - -resourcestring - RsPaletteNonVisible = 'JVCL.NET Components'; - RsPaletteControls = 'JVCL.NET Controls'; - -procedure Register; -begin - // Core - RegisterComponents(RsPaletteNonVisible, [TJvPoweredByJCL, TJvPoweredByJVCL]); - RegisterComponents(RsPaletteNonVisible, [TJvAppStorage, - TJvAppIniFileStorage, TJvAppStorageSelectList, TJvAppXMLFileStorage]); - RegisterComponents(RsPaletteNonVisible, [TJvLookupAutoComplete]); - - // Components - RegisterComponents(RsPaletteNonVisual, [TJvAlarms, TJvConverter, - TJvDataEmbedded, - TJvEnterAsTab, TJvMergeManager, TJvPageManager{, TJvStrHolder, TJvMultiStringHolder}]); -end; - -{$IFDEF RTL170_UP} - -var - AboutBoxServices: IOTAAboutBoxServices = nil; - AboutBoxIndex: Integer = 0; - -procedure RegisterAboutBox; -var - ProductImage: HBITMAP; -begin - Supports(BorlandIDEServices,IOTAAboutBoxServices, AboutBoxServices); - Assert(Assigned(AboutBoxServices), RsENoAboutServices); - ProductImage := LoadBitmap(FindResourceHInstance(HInstance), 'JVCLSPLASH'); - AboutBoxIndex := AboutBoxServices.AddProductInfo(RsAboutDialogTitle, - RsAboutCopyright, RsAboutTitle, RsAboutDescription, 0, - ProductImage, False, RsAboutLicenceStatus); -end; - -procedure UnregisterAboutBox; -begin - if (AboutBoxIndex <> 0) and Assigned(AboutBoxServices) then - begin - AboutBoxServices.RemoveProductInfo(AboutBoxIndex); - AboutBoxIndex := 0; - AboutBoxServices := nil; - end; -end; - -procedure RegisterSplashScreen; -var - ProductImage: HBITMAP; -begin - Assert(Assigned(SplashScreenServices), RsENoSplashServices); - ProductImage := LoadBitmap(FindResourceHInstance(HInstance), 'JVCLSPLASH'); - SplashScreenServices.AddProductBitmap(RsAboutDialogTitle, ProductImage, - False, RsAboutLicenceStatus); -end; - -initialization - RegisterSplashScreen; - RegisterAboutBox; - -finalization - UnRegisterAboutBox; - -{$ENDIF RTL170_UP} - -end. Deleted: trunk/jvcl/packages/D10.Net Packages.bdsgroup =================================================================== --- trunk/jvcl/packages/D10.Net Packages.bdsgroup 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/packages/D10.Net Packages.bdsgroup 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">Default.Personality</Option> - <Option Name="ProjectType"></Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{84D72F31-B285-4AD5-B761-E28E2B708D11}</Option> - </Option> - </PersonalityInfo> - <Default.Personality> - - <Projects> - <Projects Name="Jedi.Jcl.dll">..\..\jcl\packages\d10.net\Jedi.Jcl.bdsproj</Projects> - <Projects Name="Jedi.Jvcl.dll">d10.net\Jedi.Jvcl.bdsproj</Projects> - <Projects Name="Targets">Jedi.Jcl.dll Jedi.Jvcl.dll</Projects> - </Projects> - <Dependencies/> - </Default.Personality> -</BorlandProject> Deleted: trunk/jvcl/packages/D9.Net Packages.bdsgroup =================================================================== --- trunk/jvcl/packages/D9.Net Packages.bdsgroup 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/packages/D9.Net Packages.bdsgroup 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<BorlandProject> - <PersonalityInfo> - <Option> - <Option Name="Personality">Default.Personality</Option> - <Option Name="ProjectType"></Option> - <Option Name="Version">1.0</Option> - <Option Name="GUID">{E28EAB23-A295-4C83-A872-83FD858892F0}</Option> - </Option> - </PersonalityInfo> - <Default.Personality> <Projects> - <Projects Name="Jedi.Jvcl.dll">d9.net\Jedi.Jvcl.bdsproj</Projects> - <Projects Name="Jedi.Jcl.dll">..\..\jcl\packages\d9.vcl.net\Jedi.Jcl.bdsproj</Projects> - <Projects Name="Targets">Jedi.Jvcl.dll Jedi.Jcl.dll</Projects> - </Projects> - <Dependencies/> - </Default.Personality> -</BorlandProject> Modified: trunk/jvcl/run/JvCaptionButton.pas =================================================================== --- trunk/jvcl/run/JvCaptionButton.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvCaptionButton.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1387,10 +1387,13 @@ GetWindowPlacement(Wnd, @Placement); ExStyle := GetWindowLong(Wnd, GWL_EXSTYLE); FHasSmallCaption := ExStyle and WS_EX_TOOLWINDOW = WS_EX_TOOLWINDOW; - if (not IsThemed) and (Placement.showCmd = SW_SHOWMINIMIZED) then + {$IFDEF JVCLThemesEnabled} + if not IsThemed and (Placement.showCmd = SW_SHOWMINIMIZED) then FHasSmallCaption := False; - {$IFDEF JVCLThemesEnabled} FCaptionActive := (GetActiveWindow = Wnd) and IsForegroundTask; + {$ELSE} + if Placement.showCmd = SW_SHOWMINIMIZED then + FHasSmallCaption := False; {$ENDIF JVCLThemesEnabled} if (Style and WS_THICKFRAME = WS_THICKFRAME) and (Placement.showCmd <> SW_SHOWMINIMIZED) then Modified: trunk/jvcl/run/JvColorCombo.pas =================================================================== --- trunk/jvcl/run/JvColorCombo.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvColorCombo.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,4 +1,4 @@ -{----------------------------------------------------------------------------- +{----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at Modified: trunk/jvcl/run/JvDynControlEngineIntf.pas =================================================================== --- trunk/jvcl/run/JvDynControlEngineIntf.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvDynControlEngineIntf.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,4 +1,4 @@ -{----------------------------------------------------------------------------- +{----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at Modified: trunk/jvcl/run/JvListComb.pas =================================================================== --- trunk/jvcl/run/JvListComb.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvListComb.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -157,8 +157,7 @@ property Objects[Index: Integer]: TObject read GetObjects write SetObjects; end; - TJvImageComboBoxBase = TJvCustomComboBox; - TJvImageComboBox = class(TJvImageComboBoxBase, IUnknown, IJvResetItemHeight) + TJvImageComboBox = class(TJvCustomComboBox, IUnknown, IJvResetItemHeight) private FItems: TJvImageItems; FImageList: TCustomImageList; Modified: trunk/jvcl/run/JvTranslateString.pas =================================================================== --- trunk/jvcl/run/JvTranslateString.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvTranslateString.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,4 +1,4 @@ -{----------------------------------------------------------------------------- +{----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at Modified: trunk/jvcl/run/JvxCheckListBox.pas =================================================================== --- trunk/jvcl/run/JvxCheckListBox.pas 2009-07-09 11:03:28 UTC (rev 12391) +++ trunk/jvcl/run/JvxCheckListBox.pas 2009-07-09 11:15:37 UTC (rev 12392) @@ -1,4 +1,4 @@ -{----------------------------------------------------------------------------- +{----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |