diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-01-10 13:00:20 +0200 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-01-10 13:00:20 +0200 |
commit | 20a8b28526e297e5190b842527b755432381241a (patch) | |
tree | 84611721382f98ac08c201fca7ce65eeb229acdf /src/corelib | |
parent | 93b87b388879046a78f4b56fccdf3e6f80bb5080 (diff) | |
download | fpGUI-20a8b28526e297e5190b842527b755432381241a.tar.xz |
DoMessagesPending() renamed to MessagesPending()
Also made MessagesPending() a virtual abstract method in fpg_base.pas
which every fpGUI backend must supply an implementation.
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/fpg_base.pas | 1 | ||||
-rw-r--r-- | src/corelib/fpg_main.pas | 2 | ||||
-rw-r--r-- | src/corelib/gdi/fpg_gdi.pas | 6 | ||||
-rw-r--r-- | src/corelib/x11/fpg_x11.pas | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas index eb23dfd0..2c18cb87 100644 --- a/src/corelib/fpg_base.pas +++ b/src/corelib/fpg_base.pas @@ -517,6 +517,7 @@ type FIsInitialized: Boolean; FModalFormStack: TList; function DoGetFontFaceList: TStringList; virtual; abstract; + function MessagesPending: boolean; virtual; abstract; function GetHelpViewer: TfpgString; virtual; public constructor Create(const AParams: string); virtual; reintroduce; diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas index a8df0e16..eea7da13 100644 --- a/src/corelib/fpg_main.pas +++ b/src/corelib/fpg_main.pas @@ -1596,7 +1596,7 @@ end; procedure TfpgApplication.ProcessMessages; begin Flush; - while DoMessagesPending do + while MessagesPending do begin WaitWindowMessage(250); Flush; diff --git a/src/corelib/gdi/fpg_gdi.pas b/src/corelib/gdi/fpg_gdi.pas index e0d28521..9c89cd53 100644 --- a/src/corelib/gdi/fpg_gdi.pas +++ b/src/corelib/gdi/fpg_gdi.pas @@ -231,10 +231,10 @@ type ActivationHook: HHOOK; function GetHiddenWindow: HWND; function DoGetFontFaceList: TStringList; override; + function MessagesPending: boolean; override; public constructor Create(const AParams: string); override; destructor Destroy; override; - function DoMessagesPending: boolean; procedure DoWaitWindowMessage(atimeoutms: integer); procedure DoFlush; function GetScreenWidth: TfpgCoord; override; @@ -1264,7 +1264,7 @@ begin inherited Destroy; end; -function TfpgGDIApplication.DoMessagesPending: boolean; +function TfpgGDIApplication.MessagesPending: boolean; var Msg: TMsg; begin @@ -1284,7 +1284,7 @@ begin else ltimerWnd := 0; - if (atimeoutms >= 0) and (not DoMessagesPending) then + if (atimeoutms >= 0) and (not MessagesPending) then begin if Assigned(FOnIdle) then OnIdle(self); diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas index e66f9344..afde5ed2 100644 --- a/src/corelib/x11/fpg_x11.pas +++ b/src/corelib/x11/fpg_x11.pas @@ -311,10 +311,10 @@ type InputContext: PXIC; FLastKeySym: TKeySym; // Used for KeyRelease event function DoGetFontFaceList: TStringList; override; + function MessagesPending: boolean; override; public constructor Create(const AParams: string); override; destructor Destroy; override; - function DoMessagesPending: boolean; procedure DoWaitWindowMessage(atimeoutms: integer); procedure DoFlush; function GetScreenWidth: TfpgCoord; override; @@ -1363,7 +1363,7 @@ begin inherited Destroy; end; -function TfpgX11Application.DoMessagesPending: boolean; +function TfpgX11Application.MessagesPending: boolean; begin Result := (XPending(display) > 0); fpgCheckTimers; |