-// -*- C++ -*-
/* This file is part of
* ======================================================
*
#include "LyXView.h"
#include "support/LAssert.h"
#include "xformsBC.h"
+#include "lyxrc.h"
//#include "debug.h"
using SigC::slot;
-extern "C" int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
-{
- return FormBaseDeprecated::WMHideCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
-{
- FormBaseDeprecated::ApplyCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
-{
- FormBaseDeprecated::OKCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
-{
- FormBaseDeprecated::CancelCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
-{
- FormBaseDeprecated::InputCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
-{
- FormBaseDeprecated::RestoreCB(ob, d);
+extern "C" {
+
+ static
+ int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
+ {
+ return FormBaseDeprecated::WMHideCB(ob, d);
+ }
+
+ void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
+ {
+ FormBaseDeprecated::ApplyCB(ob, d);
+ }
+
+ void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
+ {
+ FormBaseDeprecated::OKCB(ob, d);
+ }
+
+ void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
+ {
+ FormBaseDeprecated::CancelCB(ob, d);
+ }
+
+ void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
+ {
+ FormBaseDeprecated::InputCB(ob, d);
+ }
+
+ void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
+ {
+ FormBaseDeprecated::RestoreCB(ob, d);
+ }
}
FormBaseDeprecated::FormBaseDeprecated(LyXView * lv, Dialogs * d,
- string const & t)
- : lv_(lv), d_(d), h_(0), r_(0), title_(t), minw_(0), minh_(0)
+ string const & t, bool allowResize)
+ : lv_(lv), d_(d), h_(0), r_(0), title_(t),
+ minw_(0), minh_(0), allow_resize_(allowResize)
{
lyx::Assert(lv && d);
}
if (!form()) {
build();
+ bc().refresh();
+
// work around dumb xforms sizing bug
minw_ = form()->w;
minh_ = form()->h;
*/
XMapWindow(fl_get_display(), form()->window);
} else {
- // calls to fl_set_form_minsize/maxsize apply only to the next
- // fl_show_form(), so connect() comes first.
connect();
+
+ // calls to fl_set_form_minsize/maxsize apply only to the next
+ // fl_show_form(), so this comes first.
+ fl_set_form_minsize(form(), minw_, minh_);
+ if (!allow_resize_)
+ fl_set_form_maxsize(form(), minw_, minh_);
+
fl_show_form(form(),
- FL_PLACE_MOUSE | FL_FREE_SIZE, 0,
- title_.c_str());
+ FL_PLACE_MOUSE | FL_FREE_SIZE,
+ (lyxrc.dialogs_iconify_with_main ? FL_TRANSIENT : 0),
+ title_.c_str());
}
}
FormBaseDeprecated * pre =
static_cast<FormBaseDeprecated*>(ob->form->u_vdata);
lyx::Assert(pre);
+
+ // It is possible to set the choice to 0 when using the
+ // keyboard shortcuts. This work-around deals with the problem.
+ if (ob && ob->objclass == FL_CHOICE && fl_get_choice(ob) < 1) {
+ fl_set_choice(ob, 1);
+ }
+
pre->bc().valid(pre->input(ob, data));
}
}
-FormBaseBI::FormBaseBI(LyXView * lv, Dialogs * d, string const & t)
- : FormBaseDeprecated(lv, d, t)
+FormBaseBI::FormBaseBI(LyXView * lv, Dialogs * d, string const & t,
+ bool allowResize)
+ : FormBaseDeprecated(lv, d, t, allowResize)
{}
}
-FormBaseBD::FormBaseBD(LyXView * lv, Dialogs * d, string const & t)
- : FormBaseDeprecated(lv, d, t),
+FormBaseBD::FormBaseBD(LyXView * lv, Dialogs * d, string const & t,
+ bool allowResize)
+ : FormBaseDeprecated(lv, d, t, allowResize),
u_(0)
{}