diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
| commit | 050919103f76dbe4aebaa8ac8a1e2633713ee571 (patch) | |
| tree | 1ff838116d1bdfa2607daf40eba4a38eb2404b8c /src/fl_dnd_x.cxx | |
| parent | a6b935289ed59305318929b857bf74f671125e87 (diff) | |
More shadow variable changes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2567 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_dnd_x.cxx')
| -rw-r--r-- | src/fl_dnd_x.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fl_dnd_x.cxx b/src/fl_dnd_x.cxx index 034400c4e..24965f2c3 100644 --- a/src/fl_dnd_x.cxx +++ b/src/fl_dnd_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_dnd_x.cxx,v 1.5.2.4 2002/04/10 19:22:45 easysw Exp $" +// "$Id: fl_dnd_x.cxx,v 1.5.2.5 2002/08/09 03:17:30 easysw Exp $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // @@ -86,7 +86,7 @@ int Fl::dnd() { fl_local_grab = grabfunc; Window target_window = 0; Fl_Window* local_window = 0; - int version = 4; int dest_x, dest_y; + int dndversion = 4; int dest_x, dest_y; XSetSelectionOwner(fl_display, fl_XdndSelection, fl_message_window, fl_event_time); while (Fl::pushed()) { @@ -110,25 +110,25 @@ int Fl::dnd() { if (new_window != target_window) { if (local_window) { local_handle(FL_DND_LEAVE, local_window); - } else if (version) { + } else if (dndversion) { fl_sendClientMessage(target_window, fl_XdndLeave, source_window); } - version = new_version; + dndversion = new_version; target_window = new_window; local_window = new_local_window; if (local_window) { local_handle(FL_DND_ENTER, local_window); - } else if (version) { + } else if (dndversion) { fl_sendClientMessage(target_window, fl_XdndEnter, source_window, - version<<24, XA_STRING, 0, 0); + dndversion<<24, XA_STRING, 0, 0); } } if (local_window) { local_handle(FL_DND_DRAG, local_window); - } else if (version) { + } else if (dndversion) { fl_sendClientMessage(target_window, fl_XdndPosition, source_window, - 0, (e_x_root<<16)|e_y_root, fl_event_time, - fl_XdndActionCopy); + 0, (e_x_root<<16)|e_y_root, fl_event_time, + fl_XdndActionCopy); } Fl::wait(); } @@ -136,9 +136,9 @@ int Fl::dnd() { if (local_window) { fl_i_own_selection[0] = 1; if (local_handle(FL_DND_RELEASE, local_window)) paste(*belowmouse(), 0); - } else if (version) { + } else if (dndversion) { fl_sendClientMessage(target_window, fl_XdndDrop, source_window, - 0, fl_event_time); + 0, fl_event_time); } else if (target_window) { // fake a drop by clicking the middle mouse button: XButtonEvent msg; @@ -167,5 +167,5 @@ int Fl::dnd() { // -// End of "$Id: fl_dnd_x.cxx,v 1.5.2.4 2002/04/10 19:22:45 easysw Exp $". +// End of "$Id: fl_dnd_x.cxx,v 1.5.2.5 2002/08/09 03:17:30 easysw Exp $". // |