diff options
| author | Manolo Gouy <Manolo> | 2016-05-04 05:59:18 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-05-04 05:59:18 +0000 |
| commit | e6b4af2c476cb32f71a2daf49032af0b575e6f41 (patch) | |
| tree | 295190f03c3f81f4a5ebedc758796ada2b04591b | |
| parent | d47b431750f545a2066e6d4a07e69b5088a7396f (diff) | |
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
| -rw-r--r-- | examples/clipboard.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_x.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/clipboard.cxx b/examples/clipboard.cxx index 3aa451d1c..5a2b10383 100644 --- a/examples/clipboard.cxx +++ b/examples/clipboard.cxx @@ -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 diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 64980ca11..b6dd69673 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -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, |