Message Dialog buttons now use translated text.

Initializing the cMsgDlgBtnText when it was declared is too early
and the translated strings have not yet been loaded. We we update
the array a bit later to make sure it is correct.

2 files changed, 15 insertions, 1 deletions

diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index 871efe74..64c224d4 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -1158,6 +1158,20 @@ begin
   SetLength(FalseBoolStrs,1);
   TrueBoolStrs[0]   := rsTrue;
   FalseBoolStrs[0]  := rsFalse;
+
+  // Dialog box button captions
+  cMsgDlgBtnText[mbOK]        := rsOK;
+  cMsgDlgBtnText[mbCancel]    := rsCancel;
+  cMsgDlgBtnText[mbYes]       := rsYes;
+  cMsgDlgBtnText[mbNo]        := rsNo;
+  cMsgDlgBtnText[mbAbort]     := rsAbort;
+  cMsgDlgBtnText[mbRetry]     := rsRetry;
+  cMsgDlgBtnText[mbIgnore]    := rsIgnore;
+  cMsgDlgBtnText[mbAll]       := rsAll;
+  cMsgDlgBtnText[mbNoToAll]   := rsNoToAll;
+  cMsgDlgBtnText[mbYesToAll]  := rsYesToAll;
+  cMsgDlgBtnText[mbHelp]      := rsHelp;
+  cMsgDlgBtnText[mbClose]     := rsClose;
 end;
 
 procedure TfpgApplication.SetHintPause(const AValue: Integer);
diff --git a/src/corelib/fpg_widget.pas b/src/corelib/fpg_widget.pas
index f0daec81..4a146ada 100644
--- a/src/corelib/fpg_widget.pas
+++ b/src/corelib/fpg_widget.pas
@@ -429,7 +429,7 @@ begin
   writeln('TfpgWidget.Destroy [', Classname, '.', Name, ']');
   {$ENDIF}
   HandleHide;
-  inherited;
+  inherited Destroy;
 end;
 
 procedure TfpgWidget.AfterConstruction;