Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure Fl::event_text() is not NULL. (STR #70)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3030 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2003-06-15 04:27:35 +00:00
parent 1bde669d75
commit 7f15f8d97f
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.4 CHANGES IN FLTK 1.1.4
- Fl::event_text() was sometimes initialized to NULL
instead of an empty string (STR #70)
- fl_draw() didn't properly handle a trailing escaped - fl_draw() didn't properly handle a trailing escaped
"@" character (STR #84) "@" character (STR #84)
- Added documentation for all forms of - Added documentation for all forms of
src/Fl_mac.cxx
+3 -2
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_mac.cxx,v 1.1.2.46 2003/06/09 18:53:06 matthiaswm Exp $" // "$Id: Fl_mac.cxx,v 1.1.2.47 2003/06/15 04:27:35 easysw Exp $"
// //
// MacOS specific code for the Fast Light Tool Kit (FLTK). // MacOS specific code for the Fast Light Tool Kit (FLTK).
// //
@@ -1857,12 +1857,13 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
} }
Fl::e_text = fl_selection_buffer[clipboard]; Fl::e_text = fl_selection_buffer[clipboard];
Fl::e_length = fl_selection_length[clipboard]; Fl::e_length = fl_selection_length[clipboard];
if (!Fl::e_text) Fl::e_text = (char *)"";
receiver.handle(FL_PASTE); receiver.handle(FL_PASTE);
return; return;
} }
// //
// End of "$Id: Fl_mac.cxx,v 1.1.2.46 2003/06/09 18:53:06 matthiaswm Exp $". // End of "$Id: Fl_mac.cxx,v 1.1.2.47 2003/06/15 04:27:35 easysw Exp $".
// //
src/Fl_win32.cxx
+4 -2
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_win32.cxx,v 1.33.2.37.2.46 2003/06/12 01:36:18 easysw Exp $" // "$Id: Fl_win32.cxx,v 1.33.2.37.2.47 2003/06/15 04:27:35 easysw Exp $"
// //
// WIN32-specific code for the Fast Light Tool Kit (FLTK). // WIN32-specific code for the Fast Light Tool Kit (FLTK).
// //
@@ -397,6 +397,8 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) {
// called in response to FL_PASTE! // called in response to FL_PASTE!
Fl::e_text = fl_selection_buffer[clipboard]; Fl::e_text = fl_selection_buffer[clipboard];
Fl::e_length = fl_selection_length[clipboard]; Fl::e_length = fl_selection_length[clipboard];
if (!Fl::e_text) Fl::e_text = (char *)"";
receiver.handle(FL_PASTE); receiver.handle(FL_PASTE);
} else { } else {
if (!OpenClipboard(NULL)) return; if (!OpenClipboard(NULL)) return;
@@ -1193,5 +1195,5 @@ void Fl_Window::make_current() {
} }
// //
// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.46 2003/06/12 01:36:18 easysw Exp $". // End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.47 2003/06/15 04:27:35 easysw Exp $".
// //
src/Fl_x.cxx
+4 -3
View File
@@ -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). // 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! // called in response to FL_PASTE!
Fl::e_text = fl_selection_buffer[clipboard]; Fl::e_text = fl_selection_buffer[clipboard];
Fl::e_length = fl_selection_length[clipboard]; Fl::e_length = fl_selection_length[clipboard];
if (!Fl::e_text) Fl::e_text = (char *)"";
receiver.handle(FL_PASTE); receiver.handle(FL_PASTE);
return; return;
} }
@@ -552,7 +553,7 @@ int fl_handle(const XEvent& thisevent)
bytesread += count*format/8; bytesread += count*format/8;
if (!remaining) break; if (!remaining) break;
} }
Fl::e_text = (char*)buffer; Fl::e_text = buffer ? (char*)buffer : (char *)"";
Fl::e_length = bytesread; Fl::e_length = bytesread;
fl_selection_requestor->handle(FL_PASTE); fl_selection_requestor->handle(FL_PASTE);
// Detect if this paste is due to Xdnd by the property name (I use // Detect if this paste is due to Xdnd by the property name (I use
@@ -1267,5 +1268,5 @@ void Fl_Window::make_current() {
#endif #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 $".
// //