From 1ebd651ad6120c1e22e7fca58f664fd3b4e6672b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 15 Dec 2003 10:33:27 +0000 Subject: [PATCH] The uncontroversial part of Michael Schmitt's minipage cleanup (removal of the gnome/gtk stuff and the forgotten MINIPAGE_CODE) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8250 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gnome/ChangeLog | 7 +++++++ src/frontends/gnome/Dialogs.C | 1 - src/frontends/gnome/Dialogs2.C | 11 ----------- src/frontends/gnome/Dialogs_impl.h | 8 -------- src/frontends/gnome/Makefile.am | 2 -- src/frontends/gtk/ChangeLog | 5 +++++ src/frontends/gtk/Dialogs.C | 8 +------- src/frontends/gtk/Makefile.am | 1 - src/insets/inset.h | 2 -- 9 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index 7081efa709..674533e4b8 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,10 @@ +2003-12-14 Michael Schmitt + + * Dialogs.C: + * Dialogs2.C: + * Dialogs_impl.h: + * Makefile.am: remove minipage + 2003-10-08 Angus Leeming Fix doxygen warnings. diff --git a/src/frontends/gnome/Dialogs.C b/src/frontends/gnome/Dialogs.C index 3aa06db866..dacdef266f 100644 --- a/src/frontends/gnome/Dialogs.C +++ b/src/frontends/gnome/Dialogs.C @@ -40,7 +40,6 @@ Dialogs::Impl::Impl(LyXView & lv, Dialogs & d) include(lv, d), logfile(lv, d), mathpanel(lv, d), - minipage(lv, d), paragraph(lv, d), preamble(lv, d), preferences(lv, d), diff --git a/src/frontends/gnome/Dialogs2.C b/src/frontends/gnome/Dialogs2.C index b0a54b51af..7ba8db630e 100644 --- a/src/frontends/gnome/Dialogs2.C +++ b/src/frontends/gnome/Dialogs2.C @@ -91,17 +91,6 @@ void Dialogs::showMergeChanges() pimpl_->changes.controller().show(); } -void Dialogs::showMinipage(InsetMinipage * im) -{ - pimpl_->minipage.controller().showInset(im); -} - - -void Dialogs::updateMinipage(InsetMinipage * im) -{ - pimpl_->minipage.controller().showInset(im); -} - void Dialogs::showParagraph() { diff --git a/src/frontends/gnome/Dialogs_impl.h b/src/frontends/gnome/Dialogs_impl.h index 4e16f6f5b8..1f5d933e84 100644 --- a/src/frontends/gnome/Dialogs_impl.h +++ b/src/frontends/gnome/Dialogs_impl.h @@ -75,10 +75,6 @@ #include "FormMathsPanel.h" #include "forms/form_maths_panel.h" -#include "ControlMinipage.h" -#include "FormMinipage.h" -#include "forms/form_minipage.h" - #include "ControlParagraph.h" #include "FormParagraph.h" #include "forms/form_paragraph.h" @@ -178,9 +174,6 @@ LogFileDialog; typedef GUI MathPanelDialog; -typedef GUI -MinipageDialog; - typedef GUI ParagraphDialog; @@ -237,7 +230,6 @@ struct Dialogs::Impl { IncludeDialog include; LogFileDialog logfile; MathPanelDialog mathpanel; - MinipageDialog minipage; ParagraphDialog paragraph; PreambleDialog preamble; PreferencesDialog preferences; diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am index e7d371ab97..94419ba803 100644 --- a/src/frontends/gnome/Makefile.am +++ b/src/frontends/gnome/Makefile.am @@ -41,7 +41,6 @@ xforms_objects = \ ../xforms/FormMathsPanel.lo \ ../xforms/FormMathsSpace.lo \ ../xforms/FormMathsStyle.lo \ - ../xforms/FormMinipage.lo \ ../xforms/FormParagraph.lo \ ../xforms/FormPreferences.lo \ ../xforms/FormPrint.lo \ @@ -98,7 +97,6 @@ xforms_objects = \ ../xforms/forms/form_maths_panel.lo \ ../xforms/forms/form_maths_space.lo \ ../xforms/forms/form_maths_style.lo \ - ../xforms/forms/form_minipage.lo \ ../xforms/forms/form_paragraph.lo \ ../xforms/forms/form_preamble.lo \ ../xforms/forms/form_preferences.lo \ diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index cda60cb1a9..f58f894b55 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,8 @@ +2003-12-14 Michael Schmitt + + * Dialogs.C: + * Makefile.am: remove minipage + 2003-10-30 Huang Ying * GToolbar.C : change layouts widget update code according xforms diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C index 9175bb64f2..2875d095a3 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -30,7 +30,6 @@ #include "ControlInclude.h" #include "ControlLog.h" #include "ControlMath.h" -#include "ControlMinipage.h" #include "ControlNote.h" #include "ControlParagraph.h" #include "ControlRef.h" @@ -63,7 +62,6 @@ #include "FormMathsMatrix.h" #include "FormMathsSpace.h" #include "FormMathsStyle.h" -#include "FormMinipage.h" #include "FormNote.h" #include "FormParagraph.h" #include "FormRef.h" @@ -121,7 +119,7 @@ char const * const dialognames[] = { "aboutlyx", "bibitem", "bibtex", "branch", "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc", "mathamsarrows", "mathamsrelations", "mathamsnegatedrelations", "mathamsoperators", "mathdelimiter", "mathmatrix", "mathspace", "mathstyle", -"minipage", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo", +"box", "note", "paragraph", "ref", "tabular", "tabularcreate", "texinfo", #ifdef HAVE_LIBAIKSAURUS "thesaurus", @@ -411,10 +409,6 @@ Dialog * Dialogs::build(string const & name) dialog->setController(new ControlMath(*dialog)); dialog->setView(new FormMathsStyle(*dialog)); dialog->bc().bp(new IgnorantPolicy); - } else if (name == "minipage") { - dialog->setController(new ControlMinipage(*dialog)); - dialog->setView(new FormMinipage(*dialog)); - dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "note") { dialog->setController(new ControlNote(*dialog)); dialog->setView(new FormNote(*dialog)); diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index 6802faa365..b9d1af0580 100644 --- a/src/frontends/gtk/Makefile.am +++ b/src/frontends/gtk/Makefile.am @@ -98,7 +98,6 @@ xforms_objects = \ ../xforms/FormMathsMatrix.lo \ ../xforms/FormMathsSpace.lo \ ../xforms/FormMathsStyle.lo \ - ../xforms/FormMinipage.lo \ ../xforms/FormNote.lo \ ../xforms/FormParagraph.lo \ ../xforms/FormPreamble.lo \ diff --git a/src/insets/inset.h b/src/insets/inset.h index f281724111..2bcf2c0289 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -95,8 +95,6 @@ public: /// WRAP_CODE, /// - MINIPAGE_CODE, - /// SPACE_CODE, // 25 /// SPECIALCHAR_CODE,