diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-26 14:19:50 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-26 14:19:50 +0000 |
| commit | 3aebbc01dc953b21710c4a65327783f742c3bf99 (patch) | |
| tree | d949c0cd25c3ed9665ca7b1bece1324b166dd9f6 /src | |
| parent | 674dc68ed8a7b72b97487516192c090da3715f0b (diff) | |
Remove "fix" for DND code; the original code works just fine (should have
tested first on OSX...)
Get rid of compiler warning in fl_draw...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3001 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_mac.cxx | 10 | ||||
| -rw-r--r-- | src/fl_font_mac.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 038e34e7a..855b9536d 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.41 2003/05/26 14:09:00 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -1344,10 +1344,10 @@ static pascal OSErr dndReceiveHandler( WindowPtr w, void *userData, DragReferenc dst[-1] = 0; // if ( Fl::e_text[Fl::e_length-1]==0 ) Fl::e_length--; // modify, if trailing 0 is part of string Fl::e_length = dst - Fl::e_text - 1; -// target->handle(FL_PASTE); - paste(*belowmouse(), 0); +// printf("Sending following text to widget %p:\n%s\n", Fl::belowmouse(), Fl::e_text); + target->handle(FL_PASTE); free( Fl::e_text ); - + fl_dnd_target_window = 0L; breakMacEventLoop(); return noErr; @@ -1775,6 +1775,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.41 2003/05/26 14:09:00 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $". // diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index fc593403d..3fa84a291 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_font_mac.cxx,v 1.1.2.13 2003/05/21 13:23:40 easysw Exp $" +// "$Id: fl_font_mac.cxx,v 1.1.2.14 2003/05/26 14:19:50 easysw Exp $" // // MacOS font selection routines for the Fast Light Tool Kit (FLTK). // @@ -182,8 +182,8 @@ void fl_draw(const char* str, int n, int x, int y) { // First convert string to MacRoman encoding... - if (n > sizeof(buf)) - n = sizeof(buf); + if (n > (int)sizeof(buf)) + n = (int)sizeof(buf); for (i = n, bufptr = buf; i > 0; i --) *bufptr++ = macroman_lut[*str++ & 255]; @@ -195,5 +195,5 @@ void fl_draw(const char* str, int n, int x, int y) { // -// End of "$Id: fl_font_mac.cxx,v 1.1.2.13 2003/05/21 13:23:40 easysw Exp $". +// End of "$Id: fl_font_mac.cxx,v 1.1.2.14 2003/05/26 14:19:50 easysw Exp $". // |