X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_cb.C;h=5a6679495ed32a04fb02cca4949c588f70e70176;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=132a446a89785a600957ca3b076df41bce0b0b60;hpb=c35b288b74ac9b1450a81c1520292ab95735bb0f;p=lyx.git

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 132a446a89..5a6679495e 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -465,7 +465,7 @@ int MenuRunLaTeX(Buffer *buffer)
 			s = _("One error detected");
 			t = _("You should try to fix it.");
 		} else {
-			s += ret;
+			s += tostr(ret);
 			s += _(" errors detected.");
 			t = _("You should try to fix them.");
 		}
@@ -497,7 +497,7 @@ int MenuBuildProg(Buffer *buffer)
                        s = _("One error detected");
                        t = _("You should try to fix it.");
                } else {
-                       s += ret;
+                       s += tostr(ret);
                        s += _(" errors detected.");
                        t = _("You should try to fix them.");
                }
@@ -526,7 +526,7 @@ int MenuRunChktex(Buffer *buffer)
 			s = _("One warning found.");
 			t = _("Use 'Edit->Go to Error' to find it.");
 		} else {
-			s += ret;
+			s += tostr(ret);
 			s += _(" warnings found.");
 			t = _("Use 'Edit->Go to Error' to find them.");
 		}
@@ -966,7 +966,7 @@ void MenuPrint(Buffer *buffer)
 	} 
 	else {
 		fl_show_form(fd_form_print->form_print,
-			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+			     FL_PLACE_MOUSE, FL_FULLBORDER,
 			     _("Print"));
 	}
 }
@@ -1147,6 +1147,8 @@ void InsertAsciiFile(string const & f, bool asParagraph)
 
 void MenuShowTableOfContents()
 {
+	static int ow = -1, oh;
+
 	TocUpdateCB(0, 0);
 	if (fd_form_toc->form_toc->visible) {
 		fl_raise_form(fd_form_toc->form_toc);
@@ -1154,6 +1156,11 @@ void MenuShowTableOfContents()
 		fl_show_form(fd_form_toc->form_toc,
 			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
 			     _("Table Of Contents"));
+		if (ow < 0) {
+			ow = fd_form_toc->form_toc->w;
+			oh = fd_form_toc->form_toc->h;
+		}
+		fl_set_form_minsize(fd_form_toc->form_toc,ow,oh);
 	}
 }
 
@@ -1176,6 +1183,8 @@ void MenuInsertLabel(const char *arg)
 
 void MenuInsertRef()
 {
+	static int ow = -1, oh;
+
 	RefUpdateCB(0, 0);
 	if (fd_form_ref->form_ref->visible) {
 		fl_raise_form(fd_form_ref->form_ref);
@@ -1183,6 +1192,11 @@ void MenuInsertRef()
 		fl_show_form(fd_form_ref->form_ref,
 			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
 			     _("Insert Reference"));
+		if (ow < 0) {
+			ow = fd_form_ref->form_ref->w;
+			oh = fd_form_ref->form_ref->h;
+		}
+		fl_set_form_minsize(fd_form_ref->form_ref,ow,oh);
 	}
 }
 
@@ -1457,12 +1471,19 @@ void AllFloats(char flag, char figmar)
 
 void MenuLayoutCharacter()
 {
+	static int ow = -1, oh;
+
 	if (fd_form_character->form_character->visible) {
 		fl_raise_form(fd_form_character->form_character);
 	} else {
 		fl_show_form(fd_form_character->form_character,
 			     FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER,
 			     _("Character Style"));
+		if (ow < 0) {
+			ow = fd_form_character->form_character->w;
+			oh = fd_form_character->form_character->h;
+		}
+		fl_set_form_minsize(fd_form_character->form_character,ow,oh);
 	}
 }
 
@@ -1664,7 +1685,7 @@ void MenuLayoutParagraph()
 			fl_raise_form(fd_form_paragraph->form_paragraph);
 		} else {
 			fl_show_form(fd_form_paragraph->form_paragraph,
-				     FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER,
+				     FL_PLACE_MOUSE, FL_FULLBORDER,
 				     _("Paragraph Environment"));
 		}
 	}
@@ -1915,8 +1936,7 @@ void MenuLayoutDocument()
 			fl_raise_form(fd_form_document->form_document);
 		} else {
 			fl_show_form(fd_form_document->form_document,
-				     FL_PLACE_MOUSE | FL_FREE_SIZE,
-				     FL_FULLBORDER,
+				     FL_PLACE_MOUSE, FL_FULLBORDER,
 				     _("Document Layout"));
 		}
 	}
@@ -1954,8 +1974,7 @@ void MenuLayoutQuotes()
 			fl_raise_form(fd_form_quotes->form_quotes);
 		} else {
 			fl_show_form(fd_form_quotes->form_quotes,
-				     FL_PLACE_MOUSE | FL_FREE_SIZE,
-				     FL_FULLBORDER,
+				     FL_PLACE_MOUSE, FL_FULLBORDER,
 				     _("Quotes"));
 		}
 	}
@@ -1994,6 +2013,8 @@ bool UpdateLayoutPreamble()
 
 void MenuLayoutPreamble()
 {
+	static int ow = -1, oh;
+
 	if (UpdateLayoutPreamble()) {
 		if (fd_form_preamble->form_preamble->visible) {
 			fl_raise_form(fd_form_preamble->form_preamble);
@@ -2002,6 +2023,12 @@ void MenuLayoutPreamble()
 				     FL_PLACE_MOUSE | FL_FREE_SIZE,
 				     FL_FULLBORDER,
 				     _("LaTeX Preamble"));
+			if (ow < 0) {
+				ow = fd_form_preamble->form_preamble->w;
+				oh = fd_form_preamble->form_preamble->h;
+			}
+			fl_set_form_minsize(fd_form_preamble->form_preamble,
+					    ow,oh);
 		}
 	}
 }
@@ -2335,7 +2362,7 @@ extern "C" void TableCB(FL_OBJECT *, long)
 		fl_raise_form(fd_form_table->form_table);
 	} else {
 		fl_show_form(fd_form_table->form_table,
-			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+			     FL_PLACE_MOUSE, FL_FULLBORDER,
 			     _("Insert Table"));
 	}
 }
@@ -2886,7 +2913,7 @@ extern "C" void DocumentApplyCB(FL_OBJECT *, long)
 				if (ret==1)
 					s= _("One paragraph couldn't be converted");
 				else {
-					s += ret;
+					s += tostr(ret);
 					s += _(" paragraphs couldn't be converted");
 				}
 				WriteAlert(_("Conversion Errors!"),s,
@@ -3539,7 +3566,7 @@ void LaTeXOptions()
 		fl_raise_form(fd_latex_options->LaTeXOptions);
 	} else {
 		fl_show_form(fd_latex_options->LaTeXOptions,
-			     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+			     FL_PLACE_MOUSE, FL_FULLBORDER,
 			     _("LaTeX Options"));
 	}
 }
@@ -4055,8 +4082,7 @@ void UpdateInsetUpdateList()
 void addNewlineAndDepth(string &file, int const depth)
 {
        file += '\n';
-       for (int j=0;j< depth;j++)
-               file += ' ';
+       file.append(' ', depth);
 }