Adjusts for LCL 0.9.30

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2446 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
dopi
2012-05-31 17:39:26 +00:00
parent dc2d691bd4
commit a8f297b927
7 changed files with 109 additions and 136 deletions

View File

@@ -73,7 +73,7 @@
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="9"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Target> <Target>
<Filename Value="TDIDemo"/> <Filename Value="TDIDemo"/>
@@ -93,9 +93,6 @@
</Options> </Options>
</Linking> </Linking>
<Other> <Other>
<CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>

View File

@@ -20,7 +20,6 @@ begin
DeleteFile( HeapTraceFile ); DeleteFile( HeapTraceFile );
SetHeapTraceOutput( HeapTraceFile ); SetHeapTraceOutput( HeapTraceFile );
RequireDerivedFormResource := True;
Application.Initialize; Application.Initialize;
Application.CreateForm(TfMainForm, fMainForm) ; Application.CreateForm(TfMainForm, fMainForm) ;
Application.CreateForm(TForm2, Form2) ; Application.CreateForm(TForm2, Form2) ;

View File

@@ -4,15 +4,15 @@
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="9"/> <Version Value="9"/>
<BuildModes Active="Default"/> <BuildModes Active="Default"/>
<Units Count="87"> <Units Count="88">
<Unit0> <Unit0>
<Filename Value="TDIDemo.lpr"/> <Filename Value="TDIDemo.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="TDIDemo"/> <UnitName Value="TDIDemo"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="9"/> <TopLine Value="5"/>
<CursorPos X="22" Y="21"/> <CursorPos X="1" Y="23"/>
<UsageCount Value="180"/> <UsageCount Value="183"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="mainform.pas"/> <Filename Value="mainform.pas"/>
@@ -23,7 +23,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="10" Y="8"/> <CursorPos X="10" Y="8"/>
<UsageCount Value="180"/> <UsageCount Value="183"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="uform1.pas"/> <Filename Value="uform1.pas"/>
@@ -32,13 +32,10 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uForm1"/> <UnitName Value="uForm1"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="76"/> <TopLine Value="76"/>
<CursorPos X="25" Y="86"/> <CursorPos X="25" Y="86"/>
<UsageCount Value="180"/> <UsageCount Value="183"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="uform2.pas"/> <Filename Value="uform2.pas"/>
@@ -47,13 +44,10 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uForm2"/> <UnitName Value="uForm2"/>
<EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="78"/> <TopLine Value="76"/>
<CursorPos X="18" Y="80"/> <CursorPos X="18" Y="80"/>
<UsageCount Value="102"/> <UsageCount Value="105"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
@@ -61,23 +55,23 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uMainForm"/> <UnitName Value="uMainForm"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="75"/> <TopLine Value="1"/>
<CursorPos X="71" Y="82"/> <CursorPos X="1" Y="1"/>
<UsageCount Value="87"/> <UsageCount Value="89"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="..\tdiclass.pas"/> <Filename Value="..\tdiclass.pas"/>
<UnitName Value="TDIClass"/> <UnitName Value="TDIClass"/>
<EditorIndex Value="4"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="198"/> <TopLine Value="962"/>
<CursorPos X="5" Y="215"/> <CursorPos X="43" Y="982"/>
<UsageCount Value="87"/> <UsageCount Value="89"/>
<Bookmarks Count="6"> <Bookmarks Count="6">
<Item0 X="3" Y="1041" ID="3"/> <Item0 X="3" Y="1041" ID="3"/>
<Item1 X="1" Y="346" ID="2"/> <Item1 X="1" Y="346" ID="2"/>
@@ -105,12 +99,10 @@
<Unit8> <Unit8>
<Filename Value="..\tdireg.pas"/> <Filename Value="..\tdireg.pas"/>
<UnitName Value="TDIReg"/> <UnitName Value="TDIReg"/>
<EditorIndex Value="6"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="19" Y="20"/> <CursorPos X="19" Y="20"/>
<UsageCount Value="35"/> <UsageCount Value="37"/>
<Loaded Value="True"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.pas"/> <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
@@ -150,26 +142,24 @@
<Unit13> <Unit13>
<Filename Value="umainform.lfm"/> <Filename Value="umainform.lfm"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="2474"/> <TopLine Value="977"/>
<CursorPos X="32" Y="2480"/> <CursorPos X="32" Y="976"/>
<ExtraEditorCount Value="1"/> <ExtraEditorCount Value="1"/>
<ExtraEditor1> <ExtraEditor1>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="41"/> <TopLine Value="41"/>
<CursorPos X="25" Y="60"/> <CursorPos X="25" Y="60"/>
</ExtraEditor1> </ExtraEditor1>
<UsageCount Value="6"/> <UsageCount Value="10"/>
<DefaultSyntaxHighlighter Value="LFM"/> <DefaultSyntaxHighlighter Value="LFM"/>
</Unit13> </Unit13>
<Unit14> <Unit14>
<Filename Value="..\tdiconst.pas"/> <Filename Value="..\tdiconst.pas"/>
<UnitName Value="TDIConst"/> <UnitName Value="TDIConst"/>
<EditorIndex Value="5"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="4"/> <TopLine Value="4"/>
<CursorPos X="54" Y="22"/> <CursorPos X="54" Y="22"/>
<UsageCount Value="50"/> <UsageCount Value="52"/>
<Loaded Value="True"/>
</Unit14> </Unit14>
<Unit15> <Unit15>
<Filename Value="C:\lazarus\lcl\controls.pp"/> <Filename Value="C:\lazarus\lcl\controls.pp"/>
@@ -183,8 +173,8 @@
<Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/> <Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/>
<UnitName Value="ExtendedNotebook"/> <UnitName Value="ExtendedNotebook"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="35"/> <TopLine Value="23"/>
<CursorPos X="78" Y="42"/> <CursorPos X="3" Y="35"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
</Unit16> </Unit16>
<Unit17> <Unit17>
@@ -361,7 +351,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="5128"/> <TopLine Value="5128"/>
<CursorPos X="1" Y="5148"/> <CursorPos X="1" Y="5148"/>
<UsageCount Value="0"/> <UsageCount Value="10"/>
</Unit39> </Unit39>
<Unit40> <Unit40>
<Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/> <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
@@ -379,7 +369,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="997"/> <TopLine Value="997"/>
<CursorPos X="3" Y="999"/> <CursorPos X="3" Y="999"/>
<UsageCount Value="0"/> <UsageCount Value="10"/>
</Unit41> </Unit41>
<Unit42> <Unit42>
<Filename Value="C:\lazarus\lcl\include\customform.inc"/> <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
@@ -424,7 +414,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="361"/> <TopLine Value="361"/>
<CursorPos X="1" Y="375"/> <CursorPos X="1" Y="375"/>
<UsageCount Value="0"/> <UsageCount Value="10"/>
</Unit47> </Unit47>
<Unit48> <Unit48>
<Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/> <Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/>
@@ -432,7 +422,7 @@
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="421"/> <TopLine Value="421"/>
<CursorPos X="3" Y="414"/> <CursorPos X="3" Y="414"/>
<UsageCount Value="0"/> <UsageCount Value="10"/>
</Unit48> </Unit48>
<Unit49> <Unit49>
<Filename Value="C:\lazarus\lcl\lclproc.pas"/> <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
@@ -683,7 +673,6 @@
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
</Unit81> </Unit81>
<Unit82> <Unit82>
<Filename Value="..\..\rx\curredit.pas"/> <Filename Value="..\..\rx\curredit.pas"/>
@@ -711,12 +700,10 @@
</Unit84> </Unit84>
<Unit85> <Unit85>
<Filename Value="..\read-me.txt"/> <Filename Value="..\read-me.txt"/>
<EditorIndex Value="3"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="76"/> <TopLine Value="76"/>
<CursorPos X="1" Y="38"/> <CursorPos X="1" Y="38"/>
<UsageCount Value="24"/> <UsageCount Value="26"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/> <DefaultSyntaxHighlighter Value="None"/>
</Unit85> </Unit85>
<Unit86> <Unit86>
@@ -727,131 +714,107 @@
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
</Unit86> </Unit86>
<Unit87>
<Filename Value="C:\lazarus\lcl\lresources.pp"/>
<UnitName Value="LResources"/>
<WindowIndex Value="0"/>
<TopLine Value="1655"/>
<CursorPos X="1" Y="1667"/>
<UsageCount Value="10"/>
</Unit87>
</Units> </Units>
<General> <General>
<ActiveWindowIndexAtStart Value="0"/> <ActiveWindowIndexAtStart Value="0"/>
</General> </General>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="22" HistoryIndex="21">
<Position1> <Position1>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="183" Column="53" TopLine="166"/> <Caret Line="10" Column="19" TopLine="1"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="256" Column="27" TopLine="238"/> <Caret Line="10" Column="19" TopLine="1"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="318" Column="23" TopLine="312"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="360" Column="7" TopLine="347"/> <Caret Line="153" Column="44" TopLine="141"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="uform1.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="38" Column="5" TopLine="27"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="317" Column="1" TopLine="307"/> <Caret Line="37" Column="9" TopLine="24"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="72" Column="36" TopLine="62"/> <Caret Line="31" Column="19" TopLine="24"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="317" Column="1" TopLine="300"/> <Caret Line="144" Column="22" TopLine="138"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="359" Column="26" TopLine="348"/> <Caret Line="144" Column="22" TopLine="138"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="umainform.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="10" Column="19" TopLine="1"/> <Caret Line="81" Column="79" TopLine="75"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="376" Column="13" TopLine="371"/> <Caret Line="80" Column="5" TopLine="75"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\tdiclass.pas"/> <Filename Value="umainform.pas"/>
<Caret Line="2" Column="76" TopLine="1"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\tdiclass.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="13" Column="20" TopLine="1"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\tdiclass.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="1235" Column="1" TopLine="1214"/> <Caret Line="104" Column="20" TopLine="87"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="10" Column="19" TopLine="1"/> <Caret Line="811" Column="32" TopLine="798"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="9" Column="56" TopLine="28"/> <Caret Line="67" Column="14" TopLine="50"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="153" Column="44" TopLine="141"/> <Caret Line="78" Column="74" TopLine="61"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="38" Column="5" TopLine="27"/> <Caret Line="144" Column="14" TopLine="127"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="37" Column="9" TopLine="24"/> <Caret Line="442" Column="24" TopLine="425"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="31" Column="19" TopLine="24"/> <Caret Line="474" Column="26" TopLine="456"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="umainform.pas"/> <Filename Value="..\tdiclass.pas"/>
<Caret Line="144" Column="22" TopLine="138"/> <Caret Line="650" Column="24" TopLine="630"/>
</Position22> </Position22>
<Position23>
<Filename Value="uform1.pas"/>
<Caret Line="15" Column="3" TopLine="4"/>
</Position23>
<Position24>
<Filename Value="uform1.pas"/>
<Caret Line="84" Column="3" TopLine="82"/>
</Position24>
<Position25>
<Filename Value="..\tdiclass.pas"/>
<Caret Line="202" Column="43" TopLine="189"/>
</Position25>
<Position26>
<Filename Value="..\tdiclass.pas"/>
<Caret Line="206" Column="38" TopLine="195"/>
</Position26>
<Position27>
<Filename Value="..\tdiclass.pas"/>
<Caret Line="208" Column="42" TopLine="195"/>
</Position27>
<Position28>
<Filename Value="..\tdiclass.pas"/>
<Caret Line="211" Column="30" TopLine="195"/>
</Position28>
<Position29>
<Filename Value="umainform.pas"/>
<Caret Line="144" Column="22" TopLine="138"/>
</Position29>
<Position30>
<Filename Value="umainform.pas"/>
<Caret Line="81" Column="79" TopLine="75"/>
</Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
</CONFIG> </CONFIG>

View File

@@ -1,7 +1,7 @@
object Form1: TForm1 object Form1: TForm1
Left = 623 Left = 615
Height = 300 Height = 300
Top = 319 Top = 317
Width = 500 Width = 500
Caption = 'Form1' Caption = 'Form1'
ClientHeight = 300 ClientHeight = 300
@@ -17,7 +17,7 @@ object Form1: TForm1
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
LCLVersion = '1.1' LCLVersion = '0.9.30.4'
object bClose: TButton object bClose: TButton
Left = 392 Left = 392
Height = 25 Height = 25

View File

@@ -1,7 +1,7 @@
object Form2: TForm2 object Form2: TForm2
Left = 564 Left = 555
Height = 252 Height = 252
Top = 330 Top = 328
Width = 499 Width = 499
Caption = 'Form2' Caption = 'Form2'
ClientHeight = 252 ClientHeight = 252
@@ -13,7 +13,7 @@ object Form2: TForm2
OnHide = FormHide OnHide = FormHide
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
OnShow = FormShow OnShow = FormShow
LCLVersion = '1.1' LCLVersion = '0.9.30.4'
object Edit1: TEdit object Edit1: TEdit
Left = 48 Left = 48
Height = 23 Height = 23

View File

@@ -1,7 +1,7 @@
object fMainForm: TfMainForm object fMainForm: TfMainForm
Left = 428 Left = 409
Height = 484 Height = 484
Top = 154 Top = 156
Width = 799 Width = 799
Caption = 'fMainForm' Caption = 'fMainForm'
ClientHeight = 464 ClientHeight = 464
@@ -46,7 +46,7 @@ object fMainForm: TfMainForm
OnChange = TDINoteBook1Change OnChange = TDINoteBook1Change
OnCloseTabClicked = TDINoteBook1CloseTabClicked OnCloseTabClicked = TDINoteBook1CloseTabClicked
OnMouseDown = TDINoteBook1MouseDown OnMouseDown = TDINoteBook1MouseDown
Options = [nboShowCloseButtons, nboMultiLine, nboKeyboardTabSwitch, nboShowAddTabButton] Options = [nboMultiLine]
TabDragMode = dmAutomatic TabDragMode = dmAutomatic
TabDragAcceptMode = dmAutomatic TabDragAcceptMode = dmAutomatic
BackgroundImage = Image1 BackgroundImage = Image1
@@ -89,6 +89,7 @@ object fMainForm: TfMainForm
Top = 0 Top = 0
Width = 571 Width = 571
Align = alTop Align = alTop
Anchors = [akTop, akLeft, akRight, akBottom]
Lines.Strings = ( Lines.Strings = (
'Memo1' 'Memo1'
) )

View File

@@ -33,7 +33,7 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, Menus, Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, Menus,
ExtendedNotebook, Buttons, Graphics, LMessages ; ExtendedNotebook, Buttons, Graphics, LMessages, LCLVersion ;
const const
TDIM_CLOSEPAGE = LM_INTERFACELAST + 500; TDIM_CLOSEPAGE = LM_INTERFACELAST + 500;
@@ -165,10 +165,12 @@ type
procedure RemoveInvalidPages ; procedure RemoveInvalidPages ;
protected protected
function CanChange: Boolean; override; function CanChange: Boolean;
{$if (lcl_major > 0) or (lcl_release > 30)} override; {$endif}
procedure DoChange; override; procedure DoChange; override;
procedure Loaded; override; procedure Loaded; override;
procedure RemovePage(Index: Integer); override; procedure RemovePage(Index: Integer);
{$if (lcl_major > 0) or (lcl_release > 30)} override; {$endif}
procedure msg_ClosePage(var Msg: TLMessage); message TDIM_CLOSEPAGE; procedure msg_ClosePage(var Msg: TLMessage); message TDIM_CLOSEPAGE;
@@ -587,7 +589,11 @@ begin
end ; end ;
FTabsMenuItem.Add(NewMenuItem); FTabsMenuItem.Add(NewMenuItem);
if (nboKeyboardTabSwitch in Options) then if {$if (lcl_major > 0) or (lcl_release > 30)}
(nboKeyboardTabSwitch in Options)
{$else}
True
{$endif} then
begin begin
FNextMenuItem := TMenuItem.Create( FTabsMenuItem ); FNextMenuItem := TMenuItem.Create( FTabsMenuItem );
with FNextMenuItem do with FNextMenuItem do
@@ -808,7 +814,7 @@ begin
CreateCloseMenuItem; CreateCloseMenuItem;
FCloseMenuItem.Visible := True ; FCloseMenuItem.Visible := True ;
FCloseMenuItem.Enabled := ( ActivePageIndex >= FFixedPages ); FCloseMenuItem.Enabled := ( ActivePageIndex >= FFixedPages );
end ; end ;
end ; end ;
@@ -946,7 +952,7 @@ begin
with FCloseAllTabsMenuItem do with FCloseAllTabsMenuItem do
begin begin
Enabled := (PageCount > 0); Enabled := (PageCount > FFixedPages);
Caption := TDIActions.CloseAllTabs.Caption; Caption := TDIActions.CloseAllTabs.Caption;
Visible := TDIActions.CloseAllTabs.Visible; Visible := TDIActions.CloseAllTabs.Visible;
ImageIndex := TDIActions.CloseAllTabs.ImageIndex; ImageIndex := TDIActions.CloseAllTabs.ImageIndex;
@@ -1024,7 +1030,10 @@ begin
end ; end ;
end ; end ;
Result := Result and (inherited CanChange) ; Result := Result
{$if (lcl_major > 0) or (lcl_release > 30)}
and (inherited CanChange)
{$endif};
end ; end ;
procedure TTDINoteBook.DoChange ; procedure TTDINoteBook.DoChange ;
@@ -1081,7 +1090,11 @@ begin
if CanRemovePage then if CanRemovePage then
begin begin
inherited RemovePage(APage.PageIndex) ; {$if (lcl_major > 0) or (lcl_release > 30)}
inherited RemovePage(APage.PageIndex) ;
{$else}
APage.Free;
{$endif}
if PageCount < 1 then // On this case, DoChange is not fired // if PageCount < 1 then // On this case, DoChange is not fired //
CheckInterface; CheckInterface;