Skip to content

Commit 18c5338

Browse files
committed
bug 7 - Printing a file
fix printing bug
1 parent fe9b1cc commit 18c5338

File tree

10 files changed

+792
-29
lines changed

10 files changed

+792
-29
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@
4141
# Delphi autogenerated files (duplicated info)
4242
*.cfg
4343
*Resource.rc
44+
*.res
4445

4546
# Delphi local files (user-specific info)
4647
*.local
4748
*.identcache
4849
*.projdata
4950
*.tvsconfig
5051
*.dsk
52+
*.dproj
5153

5254
# Delphi history and backups
5355
__history/

Source/Debugger.pas

-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ procedure TDebugger.Stop;
215215

216216
procedure TDebugger.SendCommand(const Command, Params: String; ViewInUI: boolean);
217217
var
218-
P: PChar;
219218
nBytesWrote: DWORD;
220219
Buff: TBytes;
221220
begin

Source/PrintFrm.dfm

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ object PrintForm: TPrintForm
1414
Font.Style = []
1515
OldCreateOrder = False
1616
Position = poMainFormCenter
17-
OnClose = FormClose
1817
OnCreate = FormCreate
1918
PixelsPerInch = 96
2019
TextHeight = 15
@@ -24,17 +23,19 @@ object PrintForm: TPrintForm
2423
Width = 75
2524
Height = 24
2625
Caption = '&Cancel'
27-
TabOrder = 1
2826
Kind = bkCancel
27+
NumGlyphs = 2
28+
TabOrder = 1
2929
end
3030
object btnOk: TBitBtn
3131
Left = 270
3232
Top = 164
3333
Width = 75
3434
Height = 24
3535
Caption = '&OK'
36-
TabOrder = 0
3736
Kind = bkOK
37+
NumGlyphs = 2
38+
TabOrder = 0
3839
end
3940
object grpParams: TGroupBox
4041
Left = 8

Source/PrintFrm.pas

-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ TPrintForm = class(TForm)
4141
cbSelection: TCheckBox;
4242
rbNoLN: TRadioButton;
4343
procedure FormCreate(Sender: TObject);
44-
procedure FormClose(Sender: TObject; var Action: TCloseAction);
4544
public
4645
procedure LoadText;
4746
end;
@@ -86,9 +85,4 @@ procedure TPrintForm.FormCreate(Sender: TObject);
8685
rbLNMargin.Checked := devData.PrintLineNumbersMargins;
8786
end;
8887

89-
procedure TPrintForm.FormClose(Sender: TObject; var Action: TCloseAction);
90-
begin
91-
Action := caFree;
92-
end;
93-
9488
end.

Source/VCL/ClassBrowsing/ClassBrowsing.dproj

+26
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@
5858
<CfgParent>Base</CfgParent>
5959
<Base>true</Base>
6060
</PropertyGroup>
61+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
62+
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
63+
<CfgParent>Cfg_2</CfgParent>
64+
<Cfg_2>true</Cfg_2>
65+
<Base>true</Base>
66+
</PropertyGroup>
67+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
68+
<Cfg_2_Win32>true</Cfg_2_Win32>
69+
<CfgParent>Cfg_2</CfgParent>
70+
<Cfg_2>true</Cfg_2>
71+
<Base>true</Base>
72+
</PropertyGroup>
6173
<PropertyGroup Condition="'$(Base)'!=''">
6274
<DCC_E>false</DCC_E>
6375
<DCC_F>false</DCC_F>
@@ -78,6 +90,7 @@
7890
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7991
<VerInfo_Locale>1043</VerInfo_Locale>
8092
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
93+
<DCC_UnitSearchPath>..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
8194
</PropertyGroup>
8295
<PropertyGroup Condition="'$(Base_Android)'!=''">
8396
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
@@ -121,6 +134,13 @@
121134
<DCC_Optimize>false</DCC_Optimize>
122135
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
123136
</PropertyGroup>
137+
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
138+
<BT_BuildType>Debug</BT_BuildType>
139+
</PropertyGroup>
140+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
141+
<VerInfo_Locale>1033</VerInfo_Locale>
142+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
143+
</PropertyGroup>
124144
<ItemGroup>
125145
<DelphiCompile Include="$(MainSource)">
126146
<MainSource>MainSource</MainSource>
@@ -161,6 +181,12 @@
161181
<Source>
162182
<Source Name="MainSource">ClassBrowsing.dpk</Source>
163183
</Source>
184+
<Excluded_Packages>
185+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
186+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
187+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
188+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
189+
</Excluded_Packages>
164190
</Delphi.Personality>
165191
<Platforms>
166192
<Platform value="Android">False</Platform>

Source/VCL/DevCpp.dproj

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<CfgParent>Base</CfgParent>
3939
<Base>true</Base>
4040
</PropertyGroup>
41+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
42+
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
43+
<CfgParent>Cfg_2</CfgParent>
44+
<Cfg_2>true</Cfg_2>
45+
<Base>true</Base>
46+
</PropertyGroup>
4147
<PropertyGroup Condition="'$(Base)'!=''">
4248
<DCC_E>false</DCC_E>
4349
<DCC_F>false</DCC_F>
@@ -89,6 +95,9 @@
8995
<DCC_Optimize>false</DCC_Optimize>
9096
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
9197
</PropertyGroup>
98+
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
99+
<BT_BuildType>Debug</BT_BuildType>
100+
</PropertyGroup>
92101
<ItemGroup>
93102
<DelphiCompile Include="$(MainSource)">
94103
<MainSource>MainSource</MainSource>

Source/VCL/DevCpp_Icon.ico

11.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)