Skip to content

Commit 8270ce2

Browse files
committed
Some fixe/update to old projects.(11)
1 parent 1f9a1cc commit 8270ce2

File tree

4 files changed

+1254
-1006
lines changed

4 files changed

+1254
-1006
lines changed

testcase/db/fb3/temp/main.mfm

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ object mainfo: tmainfo
1212
635
1313
)
1414
statfile = tstatfile1
15+
windowopacity = -Inf
1516
oncreate = createev
1617
moduleclassname = 'tmainform'
1718
object tbooleanedit1: tbooleanedit
@@ -37,12 +38,12 @@ object mainfo: tmainfo
3738
datacols.count = 2
3839
datacols.items = <
3940
item
40-
width = 80
41+
width = 70
4142
datafield = 'PK'
4243
textflags = [tf_right, tf_ycentered, tf_noselect]
4344
end
4445
item
45-
width = 160
46+
width = 140
4647
datafield = 'STR1'
4748
end>
4849
datalink.datasource = dataso
@@ -55,7 +56,7 @@ object mainfo: tmainfo
5556
fixrows.count = 1
5657
fixrows.items = <
5758
item
58-
height = 16
59+
height = 19
5960
captions.count = 2
6061
captions.items = <
6162
item
@@ -65,8 +66,9 @@ object mainfo: tmainfo
6566
caption = 'STR1'
6667
end>
6768
end>
69+
datarowheight = 23
6870
statfile = tstatfile1
69-
reffontheight = 14
71+
reffontheight = 17
7072
end
7173
object tdbnavigator1: tdbnavigator
7274
frame.localprops = []
@@ -87,11 +89,12 @@ object mainfo: tmainfo
8789
taborder = 5
8890
bounds_x = 336
8991
bounds_y = 8
92+
bounds_cy = 23
9093
value = -Inf
9194
valuedefault = -Inf
92-
min = -Inf
93-
max = 401768.99999
94-
reffontheight = 14
95+
valuemin = -Inf
96+
valuemax = 401768.99999
97+
reffontheight = 17
9598
end
9699
object tbooleanedit2: tbooleanedit
97100
frame.localprops = []
@@ -114,17 +117,19 @@ object mainfo: tmainfo
114117
taborder = 6
115118
bounds_x = 8
116119
bounds_y = 296
120+
bounds_cy = 23
117121
datalink.fieldname = 'bytes7'
118-
reffontheight = 14
122+
reffontheight = 17
119123
end
120124
object tdbstringedit2: tdbstringedit
121125
frame.localprops = []
122126
frame.localprops1 = []
123127
taborder = 7
124128
bounds_x = 112
125129
bounds_y = 296
130+
bounds_cy = 23
126131
datalink.fieldname = 'varbytes10'
127-
reffontheight = 14
132+
reffontheight = 17
128133
end
129134
object tdbstringedit3: tdbstringedit
130135
frame.localprops = []
@@ -133,8 +138,9 @@ object mainfo: tmainfo
133138
bounds_x = 216
134139
bounds_y = 296
135140
bounds_cx = 164
141+
bounds_cy = 23
136142
datalink.fieldname = 'guid1'
137-
reffontheight = 14
143+
reffontheight = 17
138144
end
139145
object bu1: tbutton
140146
taborder = 9
@@ -184,8 +190,8 @@ object mainfo: tmainfo
184190
bounds_x = 16
185191
bounds_y = 392
186192
bounds_cx = 52
187-
bounds_cy = 18
188-
reffontheight = 14
193+
bounds_cy = 21
194+
reffontheight = 17
189195
end
190196
object tbutton5: tbutton
191197
taborder = 14
@@ -205,8 +211,8 @@ object mainfo: tmainfo
205211
bounds_x = 72
206212
bounds_y = 392
207213
bounds_cx = 52
208-
bounds_cy = 18
209-
reffontheight = 14
214+
bounds_cy = 21
215+
reffontheight = 17
210216
end
211217
object tintegerdisp3: tintegerdisp
212218
Tag = 3
@@ -216,8 +222,8 @@ object mainfo: tmainfo
216222
bounds_x = 128
217223
bounds_y = 392
218224
bounds_cx = 52
219-
bounds_cy = 18
220-
reffontheight = 14
225+
bounds_cy = 21
226+
reffontheight = 17
221227
end
222228
object tintegerdisp4: tintegerdisp
223229
Tag = 4
@@ -227,8 +233,8 @@ object mainfo: tmainfo
227233
bounds_x = 184
228234
bounds_y = 392
229235
bounds_cx = 52
230-
bounds_cy = 18
231-
reffontheight = 14
236+
bounds_cy = 21
237+
reffontheight = 17
232238
end
233239
object tbooleanedit4: tbooleanedit
234240
Tag = 1
@@ -322,9 +328,9 @@ object mainfo: tmainfo
322328
taborder = 27
323329
bounds_x = 16
324330
bounds_y = 448
325-
bounds_cy = 114
331+
bounds_cy = 117
326332
textflags = [tf_ycentered, tf_wordbreak]
327-
reffontheight = 14
333+
reffontheight = 17
328334
end
329335
object versiondi: tstringdisp
330336
frame.localprops = []
@@ -333,9 +339,9 @@ object mainfo: tmainfo
333339
bounds_x = 120
334340
bounds_y = 448
335341
bounds_cx = 716
336-
bounds_cy = 162
342+
bounds_cy = 165
337343
textflags = [tf_wordbreak]
338-
reffontheight = 14
344+
reffontheight = 17
339345
end
340346
object maivers: tintegerdisp
341347
frame.localprops = []
@@ -344,8 +350,8 @@ object mainfo: tmainfo
344350
bounds_x = 280
345351
bounds_y = 424
346352
bounds_cx = 60
347-
bounds_cy = 18
348-
reffontheight = 14
353+
bounds_cy = 21
354+
reffontheight = 17
349355
end
350356
object minvers: tintegerdisp
351357
frame.localprops = []
@@ -354,24 +360,24 @@ object mainfo: tmainfo
354360
bounds_x = 344
355361
bounds_y = 424
356362
bounds_cx = 52
357-
bounds_cy = 18
358-
reffontheight = 14
363+
bounds_cy = 21
364+
reffontheight = 17
359365
end
360366
object tbooleanedit8: tbooleanedit
361367
frame.caption = 'returning'
362368
frame.localprops = []
363369
frame.localprops1 = []
364370
frame.outerframe = (
365371
0
366-
1
367-
61
368-
2
372+
3
373+
55
374+
3
369375
)
370376
taborder = 31
371377
bounds_x = 480
372-
bounds_y = 7
373-
bounds_cx = 74
374-
bounds_cy = 16
378+
bounds_y = 5
379+
bounds_cx = 68
380+
bounds_cy = 19
375381
onsetvalue = returningev
376382
end
377383
object tdbintegerdisp1: tdbintegerdisp
@@ -380,42 +386,42 @@ object mainfo: tmainfo
380386
taborder = 32
381387
bounds_x = 584
382388
bounds_y = 8
383-
bounds_cy = 18
389+
bounds_cy = 21
384390
datalink.datasource = datso2
385391
datalink.fieldname = 'pk'
386-
reffontheight = 14
392+
reffontheight = 17
387393
end
388394
object rowsret: tintegerdisp
389395
frame.caption = 'rowsreturned'
390396
frame.localprops = []
391397
frame.localprops1 = []
392398
frame.outerframe = (
393399
0
394-
17
400+
20
395401
0
396402
0
397403
)
398404
taborder = 33
399405
bounds_x = 464
400-
bounds_y = 295
401-
bounds_cy = 35
402-
reffontheight = 14
406+
bounds_y = 292
407+
bounds_cy = 41
408+
reffontheight = 17
403409
end
404410
object rowsaff: tintegerdisp
405411
frame.caption = 'rowsaffected'
406412
frame.localprops = []
407413
frame.localprops1 = []
408414
frame.outerframe = (
409415
0
410-
17
416+
20
411417
0
412418
0
413419
)
414420
taborder = 34
415421
bounds_x = 568
416-
bounds_y = 295
417-
bounds_cy = 35
418-
reffontheight = 14
422+
bounds_y = 292
423+
bounds_cy = 41
424+
reffontheight = 17
419425
end
420426
object dbname: tfilenameedit
421427
frame.caption = 'createdatabase'
@@ -429,20 +435,20 @@ object mainfo: tmainfo
429435
frame.button.imagenr = 17
430436
frame.outerframe = (
431437
0
432-
17
438+
20
433439
0
434440
0
435441
)
436442
taborder = 35
437443
bounds_x = 464
438-
bounds_y = 343
444+
bounds_y = 340
439445
bounds_cx = 340
440-
bounds_cy = 37
446+
bounds_cy = 43
441447
statfile = tstatfile1
442448
optionsedit1 = [oe1_autopopupmenu, oe1_keyexecute, oe1_savevalue, oe1_savestate, oe1_saveoptions]
443449
optionsedit = [oe_undoonesc, oe_closequery, oe_checkmrcancel, oe_shiftreturn, oe_forcereturncheckvalue, oe_eatreturn, oe_resetselectonexit, oe_exitoncursor, oe_endonenter, oe_autoselect, oe_autoselectonfirstclick, oe_focusrectonreadonly]
444450
onsetvalue = createsetev
445-
reffontheight = 14
451+
reffontheight = 17
446452
end
447453
object conn: tmseibconnection
448454
DatabaseName = '/db/firebird_3_0/test.fdb'

testcase/db/fb3/temp/main.pas

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface
77
mseibconnection,sysutils,mdb,msebufdataset,msedb,mseifiglob,msesqldb,msqldb,
88
msegraphedits,mseificomp,mseificompglob,msescrollbar,msedataedits,msedbedit,
99
mseedit,msegrids,mselookupbuffer,msestatfile,msestream,msestrings,msesqlresult,
10-
msefbconnection,msesimplewidgets,msedbgraphics,msebitmap,msedatanodes,
10+
msefb3connection,msesimplewidgets,msedbgraphics,msebitmap,msedatanodes,
1111
msefiledialog,mselistbrowser,msesys,msedbevents,msedispwidgets,mserichstring,
1212
msedbdispwidgets,mseact;
1313
//['{6C7A2561-16E6-4CAC-B4C6-16171480BE1D}']
@@ -87,7 +87,7 @@ tmainfo = class(tmainform)
8787
procedure createsetev(const sender: TObject; var avalue: msestring;
8888
var accept: Boolean);
8989
public
90-
db: tfbconnection;
90+
db: tfb3connection;
9191
end;
9292
var
9393
mainfo: tmainfo;
@@ -123,7 +123,7 @@ procedure tmainfo.createev(const sender: TObject);
123123
ms.free;
124124
}
125125
//exit;
126-
db:= tfbconnection.create(self);
126+
db:= tfb3connection.create(self);
127127
db.options:= [fbo_sqlinfo];
128128
db.transaction:= trans;
129129
db.username:= 'SYSDBA';
@@ -233,7 +233,7 @@ procedure tmainfo.fire2exe(const sender: TObject);
233233
procedure tmainfo.sqlresexe(const sender: TObject);
234234
begin
235235
sqlres.active:= true;
236-
memodi.value:= sqlres.cols.colbyname('textblob').asmsestring;
236+
memodi.value:= sqlres.datacols.colbyname('textblob').asmsestring;
237237
sqlres.active:= false;
238238
end;
239239

0 commit comments

Comments
 (0)