diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-02-26 05:25:11 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-02-26 05:25:11 +0000 |
| commit | 0d2f146f61fb61055ffcf750914168ce245305db (patch) | |
| tree | 16652bee9814d8a1fc01d170a3ceb870ccb98a57 | |
| parent | 7a6ed8c9419b914644936c7e25a2f1eb10d7c28e (diff) | |
Changes to get DND to compile under X11; get a coredump when dragging
text between different input demo windows (sometimes the target gets it,
sometimes the target dumps core, too...)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1977 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | src/fl_dnd_x.cxx | 12 | ||||
| -rw-r--r-- | src/makedepend | 6 |
3 files changed, 14 insertions, 10 deletions
@@ -1,5 +1,7 @@ -RECENT CHANGES - - drag'n'drop support for MacOS +CHANGES IN FLTK 1.1.0b12 + + - Drag'n'drop support for MacOS + CHANGES IN FLTK 1.1.0b11 diff --git a/src/fl_dnd_x.cxx b/src/fl_dnd_x.cxx index 7ac02e722..9cc4f5b82 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.1 2002/01/09 21:50:02 easysw Exp $" +// "$Id: fl_dnd_x.cxx,v 1.5.2.2 2002/02/26 05:25:11 easysw Exp $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // @@ -40,8 +40,6 @@ extern Atom fl_XdndActionCopy; extern Atom fl_XdndFinished; //extern Atom fl_XdndProxy; -extern char fl_i_own_selection; - extern void fl_sendClientMessage(Window window, Atom message, unsigned long d0, unsigned long d1=0, @@ -87,7 +85,7 @@ int Fl::dnd() { Window target_window = 0; Fl_Window* local_window = 0; int version = 4; int dest_x, dest_y; - XSetSelectionOwner(fl_display, fl_XdndSelection, fl_message_window, fl_event_time); + XSetSelectionOwner(fl_display, fl_XdndSelection, source_window, fl_event_time); while (Fl::pushed()) { @@ -134,8 +132,8 @@ int Fl::dnd() { } if (local_window) { - fl_i_own_selection = 1; - if (local_handle(FL_DND_RELEASE, local_window)) paste(*belowmouse(),false); + selection_owner(local_window); + if (local_handle(FL_DND_RELEASE, local_window)) paste(*belowmouse()); } else if (version) { fl_sendClientMessage(target_window, fl_XdndDrop, source_window, 0, fl_event_time); @@ -167,5 +165,5 @@ int Fl::dnd() { // -// End of "$Id: fl_dnd_x.cxx,v 1.5.2.1 2002/01/09 21:50:02 easysw Exp $". +// End of "$Id: fl_dnd_x.cxx,v 1.5.2.2 2002/02/26 05:25:11 easysw Exp $". // diff --git a/src/makedepend b/src/makedepend index 53abdd54a..4506f2254 100644 --- a/src/makedepend +++ b/src/makedepend @@ -314,6 +314,9 @@ fl_cursor.o: ../FL/Fl_Window.H ../FL/fl_draw.H fl_curve.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_diamond_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_diamond_box.o: ../FL/fl_draw.H +fl_dnd.o: fl_dnd_x.cxx ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H +fl_dnd.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/x.H +fl_dnd.o: ../FL/Fl_Window.H fl_draw.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_draw.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H fl_draw_image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H @@ -345,7 +348,8 @@ fl_oval_box.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_oval_box.o: ../FL/fl_draw.H fl_overlay.o: ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_overlay.o: ../FL/Fl_Window.H ../FL/fl_draw.H -fl_overlay_visual.o: ../config.h +fl_overlay_visual.o: ../config.h ../FL/Fl.H ../FL/Enumerations.H +fl_overlay_visual.o: ../FL/Fl_Export.H ../FL/x.H ../FL/Fl_Window.H fl_plastic.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H fl_plastic.o: ../FL/fl_draw.H fl_rect.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Enumerations.H |