diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2010-09-14 13:15:32 +0200 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2010-09-23 16:24:33 +0200 |
| commit | 02727577acd550c1df78af2d3be4637de6b45ca9 (patch) | |
| tree | 81ccfd97e3d94df7ea51b5953fa24d3590a05c5c /src/corelib | |
| parent | c932356e64eee5c8d0ab8d85c8a6240b4c6c9866 (diff) | |
| download | fpGUI-02727577acd550c1df78af2d3be4637de6b45ca9.tar.xz | |
Renamed DND fpGUI message constants to keep with existing naming convention.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/fpg_base.pas | 4 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_x11.pas | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas index ba73bdf3..418903b6 100644 --- a/src/corelib/fpg_base.pas +++ b/src/corelib/fpg_base.pas @@ -98,8 +98,8 @@ const FPGM_POPUPCLOSE = 17; FPGM_HINTTIMER = 18; FPGM_FREEME = 19; - FPGM_DROPACTIVE = 20; - FPGM_DROPINACTIVE = 21; + FPGM_DROPENTER = 20; + FPGM_DROPEXIT = 21; FPGM_USER = 50000; FPGM_KILLME = MaxInt; diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas index df507a48..d9a55efb 100644 --- a/src/corelib/x11/fpg_x11.pas +++ b/src/corelib/x11/fpg_x11.pas @@ -19,7 +19,8 @@ unit fpg_x11; {$mode objfpc}{$H+} -{.$Define DEBUG} +{.$Define DEBUG} // general debugging - mostly OS messages though +{$Define DNDDEBUG} // drag-n-drop specific debugging { TODO : Compiz effects: Menu popup with correct window hint. Same for Combo dropdown window. } @@ -768,7 +769,7 @@ begin if FLastDropTarget <> 0 then begin fillchar(msgp, sizeof(msgp), 0); - fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPINACTIVE, msgp); + fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPEXIT, msgp); end; FDNDTypeList.Clear; FActionType := 0; @@ -810,7 +811,7 @@ begin if FLastDropTarget <> lTargetWinHandle then begin fillchar(msgp, sizeof(msgp), 0); - fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPINACTIVE, msgp); + fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPEXIT, msgp); end; FLastDropTarget := lTargetWinHandle; if TfpgWidget(w).AcceptDrops then @@ -819,7 +820,7 @@ begin fillchar(msgp, sizeof(msgp), 0); msgp.mouse.x := dx; msgp.mouse.y := dy; - fpgPostMessage(nil, w, FPGM_DROPACTIVE, msgp); + fpgPostMessage(nil, w, FPGM_DROPENTER, msgp); end; end; end; @@ -829,7 +830,7 @@ begin if FLastDropTarget <> lTargetWinHandle then begin fillchar(msgp, sizeof(msgp), 0); - fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPINACTIVE, msgp); + fpgPostMessage(nil, FindWindowByHandle(FLastDropTarget), FPGM_DROPEXIT, msgp); end; FLastDropTarget := lTargetWinHandle; end; @@ -1346,7 +1347,6 @@ begin // WM_PROTOCOLS message if Assigned(w) and (ev.xclient.message_type = xia_wm_protocols) then begin - //WriteLn(XGetAtomName(FDisplay, TAtom(ev.xclient.data.l[0]))); if (ev.xclient.data.l[0] = netlayer.NetAtom[naWM_PING]) then begin // always respond to pings or the wm will kill us |