* all callbacks changed from export; to cdecl because of 7640

git-svn-id: trunk@5424 -
This commit is contained in:
marco 2006-11-18 20:15:23 +00:00
parent 940f82a473
commit a2c03515e5
32 changed files with 74 additions and 74 deletions

View File

@ -15,7 +15,7 @@ PFD_bwform = ^TFD_bwform;
{ callbacks for form bwform }
procedure done_callback(ob : PFL_OBJECT; data : longint);export;
procedure done_callback(ob : PFL_OBJECT; data : longint);cdecl;
begin
{ fill-in code for callback }
halt(0);
@ -26,7 +26,7 @@ fd_bwform : PFD_bwform;
const bws : array[0..7] of longint = (-3,-2,-1,1,2,3,4,5);
procedure bw_callback(ob : PFL_OBJECT; data : longint);export;
procedure bw_callback(ob : PFL_OBJECT; data : longint);cdecl;
var bw : longint;

View File

@ -52,7 +52,7 @@ var
Const
lastbt : Longint = -1;
procedure boxtype_cb (ob : PFL_OBJECT; arg : longint);export;
procedure boxtype_cb (ob : PFL_OBJECT; arg : longint);cdecl;
var
i, req_bt : longint;
@ -76,7 +76,7 @@ end;
Const lval : longint = -1;
procedure mode_cb (ob : PFL_OBJECT; arg : longint);export;
procedure mode_cb (ob : PFL_OBJECT; arg : longint);cdecl;
var
db,theval : longint;

View File

@ -16,7 +16,7 @@ bnames : array[0..3] of pchar =
);
procedure deselect(obj : PFL_OBJECT ; arg : longint);export;
procedure deselect(obj : PFL_OBJECT ; arg : longint);cdecl;
var
i : longint ;
begin
@ -24,7 +24,7 @@ begin
fl_deselect_browser(br[i]);
end;
procedure set_size(obj : PFL_OBJECT; arg : longint);export;
procedure set_size(obj : PFL_OBJECT; arg : longint);cdecl;
var
i : longint;
begin
@ -32,7 +32,7 @@ begin
fl_set_browser_fontsize(br[i],arg);
end;
procedure set_style(obj : PFL_OBJECT; arg : longint);export;
procedure set_style(obj : PFL_OBJECT; arg : longint);cdecl;
var
i : longint;
@ -41,7 +41,7 @@ begin
fl_set_browser_fontstyle(br[i], arg);
end;
procedure br_callback(ob : PFL_OBJECT; arg : longint);export;
procedure br_callback(ob : PFL_OBJECT; arg : longint);cdecl;
var
buf : string[255];
const

View File

@ -7,7 +7,7 @@ var
form : PFL_FORM;
browserobj, inputobj, exitobj : PFL_OBJECT;
procedure addit(ob : PFL_OBJECT; arg : longint);export;
procedure addit(ob : PFL_OBJECT; arg : longint);cdecl;
begin
{ append and show the last line. Don't use this if you just want
* to add some lines. use fl_add_browser_line
@ -15,7 +15,7 @@ begin
fl_addto_browser(browserobj,fl_get_input(inputobj));
end;
procedure insertit(ob : PFL_OBJECT ; arg : longint);export;
procedure insertit(ob : PFL_OBJECT ; arg : longint);cdecl;
var
n : integer;
begin
@ -24,7 +24,7 @@ begin
fl_insert_browser_line(browserobj,n,fl_get_input(inputobj));
end;
procedure replaceit(obj : PFL_OBJECT; arg : longint);export;
procedure replaceit(obj : PFL_OBJECT; arg : longint);cdecl;
var
n : integer;
begin
@ -34,7 +34,7 @@ begin
end;
procedure deleteit(ob : PFL_OBJECT; arg : Longint);export;
procedure deleteit(ob : PFL_OBJECT; arg : Longint);cdecl;
var
n : integer;
begin
@ -43,7 +43,7 @@ begin
fl_delete_browser_line(browserobj,n);
end;
procedure clearit(ob : PFL_OBJECT; arg : longint);export;
procedure clearit(ob : PFL_OBJECT; arg : longint);cdecl;
begin
fl_clear_browser(browserobj);
end;

View File

@ -10,12 +10,12 @@ type TFD_buttform = record
end;
PFD_buttform = ^TFD_buttform;
Procedure done_cb(ob : PFL_OBJECT; data : longint);export;
Procedure done_cb(ob : PFL_OBJECT; data : longint);cdecl;
begin
halt(0);
end;
procedure bw_cb(ob : PFL_OBJECT; data : longint);export;
procedure bw_cb(ob : PFL_OBJECT; data : longint);cdecl;
const
bws : array [0..7] of longint = (-4,-3,-2,-1,1,2,3,4);

View File

@ -1,6 +1,6 @@
program butttypes;
uses strings,forms;
uses strings,xforms;
type TFD_form0 = record
form0 : PFL_FORM;
@ -11,7 +11,7 @@ end;
PFD_form0 = ^TFD_form0;
{ callbacks for form form0 }
procedure button_cb(ob : PFL_OBJECT; data : longint);export;
procedure button_cb(ob : PFL_OBJECT; data : longint);cdecl;
var
ui : PFD_form0;
buf : string [128];

View File

@ -24,7 +24,7 @@ PFD_canvasform = ^TFD_canvasform;
Var canvasGC : TGC;
function canvas_expose(ob : PFL_OBJECT;win : TWindow; w,h : longint; ev : PXEvent;d : Pointer) : longint;export;
function canvas_expose(ob : PFL_OBJECT;win : TWindow; w,h : longint; ev : PXEvent;d : Pointer) : longint;cdecl;
var ui : PFD_CANVASFORM;
@ -35,7 +35,7 @@ begin
end;
function canvas_key(ob : PFL_OBJECT; win : TWindow; w,h : Longint; ev : PXEvent; d: pointer) : longint;export;
function canvas_key(ob : PFL_OBJECT; win : TWindow; w,h : Longint; ev : PXEvent; d: pointer) : longint;cdecl;
var
ui :PFD_canvasform;
buf : string[128];
@ -50,7 +50,7 @@ begin
end;
function canvas_but(ob : PFL_OBJECT; win : TWindow; w,h : longint, ev : PXEvent;d : pointer) : longint;export;
function canvas_but(ob : PFL_OBJECT; win : TWindow; w,h : longint, ev : PXEvent;d : pointer) : longint;cdecl;
var
ui : PFD_canvasform;
@ -68,7 +68,7 @@ begin
fl_addto_browser(ui^.br, @buf[1]);
end;
function canvas_misc(ob : PFL_OBJECT; win : TWindow; w,h : longint, ev : PXEvent;d : pointer) : longint;export;
function canvas_misc(ob : PFL_OBJECT; win : TWindow; w,h : longint, ev : PXEvent;d : pointer) : longint;cdecl;
var
@ -97,7 +97,7 @@ end;
var
fd_canvasform : PFD_canvasform;
procedure sensitive_setting(ob : PFL_OBJECT ; event : longint); export;
procedure sensitive_setting(ob : PFL_OBJECT ; event : longint); cdecl;
var
hc : PFL_HANDLE_CANVAS;
@ -113,7 +113,7 @@ begin
fl_remove_canvas_handler(fd_canvasform^.canvas, event, hc);
end;
procedure disable_it(ob : PFL_OBJECT; data : longint);export;
procedure disable_it(ob : PFL_OBJECT; data : longint);cdecl;
begin
if fl_get_button(ob)<>0 then
@ -122,7 +122,7 @@ begin
fl_activate_object (fd_canvasform^.canvas);
end;
procedure hide_it(ob : PFL_OBJECT; all : longint);export;
procedure hide_it(ob : PFL_OBJECT; all : longint);cdecl;
begin
@ -151,7 +151,7 @@ begin
end;
end;
procedure misc_cb(ob : PFL_OBJECT; data : longint); export;
procedure misc_cb(ob : PFL_OBJECT; data : longint); cdecl;
begin
if(fl_get_button(ob)<>0) then

View File

@ -12,14 +12,14 @@ var
chartobj,sinobj,exitbut,stepobj : PFL_OBJECT;
procedure set_function(obj : PFL_OBJECT; arg : longint);export;
procedure set_function(obj : PFL_OBJECT; arg : longint);cdecl;
begin
func := arg;
fl_clear_chart(chartobj);
xx := 0.0;
end;
procedure set_step(obj : PFL_OBJECT; arg : longint);export;
procedure set_step(obj : PFL_OBJECT; arg : longint);cdecl;
begin
step := fl_get_slider_value(stepobj);

View File

@ -8,7 +8,7 @@ uses xforms;
var form : PFL_FORM;
sexobj,childobj,licenceobj,marriedobj,readyobj : PFL_OBJECT;
procedure cb( ob : PFL_OBJECT; data : longint);export;
procedure cb( ob : PFL_OBJECT; data : longint);cdecl;
begin
Writeln ('CallBack: ', fl_get_choice(ob));

View File

@ -41,7 +41,7 @@ begin
fl_unfreeze_form(cl);
end;
procedure br_cb(ob : PFL_OBJECT; q :longint);export;
procedure br_cb(ob : PFL_OBJECT; q :longint);cdecl;
var r : longint;
@ -160,7 +160,7 @@ begin
search_entry:= j;
end;
procedure search_rgb(ob : PFL_OBJECT; q : longint);export;
procedure search_rgb(ob : PFL_OBJECT; q : longint);cdecl;
var r, g, b, i,top : longint;
@ -182,7 +182,7 @@ begin
end;
{ change database }
procedure db_cb(ob : PFL_OBJECT; q : longint);export;
procedure db_cb(ob : PFL_OBJECT; q : longint);cdecl;
var p: pchar;
buf : string;
@ -198,7 +198,7 @@ begin
fl_set_object_label(ob, @dbname[1]);
end;
procedure done_cb (ob : PFL_OBJECT; q : longint);export;
procedure done_cb (ob : PFL_OBJECT; q : longint);cdecl;
begin
halt(0);
end;

View File

@ -5,7 +5,7 @@ uses xforms;
var form : PFL_FORM;
topbox : PFL_OBJECT;
procedure change_color(ob : PFL_OBJECT; col : longint);export;
procedure change_color(ob : PFL_OBJECT; col : longint);cdecl;
begin
fl_set_object_color(topbox, col, col);

View File

@ -9,7 +9,7 @@ form : PFL_FORM;
result : PFL_OBJECT;
co : array[0..2] of PFL_OBJECT;
procedure color_change(ob : PFL_OBJECT; data : longint);export;
procedure color_change(ob : PFL_OBJECT; data : longint);cdecl;
var r,g,b : longint;

View File

@ -27,7 +27,7 @@ begin
fl_set_cursor(FL_ObjWin(ob), data);
end;
procedure setbitmapcursor_cb(ob : PFL_OBJECT ; data : Longint);export;
procedure setbitmapcursor_cb(ob : PFL_OBJECT ; data : Longint);cdecl;
begin
if bitmapcur<>0 then
@ -38,7 +38,7 @@ begin
end;
Procedure done_cb (ob : PFL_OBJECT; data : Longint);export;
Procedure done_cb (ob : PFL_OBJECT; data : Longint);cdecl;
begin
Halt(0);
end;

View File

@ -8,7 +8,7 @@ var
form : PFL_FORM;
br : PFL_OBJECT;
procedure load_file(ob : PFL_OBJECT; arg : longint);export;
procedure load_file(ob : PFL_OBJECT; arg : longint);cdecl;
var
fname : pchar;
@ -19,12 +19,12 @@ begin
fl_add_browser_line(br,'NO SUCH FILE!');
end;
procedure set_size(ob : PFL_OBJECT; arg : longint);export;
procedure set_size(ob : PFL_OBJECT; arg : longint);cdecl;
begin
fl_set_browser_fontsize(br,arg);
end;
procedure exit_program(ob : PFL_OBJECT; data : longint);export;
procedure exit_program(ob : PFL_OBJECT; data : longint);cdecl;
begin
halt(0);
end;

View File

@ -7,14 +7,14 @@ var
form : PFL_FORM;
br, but : PFL_OBJECT;
procedure load_file(ob : PFL_OBJECT; arg : longint);export;
procedure load_file(ob : PFL_OBJECT; arg : longint);cdecl;
begin
if (fl_load_browser(br,fl_show_input('Filename to load',''))<>0) then
fl_add_browser_line(br,'NO SUCH FILE!');
end;
procedure set_size(ob : PFL_OBJECT; arg : Longint);export;
procedure set_size(ob : PFL_OBJECT; arg : Longint);cdecl;
begin
fl_set_browser_fontsize(br, arg);

View File

@ -6,7 +6,7 @@ uses xforms;
var
fclock : PFL_FORM;
procedure exit_cb (ob : PFL_OBJECT; q : longint);export;
procedure exit_cb (ob : PFL_OBJECT; q : longint);cdecl;
begin
halt(0);
end;

View File

@ -16,17 +16,17 @@ PFD_fontsform=^TFD_fontsform;
var ui : PFD_fontsform;
procedure done_cb(obj : PFL_OBJECT; arg : longint);export;
procedure done_cb(obj : PFL_OBJECT; arg : longint);cdecl;
begin
halt(0);
end;
procedure style_cb(obj : PFL_OBJECT; arg : Longint);export;
procedure style_cb(obj : PFL_OBJECT; arg : Longint);cdecl;
begin
fl_set_object_lstyle(ui^.textobj, fl_get_browser(obj) - 1);
end;
procedure size_cb(obj : PFL_OBJECT; arg : longint); export;
procedure size_cb(obj : PFL_OBJECT; arg : longint); cdecl;
begin
case fl_get_browser(obj) of
1: fl_set_object_lsize(ui^.textobj,8);

View File

@ -20,7 +20,7 @@ var
{ The call back routine }
function handle_it(obj : PFL_OBJECT; event : longint;
mx,my : TFL_Coord;
key : longint; ev : pointer) : longint;export;
key : longint; ev : pointer) : longint;cdecl;
begin
exit;
@ -43,7 +43,7 @@ begin
handle_it:=0;
end;
procedure done(ob : PFL_OBJECT; data : longint); export;
procedure done(ob : PFL_OBJECT; data : longint); cdecl;
begin
halt(0)

View File

@ -29,7 +29,7 @@ PFD_objsform = ^TFD_objsform;
var fd_objsform : PFD_objsform;
{ callbacks for form objsform }
procedure show_group(ob : PFL_OBJECT;data: longint);export;
procedure show_group(ob : PFL_OBJECT;data: longint);cdecl;
var i : longint;

View File

@ -9,13 +9,13 @@ type TFD_INPUT = record
end;
PFD_INPUT = ^TFD_input;
procedure done_cb( ob : PFL_OBJECT; data : longint);export;
procedure done_cb( ob : PFL_OBJECT; data : longint);cdecl;
begin
halt(0);
end;
procedure input_cb( ob : PFL_OBJECT; data : longint);export;
procedure input_cb( ob : PFL_OBJECT; data : longint);cdecl;
var
cx, cy, pos : Longint;
@ -29,7 +29,7 @@ begin
fl_set_object_label( PFD_input(ob^.form^.fdui)^.report,@buf[1]);
end;
procedure hide_show_cb(ob : PFL_OBJECT; data : longint);export;
procedure hide_show_cb(ob : PFL_OBJECT; data : longint);cdecl;
var fd: PFD_input;

View File

@ -14,7 +14,7 @@ PFD_inv=^TFD_inv;
var ui : PFD_INV;
procedure invert_it(ob : PFL_OBJECT; data : longint);export;
procedure invert_it(ob : PFL_OBJECT; data : longint);cdecl;
begin
if (fl_get_button(ob)<>0) then

View File

@ -17,14 +17,14 @@ var fd_form0 : PFD_form0;
align :integer;
Procedure align_cb(ob : PFL_OBJECT; n : longint);export;
Procedure align_cb(ob : PFL_OBJECT; n : longint);cdecl;
begin
if fl_get_button(fd_form0^.inside)<>0 then
n:=n or FL_ALIGN_INSIDE;
fl_set_object_lalign(fd_form0^.box, n);
end;
Procedure inside_cb(Ob : PFL_OBJECT; data : longint);export;
Procedure inside_cb(Ob : PFL_OBJECT; data : longint);cdecl;
begin
if fl_get_button(ob)<>0 then

View File

@ -19,7 +19,7 @@ var
xypui : PFD_axypform;
{ callbacks for form axypform }
Procedure xyplot_cb(ob : PFL_OBJECT; data : longint);export;
Procedure xyplot_cb(ob : PFL_OBJECT; data : longint);cdecl;
var
@ -37,13 +37,13 @@ begin
end;
Procedure alwaysreturn_cb(ob : PFL_OBJECT; data : longint); export;
Procedure alwaysreturn_cb(ob : PFL_OBJECT; data : longint); cdecl;
begin
fl_set_xyplot_return(xypui^.xyplot, fl_get_button(ob));
end;
procedure interpolate_cb(ob : PFL_OBJECT; data : longint);export;
procedure interpolate_cb(ob : PFL_OBJECT; data : longint);cdecl;
begin
if fl_get_button(ob)=0 then
@ -52,14 +52,14 @@ begin
fl_set_xyplot_interpolate(xypui^.xyplot, 0,0,0.2);
end;
Procedure inspect_cb(ob : PFL_OBJECT; data :longint); export;
Procedure inspect_cb(ob : PFL_OBJECT; data :longint); cdecl;
begin
fl_set_xyplot_inspect(xypui^.xyplot, fl_get_button(ob));
end;
procedure notic_cb(ob : PFL_OBJECT; data :longint); export;
procedure notic_cb(ob : PFL_OBJECT; data :longint); cdecl;
var notic : Longint;

View File

@ -16,7 +16,7 @@ Var menu,abox : array[0..3] of PFL_OBJECT;
i, j : longint;
procedure menu_cb(ob : PFL_OBJECT; m : longint);export;
procedure menu_cb(ob : PFL_OBJECT; m : longint);cdecl;
var i,item : longint;
@ -39,7 +39,7 @@ begin
fl_set_object_color(abox[m], FL_BLACK+item, FL_BLACK);
end;
procedure done_cb(ob : PFL_OBJECT; data : longint) ; export;
procedure done_cb(ob : PFL_OBJECT; data : longint) ; cdecl;
begin
halt;

View File

@ -2,7 +2,7 @@ program minput;
uses xforms;
procedure input_cb( ob : PFL_OBJECT; data : Longint);export;
procedure input_cb( ob : PFL_OBJECT; data : Longint);cdecl;
var
x, y : Longint;

View File

@ -14,7 +14,7 @@ Const FL_CROSSBUTTON=2000;
type TSPEC = TFL_BUTTON_STRUCT;
PSPEC = ^TSPEC;
Procedure draw_crossbutton(ob : PFL_OBJECT);export;
Procedure draw_crossbutton(ob : PFL_OBJECT);cdecl;
var temp : longint;
xx, yy, ww, hh ,tt : TFL_Coord;

View File

@ -14,7 +14,7 @@ form : PFL_FORM;
group,
firstbut : PFL_OBJECT;
procedure exit_cb(obj : PFL_OBJECT; arg : longint); export;
procedure exit_cb(obj : PFL_OBJECT; arg : longint); cdecl;
begin
halt;
end;
@ -35,7 +35,7 @@ begin
end
end;
Procedure setit_cb(obj : PFL_OBJECT; val : longint); export;
Procedure setit_cb(obj : PFL_OBJECT; val : longint); cdecl;
begin
setit (obj,val)
@ -50,7 +50,7 @@ begin
setit(button4,b4);
end;
Procedure set_active(obj : PFL_OBJECT; arg : longint); export;
Procedure set_active(obj : PFL_OBJECT; arg : longint); cdecl;
begin
case arg of

View File

@ -6,7 +6,7 @@ const
dx : TFL_Coord = 11 ;
dy : TFL_Coord = 7 ;
procedure move_cb(ob : PFL_OBJECT; data : longint);export;
procedure move_cb(ob : PFL_OBJECT; data : longint);cdecl;
var
but : PFL_OBJECT;

View File

@ -23,7 +23,7 @@ var
fd_form0 : PFD_form;
{ callbacks for form form0 }
procedure return_cb(ob : PFL_OBJECT; data : longint); export;
procedure return_cb(ob : PFL_OBJECT; data : longint); cdecl;
begin
fl_addto_browser(fd_form0^.br, pchar(data));
@ -38,7 +38,7 @@ begin
fl_set_object_return(fd_form0^.obj[3], n);
end;
procedure when_cb(ob : PFL_OBJECT; data : longint); export;
procedure when_cb(ob : PFL_OBJECT; data : longint); cdecl;
var n : longint;
@ -48,7 +48,7 @@ begin
set_when(n);
end;
procedure resetlog_cb(ob : PFL_OBJECT; data : longint);export;
procedure resetlog_cb(ob : PFL_OBJECT; data : longint);cdecl;
begin
fl_clear_browser(fd_form0^.br);

View File

@ -21,7 +21,7 @@ begin
fl_set_object_label(yval,@st[1]);
end;
procedure positioner_cb(ob :PFL_OBJECT; q : longint);export;
procedure positioner_cb(ob :PFL_OBJECT; q : longint);cdecl;
begin
Do_Position (ob,q);

View File

@ -6,7 +6,7 @@ uses xforms;
var form : PFL_FORM;
Abox : array[0..8] of PFL_OBJECT;
procedure push_cb( ob : PFL_OBJECT; n : longint);export;
procedure push_cb( ob : PFL_OBJECT; n : longint);cdecl;
begin
if (fl_get_button(ob)<>0) then

View File

@ -1,14 +1,14 @@
{ This demo shows the use of a touch buttons. }
program touchbutton;
uses strings,forms;
uses strings,xforms;
var form : PFL_FORM;
valobj,obj : PFL_OBJECT;
value : LongInt;
Procedure show_val(ob : PFL_OBJECT;delta : Longint);export;
Procedure show_val(ob : PFL_OBJECT;delta : Longint);cdecl;
var st : string[32];