removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / insets / insetinfo.C

diff --git a/src/insets/insetinfo.C b/src/insets/insetinfo.C
index 9174dd00b2c4b3ef2c068c9702503216761ff2b8..52e8935c176af5ccba552526383d6b99d3a83764 100644 (file)
--- a/src/insets/insetinfo.C
+++ b/src/insets/insetinfo.C
@@ -170,9 +170,16 @@ void InsetInfo::CloseInfoCB(FL_OBJECT *, long data)
        }
 }
 
+// This is just a wrapper.
+extern "C" void C_InsetInfo_CloseInfoCB(FL_OBJECT *, long data) 
+{
+       InsetInfo::CloseInfoCB(0, data);
+}
 
 void InsetInfo::Edit(int, int)
 {
+       static int ow = -1, oh;
+
        if(current_view->currentBuffer()->isReadonly())
                WarnReadonly();
        
@@ -185,8 +192,8 @@ void InsetInfo::Edit(int, int)
                fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
                obj = fl_add_button(FL_NORMAL_BUTTON,130,140,120,30,idex(_("Close|#C^[")));
                fl_set_object_resize(obj, FL_RESIZE_NONE);
-               fl_set_object_gravity(obj, SouthWestGravity, SouthEastGravity);
-               fl_set_object_callback(obj, CloseInfoCB, (long)this);
+               fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
+               fl_set_object_callback(obj, C_InsetInfo_CloseInfoCB, (long)this);
                fl_set_object_shortcut(obj, scex(_("Close|#C^[")), (long)this);
                fl_end_form();
                fl_set_form_atclose(form, CancelCloseBoxCB, 0);
@@ -195,8 +202,13 @@ void InsetInfo::Edit(int, int)
        if (form->visible) {
                fl_raise_form(form);
        } else {
-               fl_show_form(form,FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER, 
+               fl_show_form(form,FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER, 
                             _("Note"));
+               if (ow < 0) {
+                       ow = form->w;
+                       oh = form->h;
+               }
+               fl_set_form_minsize(form, ow, oh);
        }
 }