Author: manolo
Date: 2011-05-29 09:29:09 -0700 (Sun, 29 May 2011)
New Revision: 8753
Log:
Attempt to fix STR #2648 by testing all X-API return codes.
Modified:
branches/branch-1.3/src/Fl_x.cxx
Modified: branches/branch-1.3/src/Fl_x.cxx
===================================================================
--- branches/branch-1.3/src/Fl_x.cxx 2011-05-29 08:44:01 UTC (rev 8752)
+++ branches/branch-1.3/src/Fl_x.cxx 2011-05-29 16:29:09 UTC (rev 8753)
@@ -1998,17 +1998,23 @@
if (win->parent() || !win->border()) {
this->print_widget(win, x_offset, y_offset);
return;
- }
+ }
Fl_Display_Device::display_device()->set_current();
win->show();
Fl::check();
win->make_current();
Window root, parent, *children, child_win, from;
- unsigned n;
- int bx, bt;
+ unsigned n = 0;
+ int bx, bt, do_it;
from = fl_window;
- XQueryTree(fl_display, fl_window, &root, &parent, &children, &n); if (n)
XFree(children);
- XTranslateCoordinates(fl_display, fl_window, parent, 0, 0, &bx, &bt,
&child_win);
+ do_it = (XQueryTree(fl_display, fl_window, &root, &parent, &children, &n) !=
0 &&
+ XTranslateCoordinates(fl_display, fl_window, parent, 0, 0, &bx, &bt,
&child_win) == True);
+ if (n) XFree(children);
+ if (!do_it) {
+ this->set_current();
+ this->print_widget(win, x_offset, y_offset);
+ return;
+ }
fl_window = parent;
uchar *top_image = 0, *left_image = 0, *right_image = 0, *bottom_image = 0;
top_image = fl_read_image(NULL, 0, 0, - (win->w() + 2 * bx), bt);
@@ -2032,7 +2038,6 @@
this->print_widget( win, x_offset + bx, y_offset + bt );
}
-
#ifdef USE_PRINT_BUTTON
// to test the Fl_Printer class creating a "Print front window" button in a
separate window
// contains also preparePrintFront call above
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
