X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormBaseDeprecated.C;h=0984fb6bd2f9b04312a58875c33c77820c860992;hb=f991ac4421699843081001d6ef01791026068036;hp=d07bb0a13bfc503ab0ab6a07755de524d98a7e65;hpb=b261483f24279905215ac8e11e791eb638a89d21;p=lyx.git

diff --git a/src/frontends/xforms/FormBaseDeprecated.C b/src/frontends/xforms/FormBaseDeprecated.C
index d07bb0a13b..0984fb6bd2 100644
--- a/src/frontends/xforms/FormBaseDeprecated.C
+++ b/src/frontends/xforms/FormBaseDeprecated.C
@@ -44,7 +44,7 @@ static int C_PrehandlerCB(FL_OBJECT *, int, FL_Coord, FL_Coord, int, void *);
 
 FormBaseDeprecated::FormBaseDeprecated(LyXView & lv, Dialogs & d,
 				       string const & t, bool allowResize)
-	: lv_(lv), d_(d), title_(t),
+	: lv_(lv), d_(d), title_(t), icon_pixmap_(0), icon_mask_(0),
 	  minw_(0), minh_(0), allow_resize_(allowResize),
 	  tooltips_(new Tooltips())
 {}
@@ -52,6 +52,9 @@ FormBaseDeprecated::FormBaseDeprecated(LyXView & lv, Dialogs & d,
 
 FormBaseDeprecated::~FormBaseDeprecated()
 {
+	if (icon_pixmap_)
+		XFreePixmap(fl_get_display(), icon_pixmap_);
+
 	delete tooltips_;
 }
 
@@ -83,24 +86,48 @@ void FormBaseDeprecated::disconnect()
 }
 
 
-void FormBaseDeprecated::show()
+void FormBaseDeprecated::prepare_to_show()
 {
-	if (!form()) {
-		build();
-
-		double const scale = scale_to_fit_tabs(form());
-		if (scale > 1.001)
-			scale_form(form(), scale);
-
-		bc().refresh();
+	build();
+
+	double const scale = scale_to_fit_tabs(form());
+	if (scale > 1.001)
+		scale_form(form(), scale);
+
+	bc().refresh();
+
+	// work around dumb xforms sizing bug
+	minw_ = form()->w;
+	minh_ = form()->h;
+
+	fl_set_form_atclose(form(), C_WMHideCB, 0);
+
+	// set the title for the minimized form
+	if (!lyxrc.dialogs_iconify_with_main)
+		fl_winicontitle(form()->window, title_.c_str());
+
+	//  assign an icon to the form
+	string const iconname = LibFileSearch("images", "lyx", "xpm");
+	if (!iconname.empty()) {
+		unsigned int w, h;
+		icon_pixmap_ = fl_read_pixmapfile(fl_root,
+						  iconname.c_str(),
+						  &w,
+						  &h,
+						  &icon_mask_,
+						  0, 0, 0);
+		fl_set_form_icon(form(), icon_pixmap_, icon_mask_);
+	}
+}
 
-		// work around dumb xforms sizing bug
-		minw_ = form()->w;
-		minh_ = form()->h;
 
-		fl_set_form_atclose(form(), C_WMHideCB, 0);
+void FormBaseDeprecated::show()
+{
+	if (!form()) {
+		prepare_to_show();
 	}
 
+	// make sure the form is up to date.
 	fl_freeze_form(form());
 	update();
 	fl_unfreeze_form(form());
@@ -126,35 +153,17 @@ void FormBaseDeprecated::show()
 			fl_set_form_maxsize(form(), minw_, minh_);
 
 		string const maximize_title = "LyX: " + title_;
-		int const iconify_policy = lyxrc.dialogs_iconify_with_main ?
-						FL_TRANSIENT : 0;
+		int const iconify_policy =
+			lyxrc.dialogs_iconify_with_main ? FL_TRANSIENT : 0;
 
 		fl_show_form(form(),
 			     FL_PLACE_MOUSE | FL_FREE_SIZE,
 			     iconify_policy,
 			     maximize_title.c_str());
-
-		if (iconify_policy == 0) {
-			// set title for minimized form
-			string const minimize_title = title_;
-			fl_winicontitle(form()->window, minimize_title.c_str());
-
-			//  assign an icon to form
-			string const iconname = LibFileSearch("images", "lyx", "xpm");
-			if (!iconname.empty()) {
-				unsigned int w, h;
-				Pixmap icon_mask;
-				Pixmap const icon_p = fl_read_pixmapfile(fl_root,
-							iconname.c_str(),
-							&w,
-							&h,
-							&icon_mask,
-							0, 0, 0); // this leaks
-                		fl_set_form_icon(form(), icon_p, icon_mask);
-        		}
-		}
 	}
 
+	// For some strange reason known only to xforms, the tooltips can only
+	// be set on a form that is already visible...
 	tooltips().set();
 }