missing regenerated xform files; tiny tweak for POTFILES.in generation; segfault...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1092 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 255f42143453fbf29444855707cfec5aca017a12..76fba8f415e752c3c7bc1745bdc0e9e332c09d3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-10  Allan Rae  <rae@lyx.org>
+
+       * src/BufferView_pimpl.C (buffer): don't call upadteBufferDependent
+       unless there really is a buffer.  hideBufferDependent is called
+       instead.
+
+       * Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
+       stays in $(srcdir).
+
 2000-10-09  Dekel Tsur  <dekelts@tau.ac.il>
 
        * lib/lyxrc.example: Few changes.

diff --git a/po/ChangeLog b/po/ChangeLog
index e7c2a78bc4a1b0bc4cb9719e9f6b90b9a14df6e2..9335f6d9ef807efabfb2f2d81c520eefc1e57c03 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-10  Allan Rae  <rae@lyx.org>
+
+       * Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
+       stays in $(srcdir).
+
 2000-10-06  Allan Rae  <rae@lyx.org>
 
        * Makefile.in.in: Over zealous in yesterdays work.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 7e00d47978cd6c3f4bc6e096c6228c061a24c0e9..280c07fad85546b81d9b25dcfecc4da8b88a7c4c 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -242,7 +242,7 @@ POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
             awk 'BEGIN {FS= ":"} {print $$1}' | \
             sed -e '/xforms.forms/d' | \
             sort -f -d | uniq ) > $@-t \
-       && mv $@-t $@
+       && mv $@-t $(srcdir)/$@
 
 POTFILES: POTFILES.in
        ( if test 'x$(srcdir)' != 'x.'; then \

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 4ed24019110fc763ca8f6dd854f96d0459227b03..3feed20534539d7368a086bdd642c22902bdf9df 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -183,7 +183,13 @@ void BufferView::Pimpl::buffer(Buffer * b)
        owner_->updateWindowTitle();
        // Similarly, buffer-dependent dialogs should be updated or hidden.
        // This should go here because some dialogs (ToC) require bv_->text.
-       owner_->getDialogs()->updateBufferDependent();
+       if (buffer_) owner_->getDialogs()->updateBufferDependent();
+#ifdef WITH_WARNINGS
+#warning Is this the right place for this?
+// What was wrong with where it used to be in the previous if(buffer_) above?
+// There also used to be a hideBufferDependent somewhere here but I haven't
+// time at present to check.  This should at least fix the segfault.
+#endif
 }
 
 

diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C
index f8bbc10735a84a6befed9d66eda58eb1b9f6d74a..02db2a00905dd48e73367ff74c39066d7aec5e30 100644 (file)
--- a/src/frontends/xforms/form_paragraph.C
+++ b/src/frontends/xforms/form_paragraph.C
@@ -41,7 +41,7 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_West, FL_East);
     fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   obj = fl_add_text(FL_NORMAL_TEXT, 370, 100, 60, 20, _("Indent"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@@ -49,59 +49,59 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
   fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 30, 120, 30, idex(_("Above|#b")));
     fl_set_button_shortcut(obj, scex(_("Above|#b")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 60, 120, 30, idex(_("Below|#E")));
     fl_set_button_shortcut(obj, scex(_("Below|#E")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 30, 120, 30, idex(_("Above|#o")));
     fl_set_button_shortcut(obj, scex(_("Above|#o")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 60, 120, 30, idex(_("Below|#l")));
     fl_set_button_shortcut(obj, scex(_("Below|#l")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 120, 120, 30, idex(_("No Indent|#I")));
     fl_set_button_shortcut(obj, scex(_("No Indent|#I")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
 
   fdui->group_radio_alignment = fl_bgn_group();
   fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 80, 30, idex(_("Right|#R")));
     fl_set_button_shortcut(obj, scex(_("Right|#R")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 80, 30, idex(_("Left|#f")));
     fl_set_button_shortcut(obj, scex(_("Left|#f")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 30, 80, 30, idex(_("Block|#c")));
     fl_set_button_shortcut(obj, scex(_("Block|#c")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 60, 80, 30, idex(_("Center|#n")));
     fl_set_button_shortcut(obj, scex(_("Center|#n")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_group();
 
   fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 120, 90, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 160, 90, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 120, 100, 30, idex(_("Above:|#v")));
     fl_set_button_shortcut(obj, scex(_("Above:|#v")), 1);
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 160, 100, 30, idex(_("Below:|#w")));
     fl_set_button_shortcut(obj, scex(_("Below:|#w")), 1);
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphVSpaceCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   obj = fl_add_text(FL_NORMAL_TEXT, 370, 10, 100, 20, _("Pagebreaks"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@@ -121,11 +121,11 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general()
   fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 120, 40, 30, idex(_("Keep|#K")));
     fl_set_button_shortcut(obj, scex(_("Keep|#K")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 160, 40, 30, idex(_("Keep|#p")));
     fl_set_button_shortcut(obj, scex(_("Keep|#p")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -162,11 +162,11 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra()
   fdui->input_pextra_width = obj = fl_add_input(FL_NORMAL_INPUT, 240, 30, 90, 30, idex(_("Length|#L")));
     fl_set_button_shortcut(obj, scex(_("Length|#L")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->input_pextra_widthp = obj = fl_add_input(FL_INT_INPUT, 240, 70, 90, 30, idex(_("or %|#o")));
     fl_set_button_shortcut(obj, scex(_("or %|#o")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   obj = fl_add_text(FL_NORMAL_TEXT, 200, 10, 60, 20, _("Width"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@@ -180,39 +180,39 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra()
   fdui->radio_pextra_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 30, 80, 30, idex(_("Top|#T")));
     fl_set_button_shortcut(obj, scex(_("Top|#T")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_pextra_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 60, 80, 30, idex(_("Middle|#d")));
     fl_set_button_shortcut(obj, scex(_("Middle|#d")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_pextra_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 90, 80, 30, idex(_("Bottom|#B")));
     fl_set_button_shortcut(obj, scex(_("Bottom|#B")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_group();
 
   fdui->radio_pextra_hfill = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 130, 300, 30, idex(_("HFill between Minipage paragraphs|#H")));
     fl_set_button_shortcut(obj, scex(_("HFill between Minipage paragraphs|#H")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_pextra_startmp = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 260, 30, idex(_("Start new Minipage|#S")));
     fl_set_button_shortcut(obj, scex(_("Start new Minipage|#S")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
 
   fdui->group_extraopt = fl_bgn_group();
   fdui->radio_pextra_indent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 30, 160, 30, idex(_("Indented Paragraph|#I")));
     fl_set_button_shortcut(obj, scex(_("Indented Paragraph|#I")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_pextra_minipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 60, 160, 30, idex(_("Minipage|#M")));
     fl_set_button_shortcut(obj, scex(_("Minipage|#M")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_pextra_floatflt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 90, 160, 30, idex(_("Floatflt|#F")));
     fl_set_button_shortcut(obj, scex(_("Floatflt|#F")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphInputCB, 0);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_group();
 
   fl_end_form();
@@ -243,18 +243,18 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph()
   fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_("Cancel|^[")));
     fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphCancelCB, 0);
+    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_("Apply|#A")));
     fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphApplyCB, 0);
+    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
   fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 180, 310, 100, 30, _("OK"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphOKCB, 0);
+    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 310, 100, 30, idex(_("Restore|#R")));
     fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormParagraphRestoreCB, 0);
+    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
   fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 280, 490, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);

diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h
index 4456f0b6bfc17e316097282855794ace731e7810..37b7830c0dc31cc0d76e7006e141776be8c7a9ca 100644 (file)
--- a/src/frontends/xforms/form_paragraph.h
+++ b/src/frontends/xforms/form_paragraph.h
@@ -5,15 +5,14 @@
 #define FD_form_paragraph_general_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphVSpaceCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormParagraphCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/