Browse Source

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
pull/168/head
Michael R Sweet 22 years ago
parent
commit
3aebbc01dc
  1. 10
      src/Fl_mac.cxx
  2. 8
      src/fl_font_mac.cxx

10
src/Fl_mac.cxx

@ -1,5 +1,5 @@ @@ -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 @@ -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) { @@ -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 $".
//

8
src/fl_font_mac.cxx

@ -1,5 +1,5 @@ @@ -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) { @@ -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) { @@ -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 $".
//

Loading…
Cancel
Save