Author: manolo
Date: 2012-05-24 02:11:30 -0700 (Thu, 24 May 2012)
New Revision: 9544
Log:
Fixed fltk3::FileChooser::add_extra().
Modified:
branches/branch-3.0/include/FL/Fl_File_Chooser.H
branches/branch-3.0/src/fltk3/FileChooser.cxx
Modified: branches/branch-3.0/include/FL/Fl_File_Chooser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_File_Chooser.H 2012-05-23 14:10:42 UTC
(rev 9543)
+++ branches/branch-3.0/include/FL/Fl_File_Chooser.H 2012-05-24 09:11:30 UTC
(rev 9544)
@@ -82,7 +82,7 @@
Fl_Widget* add_extra(Fl_Widget* gr) {
fltk3::Widget *w3 = fltk3::FileChooser::add_extra(fltk3::_1to3_widget(gr));
- if (!w3->wrapper()) {
+ if (w3 && !w3->wrapper()) {
Fl_Widget *w1 = new Fl_Widget();
w3->wrapper(w1);
w1->_p = w3;
Modified: branches/branch-3.0/src/fltk3/FileChooser.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/FileChooser.cxx 2012-05-23 14:10:42 UTC
(rev 9543)
+++ branches/branch-3.0/src/fltk3/FileChooser.cxx 2012-05-24 09:11:30 UTC
(rev 9544)
@@ -462,7 +462,8 @@
fltk3::Widget* svres=window->resizable();
window->resizable(NULL);
window->size(window->w(),nh);
- gr->position(2,okButton->y()+okButton->h()+2);
+ fltk3::Group* lastgr = (fltk3::Group*)window->child( (window->children() -
1) );
+ gr->position(2, lastgr->y() + lastgr->h() + 2);
window->add(gr);
ext_group=gr;
window->resizable(svres);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
