X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FXFormsView.C;h=bbb2d7c820e275cfdcfaec9adc7cb4b0c5fef569;hb=6e3fcdf812f007c7c272bf7b1a7c650c109f709d;hp=059e174a43e0f6b501d6d129b9cefac135442a4f;hpb=b9d61343fc76a681b0264d65703ef2119647df56;p=lyx.git diff --git a/src/XFormsView.C b/src/XFormsView.C index 059e174a43..bbb2d7c820 100644 --- a/src/XFormsView.C +++ b/src/XFormsView.C @@ -15,9 +15,6 @@ #pragma implementation #endif -//#include -//#include - #include "XFormsView.h" #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) #include "lyxlookup.h" @@ -42,7 +39,15 @@ extern void QuitLyX(); // This is very temporary BufferView * current_view; -extern "C" int C_XFormsView_atCloseMainFormCB(FL_FORM *, void *); +extern "C" { + +static +int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p) +{ + return XFormsView::atCloseMainFormCB(form, p); +} + +} XFormsView::XFormsView(int width, int height) @@ -87,14 +92,6 @@ int XFormsView::atCloseMainFormCB(FL_FORM *, void *) } -// Wrapper for the above -extern "C" -int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p) -{ - return XFormsView::atCloseMainFormCB(form, p); -} - - void XFormsView::setPosition(int x, int y) { fl_set_form_position(form_, x, y); @@ -103,6 +100,7 @@ void XFormsView::setPosition(int x, int y) void XFormsView::show(int place, int border, string const & title) { + fl_set_form_minsize(form_, form_->w, form_->h); fl_show_form(form_, place, border, title.c_str()); getLyXFunc()->initMiniBuffer(); #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) @@ -192,6 +190,8 @@ void XFormsView::create_form_form_main(int width, int height) fl_set_form_minsize(form_, 50, 50); fl_end_form(); + + minibuffer->dd_init(); }