The uncontroversial part of Michael Schmitt's minipage cleanup (removal of the gnome...

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

diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog
index 7081efa7091bcec328b309b8c7ceec0304f8b3d4..674533e4b8c8cd74d27c8d3cc5fa592af295f183 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-14  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * Dialogs.C:
+       * Dialogs2.C:
+       * Dialogs_impl.h:
+       * Makefile.am: remove minipage
+
 2003-10-08  Angus Leeming  <leeming@lyx.org>
 
        Fix doxygen warnings.

diff --git a/src/frontends/gnome/Dialogs.C b/src/frontends/gnome/Dialogs.C
index 3aa06db866c9730219700e159bc82149c9e624ab..dacdef266f426a02754a07bb0038b125bd31d960 100644 (file)
--- 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 b0a54b51aff5e16ade68e599d15894384b5fc12d..7ba8db630ef5e3154aef2b861276d853b5d8ae29 100644 (file)
--- 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 4e16f6f5b8d5020164ea2be653acba11a4bb72f1..1f5d933e841dd51ded094fcfe364f56eee34a1d5 100644 (file)
--- 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<ControlMath, FormMathsPanel, OkCancelReadOnlyPolicy, xformsBC>
 MathPanelDialog;
 
-typedef GUI<ControlMinipage, FormMinipage, NoRepeatedApplyReadOnlyPolicy, xformsBC>
-MinipageDialog;
-
 typedef GUI<ControlParagraph, FormParagraph, OkApplyCancelReadOnlyPolicy, xformsBC>
 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 e7d371ab97667131af58ce7479975c3ebb1449f8..94419ba803cddd181f3f8a8fdd31295250b9cd85 100644 (file)
--- 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 cda60cb1a9af0874b09f6020a99f5956cbadbcc5..f58f894b55f7520ce91e541722d617bb89eb8a01 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-14  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * Dialogs.C:
+       * Makefile.am: remove minipage
+
 2003-10-30  Huang Ying  <hying_caritas@163.com>
 
        * GToolbar.C : change layouts widget update code according xforms

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index 9175bb64f2444c5e012f2c46e42af072f4093d03..2875d095a3d74c7136a2318b161baecfcc4384b6 100644 (file)
--- 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 6802faa36523e8e1878fcbb1a368a04fa26f2e7a..b9d1af058001cd3c3521bd749b3a43e50e6e2bf7 100644 (file)
--- 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 f2817241117812cbb421d99bff48d52e8c6a3bed..2bcf2c0289d260884d8f75bc9e567d65ceb82664 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -95,8 +95,6 @@ public:
                ///
                WRAP_CODE,
                ///
-               MINIPAGE_CODE,
-               ///
                SPACE_CODE, // 25
                ///
                SPECIALCHAR_CODE,