diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-03-24 12:52:05 +0200 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2011-03-24 12:52:05 +0200 |
commit | 01b4f60f588a095abe37475d1d7473484aed33e0 (patch) | |
tree | a95d98b8380748320cf2f5cb035ffd2b1aecf41d | |
parent | 115a83d49e8080f4736b7c18a8d982927999003f (diff) | |
download | fpGUI-01b4f60f588a095abe37475d1d7473484aed33e0.tar.xz |
Partial undo of commit 2ffdd747.
The code change in the original commit worked fine for Windows, but caused
other problems under Linux. So I have commented the original code change
for Linux until I can find a more suitable solution.
-rw-r--r-- | src/corelib/x11/fpg_x11.pas | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas index f2a19fcd..ff5ac9ce 100644 --- a/src/corelib/x11/fpg_x11.pas +++ b/src/corelib/x11/fpg_x11.pas @@ -2232,8 +2232,13 @@ begin lmwh := 0; if fpgApplication.PrevModalForm <> nil then lmwh := TfpgX11Window(fpgApplication.PrevModalForm).WinHandle - else if FocusRootWidget <> nil then - lmwh := TfpgX11Window(FocusRootWidget).WinHandle +{ 2011-03-24: Graeme Geldenhuys + I commented code this code because it caused more problems that it solved + when multiple modal dialogs or prompts are shown in succession. + This code was originally introduced in commit 2ffdd747. I'm looking for an + alternative solution to the original problem. } +// else if FocusRootWidget <> nil then +// lmwh := TfpgX11Window(FocusRootWidget).WinHandle else if fpgApplication.MainForm <> nil then lmwh := TfpgX11Window(fpgApplication.MainForm).WinHandle; if lmwh <> 0 then |