Fix how to access clipboard content at program start.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11710 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-05-04 05:59:18 +00:00
parent d47b431750
commit e6b4af2c47
2 changed files with 2 additions and 4 deletions

View File

@ -155,9 +155,7 @@ int main(int argc, char **argv)
win->end();
win->resizable(tabs);
win->show(argc,argv);
#if defined(__APPLE__) || defined(WIN32)
clip_callback(1, tabs); // use clipboard content at start
#endif
Fl::add_clipboard_notify(clip_callback, tabs); // will update with new clipboard content immediately or at application activation
Fl_Image::RGB_scaling(FL_RGB_SCALING_BILINEAR); // set bilinear image scaling method

View File

@ -774,8 +774,8 @@ int Fl_X11_System_Driver::clipboard_contains(const char *type)
if (event.type == SelectionNotify && event.xselection.property == None) return 0;
i++;
}
while (i < 10 && event.type != SelectionNotify);
if (i >= 10) return 0;
while (i < 20 && event.type != SelectionNotify);
if (i >= 20) return 0;
XGetWindowProperty(fl_display,
event.xselection.requestor,
event.xselection.property,