diff options
author | Aaron M. Ucko <ucko@debian.org> | 2005-04-05 18:53:35 +0000 |
---|---|---|
committer | Aaron M. Ucko <ucko@debian.org> | 2005-04-05 18:53:35 +0000 |
commit | ae97e6788bb99e7ec192f555742be372138f91a1 (patch) | |
tree | 42601ef72ae21f9300142802c86d6986cec8d779 /src/Fl_x.cxx | |
parent | 150dee4ea4136f463cec680e9db1d53f7133232a (diff) |
Load fltk-1.1.4rc2 into branches/upstream/current.
Diffstat (limited to 'src/Fl_x.cxx')
-rw-r--r-- | src/Fl_x.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 6379a05..409ac2d 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.29 2003/05/04 21:45:46 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.30 2003/06/15 04:27:35 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -397,6 +397,7 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // called in response to FL_PASTE! Fl::e_text = fl_selection_buffer[clipboard]; Fl::e_length = fl_selection_length[clipboard]; + if (!Fl::e_text) Fl::e_text = (char *)""; receiver.handle(FL_PASTE); return; } @@ -552,7 +553,7 @@ int fl_handle(const XEvent& thisevent) bytesread += count*format/8; if (!remaining) break; } - Fl::e_text = (char*)buffer; + Fl::e_text = buffer ? (char*)buffer : (char *)""; Fl::e_length = bytesread; fl_selection_requestor->handle(FL_PASTE); // Detect if this paste is due to Xdnd by the property name (I use @@ -1267,5 +1268,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.29 2003/05/04 21:45:46 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.30 2003/06/15 04:27:35 easysw Exp $". // |