From 0ae90dd6225dbaeb7a04df1de0d49a9a2c374e1b Mon Sep 17 00:00:00 2001 From: marc Date: Sat, 10 Sep 2005 16:09:23 +0000 Subject: [PATCH] * Updated with the latest widgetset changes git-svn-id: trunk@7662 - --- lcl/interfaces/qt/interfaces.pp | 11 ++++------- lcl/interfaces/qt/qtint.pp | 6 +----- lcl/interfaces/qt/qtobject.inc | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lcl/interfaces/qt/interfaces.pp b/lcl/interfaces/qt/interfaces.pp index 930a85f06f..0dc664fe25 100644 --- a/lcl/interfaces/qt/interfaces.pp +++ b/lcl/interfaces/qt/interfaces.pp @@ -30,22 +30,19 @@ unit interfaces; interface uses - InterfaceBase; - -var - InterfaceObject : TWidgetSet; + InterfaceBase; implementation uses - QTInt; + QTInt, Forms; initialization - InterfaceObject := TQtWidgetSet.Create; + WidgetSet := TQtWidgetSet.Create; finalization - InterfaceObject.Free; + WidgetSet.Free; end. diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index 445d246830..4656d5b686 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -54,7 +54,7 @@ type procedure SetCallback(Msg : LongInt; Sender : TObject); override; procedure RemoveCallbacks(Sender : TObject); override; procedure DoEvents; override; - procedure HandleEvents; override; + procedure AppProcessMessages; override; procedure AppTerminate; override; procedure Init; override; end; @@ -224,7 +224,3 @@ finalization KeyStateList.Free; end. - - - - diff --git a/lcl/interfaces/qt/qtobject.inc b/lcl/interfaces/qt/qtobject.inc index 35fd788a2e..df8005ec6c 100644 --- a/lcl/interfaces/qt/qtobject.inc +++ b/lcl/interfaces/qt/qtobject.inc @@ -160,7 +160,7 @@ procedure TQtWidgetSet.DoEvents; begin Assert(False, 'Trace:*******QT ENGINE HAS ENTERED EVENT ITTERATOR*******'); end; -procedure TQtWidgetSet.HandleEvents; +procedure TQtWidgetSet.AppProcessMessages; begin MainLoop; end;