diff --git a/bepascal/bepascal/be/app/application.pp b/bepascal/bepascal/be/app/application.pp index b2193b4..0c2cbd1 100644 --- a/bepascal/bepascal/be/app/application.pp +++ b/bepascal/bepascal/be/app/application.pp @@ -97,16 +97,20 @@ end; procedure TApplication.AppActivated(Active : boolean); begin +{$IFDEF DEBUG} WriteLn(Active); if Active then WriteLn('Application activée !') else WriteLn('Application désactivée !'); +{$ENDIF} end; procedure Application_ReadyToRun_hook_func(Application : TApplication); cdecl; begin +{$IFDEF DEBUG} WriteLn('Hook ReadyToRun !'); +{$ENDIF} if Application <> nil then Application.ReadyToRun; end; @@ -115,7 +119,9 @@ procedure Application_MessageReceived_hook_func(Application : TApplication; aMes var Message : TMessage; begin +{$IFDEF DEBUG} WriteLn('Hook MessageReceived !'); +{$ENDIF} Message := TMessage.Wrap(aMessage); try if Application <> nil then @@ -127,7 +133,9 @@ end; procedure TApplication.ReadyToRun; begin +{$IFDEF DEBUG} WriteLn('Prêt à démarer !'); +{$ENDIF} end; procedure TApplication.ShowCursor; @@ -153,7 +161,6 @@ end; // end TApplication initialization - WriteLn('Initialisation'); be_app := nil; Application_AppActivated_hook := @Application_AppActivated_hook_func; Application_ReadyToRun_hook := @Application_ReadyToRun_hook_func; diff --git a/bepascal/bepascal/be/app/handler.pp b/bepascal/bepascal/be/app/handler.pp index 7980fce..3a87cf0 100644 --- a/bepascal/bepascal/be/app/handler.pp +++ b/bepascal/bepascal/be/app/handler.pp @@ -39,9 +39,11 @@ var procedure THandler.MessageReceived(aMessage : TMessage); begin +{$IFDEF DEBUG} WriteLn(ClassName + '.MessageReceived'); WriteLn('Message reçue'); aMessage.PrintToStream; +{$ENDIF} end; procedure Handler_MessageReceived_hook_func(Handler : THandler; aMessage : TCPlusObject); cdecl; @@ -49,7 +51,9 @@ var Message : TMessage; begin try +{$IFDEF DEBUG} WriteLn('Hook MessageReceived !'); +{$ENDIF} Message := TMessage.Wrap(aMessage); try if Handler <> nil then @@ -60,7 +64,9 @@ begin except on e : exception do begin +{$IFDEF DEBUG} WriteLn(e.Message + 'Handler_MessageReceived'); +{$ENDIF} end; end end; diff --git a/bepascal/bepascal/be/app/invoker.pp b/bepascal/bepascal/be/app/invoker.pp index 2b0f9cf..fd4aa02 100644 --- a/bepascal/bepascal/be/app/invoker.pp +++ b/bepascal/bepascal/be/app/invoker.pp @@ -133,23 +133,18 @@ end; function TInvoker.SetTarget(h : THandler; loop : TLooper) : TStatus_t; begin - WriteLn('Start of SetTarget'); if loop <> nil then begin - WriteLn('Différent de nil'); Result := BInvoker_SetTarget(CPlusObject, h.CPlusObject, loop.CPlusObject); end else if h <> nil then begin - WriteLn('Egale de nil'); // Result := BInvoker_SetTarget(CPlusObject, h.CPlusObject, nil); end else begin - WriteLn('nil et nil'); Result := BInvoker_SetTarget(CPlusObject, nil, nil); end; - WriteLn('End of SetTarget'); end; function TInvoker.SetTarget(aMessenger : TMessenger) : TStatus_t; diff --git a/bepascal/bepascal/be/app/looper.pp b/bepascal/bepascal/be/app/looper.pp index adc5acf..03e3cb4 100644 --- a/bepascal/bepascal/be/app/looper.pp +++ b/bepascal/bepascal/be/app/looper.pp @@ -48,12 +48,10 @@ var procedure TLooper.DispatchMessage(aMessage : TMessage; aTarget : THandler); begin - WriteLn('Looper.DispatchMessage'); end; function TLooper.QuitRequested() : boolean; begin - WriteLn('Looper.QuitRequested'); Result := True; end; @@ -75,7 +73,6 @@ var Message : TMessage; Target : THandler; begin - WriteLn('Hook DispatchMessage !'); Message := TMessage.Wrap(aMessage); try Target := THandler.Wrap(aTarget); @@ -91,7 +88,6 @@ end; function Looper_QuitRequested_hook_func(Looper : TLooper) : boolean; cdecl; begin - WriteLn('Hook QuitRequested !'); if Looper <> nil then Result := Looper.QuitRequested(); end; diff --git a/bepascal/bepascal/be/bepas_kernel/beobj.pp b/bepascal/bepascal/be/bepas_kernel/beobj.pp index 4a378b3..16feddc 100644 --- a/bepascal/bepascal/be/bepas_kernel/beobj.pp +++ b/bepascal/bepascal/be/bepas_kernel/beobj.pp @@ -90,11 +90,13 @@ procedure TBeObject.Debug; var size : cardinal; begin +{$IFDEF DEBUG} size := 0; size := SizeOf(Self.ClassType); WriteLn('Instance de ' + Self.ClassName + '(' + HexStr(longint(pointer(Self)), 8) + ')' + '(' + IntToStr(size) + ')' + ' '); +{$ENDIF} end; // Destructeur utilisé pour libérer l'objet pascal sans // détruire l'objet C++ correspondant. Utile pour @@ -103,7 +105,9 @@ end; // (cas des messages passés aux fonctions de rappel) destructor TBeObject.UnWrap; begin +{$IFDEF DEBUG} WriteLn('UnWrap'); +{$ENDIF} // On passe CPlusObject à nil pour éviter de libérer // l'objet C++ lors de l'appel de free Self.CPlusObject := nil; diff --git a/bepascal/bepascal/be/interface/Window.cpp b/bepascal/bepascal/be/interface/Window.cpp index bb338d0..c76be05 100644 --- a/bepascal/bepascal/be/interface/Window.cpp +++ b/bepascal/bepascal/be/interface/Window.cpp @@ -55,7 +55,7 @@ void BPWindow::MessageReceived(BMessage *message) { MessageReceived_hookCall(message); BWindow::MessageReceived(message); - message->PrintToStream(); +// message->PrintToStream(); } void BPWindow::DispatchMessage(BMessage *message, BHandler *target) diff --git a/bepascal/bepascal/be/interface/button.pp b/bepascal/bepascal/be/interface/button.pp index dc5a097..f386bd6 100644 --- a/bepascal/bepascal/be/interface/button.pp +++ b/bepascal/bepascal/be/interface/button.pp @@ -125,7 +125,6 @@ end; constructor TButton.Create(frame : TRect; name, aLabel : PChar; message : TMessage; resizingMode, flags : Cardinal); begin CreatePas; - WriteLn('Creation bouton'); CPlusObject := BButton_Create(Self, frame.CPlusObject, name, aLabel, message.CPlusObject, resizingMode, flags); end; @@ -182,7 +181,6 @@ end; procedure TButton.MessageReceived(msg : TMessage); begin - WriteLn('Bonjour, ici le bouton !'); // BButton_MessageReceived(CPlusObject, msg.CPlusObject); end; diff --git a/bepascal/bepascal/be/interface/control.pp b/bepascal/bepascal/be/interface/control.pp index cf8ca8f..110398e 100644 --- a/bepascal/bepascal/be/interface/control.pp +++ b/bepascal/bepascal/be/interface/control.pp @@ -358,9 +358,7 @@ function TControl.GetInvoker : TInvoker; begin if FInvoker = nil then begin - WriteLn('Before GetInvoker'); Result := TInvoker.Wrap(CPlusObject); - WriteLn('After GetInvoker'); end; Result := FInvoker; end; diff --git a/bepascal/bepascal/be/interface/view.pp b/bepascal/bepascal/be/interface/view.pp index 8f59f44..65b0626 100644 --- a/bepascal/bepascal/be/interface/view.pp +++ b/bepascal/bepascal/be/interface/view.pp @@ -235,13 +235,11 @@ end; procedure TView.WindowActivated(active : boolean); begin -// WriteLn('WindowActivated in View'); end; procedure TView.MessageReceived(aMessage : TMessage); begin inherited; - WriteLn('View.MessageReceived, PASCAL'); end; function TView.RemoveSelf : boolean; diff --git a/bepascal/bepascal/be/interface/window.pp b/bepascal/bepascal/be/interface/window.pp index 48b8186..e13efe0 100644 --- a/bepascal/bepascal/be/interface/window.pp +++ b/bepascal/bepascal/be/interface/window.pp @@ -462,8 +462,7 @@ end; procedure TWindow.DispatchMessage(message : TMessage; handler : THandler); begin - WriteLn(ClassName); - message.PrintToStream; + end; procedure TWindow.MessageReceived(message : TMessage); diff --git a/bepascal/bepascal/be/support/archivable.pp b/bepascal/bepascal/be/support/archivable.pp index 20f0e3f..322f458 100644 --- a/bepascal/bepascal/be/support/archivable.pp +++ b/bepascal/bepascal/be/support/archivable.pp @@ -41,12 +41,10 @@ var function Archivable_Instantiate_hook_func(from : TCPlusObject) : TCPlusObject; begin - WriteLn('Bonjour'); end; function Archivable_Archive_hook_func(into : TCPlusObject; deep : boolean) : TCPlusObject; begin - WriteLn('Bonjour'); end; initialization