pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcl: Fix compilation on non-Windows OS (unit uxThemes not needed), issue #33476

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6265 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-03-23 08:46:50 +00:00
parent c3a0621532
commit 244eca2cc8
6 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/jvcllaz/run/JvCore/JvThemes.pas
View File

@ -25,26 +25,17 @@ Known Issues:
unit JvThemes; unit JvThemes;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$DEFINE JVCLThemesEnabled}
{$DEFINE JVCLThemesEnabled}
{$DEFINE COMPILER7_UP} {$DEFINE COMPILER7_UP}
(*
{$I jvcl.inc}
{$IFDEF JVCLThemesEnabled}
{$I windowsonly.inc}
{$ENDIF JVCLThemesEnabled}
*)
interface interface
uses uses
{
Windows, Messages, CommCtrl,
}
Types, SysUtils, Classes, Contnrs, Types, SysUtils, Classes, Contnrs,
{$IFDEF JVCLThemesEnabled} {$IFDEF JVCLThemesEnabled}
Themes, UxTheme, Themes,
{$ENDIF JVCLThemesEnabled} {$ENDIF JVCLThemesEnabled}
Controls, Forms, Graphics, Buttons; Controls, Forms, Graphics, Buttons;

6
components/jvcllaz/run/JvCtrls/JvHtControls.pas
View File

@ -109,9 +109,9 @@ unit JvHtControls;
interface interface
uses uses
SysUtils, Classes, LCLType, {LMessages,} Types,
{LMessages,} Graphics, {Contnrs,} Controls, StdCtrls, Dialogs, SysUtils, Classes, Graphics, {Contnrs,} Controls, StdCtrls, Dialogs,
JvJVCLUtils, {JvDataSourceIntf,} Types, LCLType{, JvExStdCtrls}; JvJVCLUtils {JvDataSourceIntf, JvExStdCtrls} ;
const const
DefaultSuperSubScriptRatio: Double = 2/3; DefaultSuperSubScriptRatio: Double = 2/3;

2
components/jvcllaz/run/JvCustomControls/JvBaseThumbnail.pas
View File

@ -184,7 +184,7 @@ function ReplaceAllStr(const Str, SearchFor, ReplaceWith: string;
implementation implementation
uses uses
SysUtils, Types, //LazFileUtils, SysUtils, Types,
JvJCLUtils, JvThemes; JvJCLUtils, JvThemes;
function ReplaceAllStr(const Str, SearchFor, ReplaceWith: string; function ReplaceAllStr(const Str, SearchFor, ReplaceWith: string;

1
components/jvcllaz/run/JvCustomControls/JvTabBar.pas
View File

@ -32,7 +32,6 @@ interface
uses uses
LCLIntf, LCLType, LMessages, Types, LCLIntf, LCLType, LMessages, Types,
// Windows, Messages,
Graphics, Controls, Forms, ImgList, Menus, Buttons, Graphics, Controls, Forms, ImgList, Menus, Buttons,
ExtCtrls, SysUtils, Classes, Contnrs, Themes; ExtCtrls, SysUtils, Classes, Contnrs, Themes;

4
components/jvcllaz/run/JvJans/JvMarkupLabel.pas
View File

@ -32,9 +32,7 @@ unit JvMarkupLabel;
interface interface
uses uses
//Messages, Graphics, Controls, SysUtils, Classes,
Graphics, Controls,
SysUtils, Classes,
JvMarkupCommon; JvMarkupCommon;
type type

3
components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
View File

@ -9,7 +9,8 @@ uses
{$IFDEF UNITVERSIONING} {$IFDEF UNITVERSIONING}
JclUnitVersioning, JclUnitVersioning,
{$ENDIF UNITVERSIONING} {$ENDIF UNITVERSIONING}
SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages, Classes, Controls, Graphics, Forms, dialogs; SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages,
Classes, Controls, Graphics, Forms, dialogs;
type type
TDesignerDCFlag = ( TDesignerDCFlag = (