diff --git a/bepascal/bepascal/be/app/application.pp b/bepascal/bepascal/be/app/application.pp index 0c2cbd1..9fc0951 100644 --- a/bepascal/bepascal/be/app/application.pp +++ b/bepascal/bepascal/be/app/application.pp @@ -21,7 +21,7 @@ unit Application; interface uses - beobj, looper, appdefs, supportdefs, message, os; + beobj, looper, appdefs, supportdefs, message, os, fdblib; type TApplication = class(TLooper) @@ -98,18 +98,18 @@ end; procedure TApplication.AppActivated(Active : boolean); begin {$IFDEF DEBUG} - WriteLn(Active); + SendText(Active); if Active then - WriteLn('Application activée !') + SendText('Application activée !') else - WriteLn('Application désactivée !'); + SendText('Application désactivée !'); {$ENDIF} end; procedure Application_ReadyToRun_hook_func(Application : TApplication); cdecl; begin {$IFDEF DEBUG} - WriteLn('Hook ReadyToRun !'); + SendText('Hook ReadyToRun !'); {$ENDIF} if Application <> nil then Application.ReadyToRun; @@ -120,7 +120,7 @@ var Message : TMessage; begin {$IFDEF DEBUG} - WriteLn('Hook MessageReceived !'); + SendText('Hook MessageReceived !'); {$ENDIF} Message := TMessage.Wrap(aMessage); try @@ -134,7 +134,7 @@ end; procedure TApplication.ReadyToRun; begin {$IFDEF DEBUG} - WriteLn('Prêt à démarer !'); + SendText('Prêt à démarer !'); {$ENDIF} end; @@ -170,4 +170,4 @@ finalization Application_ReadyToRun_hook := nil; be_app := nil; -end. \ No newline at end of file +end. diff --git a/bepascal/bepascal/be/app/handler.pp b/bepascal/bepascal/be/app/handler.pp index 3a87cf0..543421c 100644 --- a/bepascal/bepascal/be/app/handler.pp +++ b/bepascal/bepascal/be/app/handler.pp @@ -21,7 +21,7 @@ unit handler; interface uses - beobj, archivable, message; + beobj, archivable, message, fdblib; type THandler = class(TArchivable) @@ -40,8 +40,8 @@ var procedure THandler.MessageReceived(aMessage : TMessage); begin {$IFDEF DEBUG} - WriteLn(ClassName + '.MessageReceived'); - WriteLn('Message reçue'); + SendText(ClassName + '.MessageReceived'); + SendText('Message reçue'); aMessage.PrintToStream; {$ENDIF} end; @@ -52,7 +52,7 @@ var begin try {$IFDEF DEBUG} - WriteLn('Hook MessageReceived !'); + SendText('Hook MessageReceived !'); {$ENDIF} Message := TMessage.Wrap(aMessage); try @@ -65,7 +65,7 @@ begin on e : exception do begin {$IFDEF DEBUG} - WriteLn(e.Message + 'Handler_MessageReceived'); + SendText(e.Message + 'Handler_MessageReceived'); {$ENDIF} end; end @@ -77,4 +77,4 @@ initialization finalization Handler_MessageReceived_hook := nil; -end. \ No newline at end of file +end. diff --git a/bepascal/bepascal/be/app/messenger.pp b/bepascal/bepascal/be/app/messenger.pp index dcb399f..2eaeccc 100644 --- a/bepascal/bepascal/be/app/messenger.pp +++ b/bepascal/bepascal/be/app/messenger.pp @@ -89,6 +89,9 @@ function BMessenger_Team(AObject : TCPlusObject) : TTeam_id; cdecl; external BeP //procedure BMessenger_bool extra3(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMessenger_bool extra3'; //procedure BMessenger_bool extra4(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BMessenger_bool extra4'; +var + be_app_messenger : TMessenger; + implementation constructor TMessenger.Create; @@ -236,5 +239,10 @@ end; // BMessenger_bool extra4(CPlusObject); //end; +initialization + be_app_messenger := nil; + +finalization + be_app_messenger := nil; end. diff --git a/bepascal/bepascal/be/bepas_kernel/beobj.pp b/bepascal/bepascal/be/bepas_kernel/beobj.pp index 16feddc..92e1141 100644 --- a/bepascal/bepascal/be/bepas_kernel/beobj.pp +++ b/bepascal/bepascal/be/bepas_kernel/beobj.pp @@ -22,6 +22,9 @@ interface {$M+} +uses + fdblib; + // FreePascal use ld on BeOS (like on LINUX) to link to libraries. // ld use the environment variable BELIBRARIES to find libraries. @@ -93,7 +96,7 @@ begin {$IFDEF DEBUG} size := 0; size := SizeOf(Self.ClassType); - WriteLn('Instance de ' + Self.ClassName + '(' + HexStr(longint(pointer(Self)), 8) + ')' + + SendText('Instance de ' + Self.ClassName + '(' + HexStr(longint(pointer(Self)), 8) + ')' + '(' + IntToStr(size) + ')' + ' '); {$ENDIF} @@ -106,7 +109,7 @@ end; destructor TBeObject.UnWrap; begin {$IFDEF DEBUG} - WriteLn('UnWrap'); + SendText('UnWrap'); {$ENDIF} // On passe CPlusObject à nil pour éviter de libérer // l'objet C++ lors de l'appel de free @@ -120,4 +123,4 @@ initialization finalization PasObject_GetPasClassName_hook := nil; -end. \ No newline at end of file +end. diff --git a/bepascal/bepascal/be/interface/menu.pp b/bepascal/bepascal/be/interface/menu.pp index 3a58bfa..bf5d28b 100644 --- a/bepascal/bepascal/be/interface/menu.pp +++ b/bepascal/bepascal/be/interface/menu.pp @@ -22,7 +22,7 @@ interface uses beobj, view, message, archivable, SupportDefs, rect, list, - handler, messenger; + handler, messenger, fdblib; type TMenu_Info = record @@ -791,82 +791,82 @@ end; function TMenu.AddItem(item : TMenuItem) : boolean; begin - WriteLn('function TMenu.AddItem(item : TMenuItem) : boolean;'); + SendText('function TMenu.AddItem(item : TMenuItem) : boolean;'); Result := BMenu_AddItem_1(CPlusObject, item.CPlusObject); end; function TMenu.AddItem(item : TMenuItem; index : integer) : boolean; begin - WriteLn('function TMenu.AddItem(item : TMenuItem; index : integer) : boolean;'); + SendText('function TMenu.AddItem(item : TMenuItem; index : integer) : boolean;'); Result := BMenu_AddItem_2(CPlusObject, item.CPlusObject, index); end; function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean; begin - WriteLn('ici'); - WriteLn('function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean;'); + SendText('ici'); + SendText('function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean;'); frame.PrintToStream; - Writeln('toto'); + SendText('toto'); Result := BMenu_AddItem_3(CPlusObject, item.CPlusObject, frame.CPlusObject); end; function TMenu.AddItem(menu : TMenu) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu) : boolean;'); - WriteLn('Bonjour'); + SendText('function TMenu.AddItem(menu : TMenu) : boolean;'); + SendText('Bonjour'); Result := BMenu_AddItem_4(CPlusObject, menu.CPlusObject); end; function TMenu.AddItem(menu : TMenu; index : integer) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu; index : integer) : boolean;'); + SendText('function TMenu.AddItem(menu : TMenu; index : integer) : boolean;'); Result := BMenu_AddItem_5(CPlusObject, menu.CPlusObject, index); end; function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean;'); + SendText('function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean;'); Result := BMenu_AddItem_6(CPlusObject, menu.CPlusObject, frame.CPlusObject); end; {function TMenu.AddItem(item : TMenuItem) : boolean; begin - WriteLn('function TMenu.AddItem(item : TMenuItem) : boolean;'); + SendText('function TMenu.AddItem(item : TMenuItem) : boolean;'); Result := BMenu_AddItem_1(CPlusObject, item.CPlusObject); end; function TMenu.AddItem(item : TMenuItem; index : integer) : boolean; begin - WriteLn('function TMenu.AddItem(item : TMenuItem; index : integer) : boolean;'); + SendText('function TMenu.AddItem(item : TMenuItem; index : integer) : boolean;'); Result := BMenu_AddItem_2(CPlusObject, item.CPlusObject, index); end; function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean; begin - WriteLn('ici'); - WriteLn('function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean;'); + SendText('ici'); + SendText('function TMenu.AddItem(item : TMenuItem; frame : TRect) : boolean;'); frame.PrintToStream; - Writeln('toto'); + SendText('toto'); Result := BMenu_AddItem_3(CPlusObject, item.CPlusObject, frame.CPlusObject); end; function TMenu.AddItem(menu : TMenu) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu) : boolean;'); - WriteLn('Bonjour'); + SendText('function TMenu.AddItem(menu : TMenu) : boolean;'); + SendText('Bonjour'); Result := BMenu_AddItem_4(CPlusObject, menu.CPlusObject); end; function TMenu.AddItem(menu : TMenu; index : integer) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu; index : integer) : boolean;'); + SendText('function TMenu.AddItem(menu : TMenu; index : integer) : boolean;'); Result := BMenu_AddItem_5(CPlusObject, menu.CPlusObject, index); end; function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean; begin - WriteLn('function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean;'); + SendText('function TMenu.AddItem(menu : TMenu; frame : TRect) : boolean;'); Result := BMenu_AddItem_6(CPlusObject, menu.CPlusObject, frame.CPlusObject); end; } diff --git a/bepascal/bepascal/be/interface/view.pp b/bepascal/bepascal/be/interface/view.pp index 9dee859..0714208 100644 --- a/bepascal/bepascal/be/interface/view.pp +++ b/bepascal/bepascal/be/interface/view.pp @@ -22,7 +22,7 @@ interface uses beobj, handler, rect, os, application, appdefs, message, - graphicdefs; + graphicdefs, fdblib; type // TWindow = class(TBeObject); @@ -191,7 +191,7 @@ end; procedure TView.Draw(updateRect : TRect); begin - WriteLn('Drawing view'); + SendText('Drawing view'); end; @@ -516,4 +516,4 @@ initialization // View_TargetedByScrollView_hook := @View_TargetedByScrollView_hook_func; View_WindowActivated_hook := @View_WindowActivated_hook_func; -end. \ No newline at end of file +end.