Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / Dialogs.C

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index 7d7460d112c769517e0a12abb5f52aeebfd5d46f..ffc926049ffc6fea2b76ebedd0439d23526b57e8 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "Dialogs.h"
 #include "Dialog.h"
 
@@ -63,7 +68,7 @@
 #include "GErrorList.h"
 #include "GERT.h"
 #include "FormExternal.h"
-#include "FormFloat.h"
+#include "GFloat.h"
 #include "GGraphics.h"
 #include "FormInclude.h"
 #include "GLog.h"
@@ -72,14 +77,14 @@
 #include "GMathsMatrix.h"
 #include "FormMathsSpace.h"
 #include "FormMathsStyle.h"
-#include "FormNote.h"
+#include "GNote.h"
 #include "GParagraph.h"
 #include "FormPreamble.h"
 #include "FormPreferences.h"
 #include "GPrint.h"
 #include "FormRef.h"
 #include "GSearch.h"
-#include "FormSendto.h"
+#include "GSendto.h"
 #include "FormTabular.h"
 #include "GTexinfo.h"
 #include "GShowFile.h"
@@ -87,7 +92,7 @@
 #include "GTableCreate.h"
 #include "GToc.h"
 #include "GUrl.h"
-#include "FormVSpace.h"
+#include "GVSpace.h"
 #include "FormWrap.h"
 
 #ifdef HAVE_LIBAIKSAURUS
@@ -237,8 +242,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setView(new GSearch(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "float") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlFloat(*dialog));
-               dialog->setView(new FormFloat(*dialog));
+               dialog->setView(new GFloat(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "graphics") {
                dialog->bc().view(new GBC(dialog->bc()));
@@ -452,8 +458,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setView(new FormMathsStyle(*dialog));
                dialog->bc().bp(new IgnorantPolicy);
        } else if (name == "note") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlNote(*dialog));
-               dialog->setView(new FormNote(*dialog));
+               dialog->setView(new GNote(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "branch") {
                dialog->setController(new ControlBranch(*dialog));
@@ -482,8 +489,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setView(new FormRef(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "sendto") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlSendto(*dialog));
-               dialog->setView(new FormSendto(*dialog));
+               dialog->setView(new GSendto(*dialog));
                dialog->bc().bp(new OkApplyCancelPolicy);
        } else if (name == "spellchecker") {
                dialog->bc().view(new GBC(dialog->bc()));
@@ -521,8 +529,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setView(new GUrl(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "vspace") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlVSpace(*dialog));
-               dialog->setView(new FormVSpace(*dialog));
+               dialog->setView(new GVSpace(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "wrap") {
                dialog->setController(new ControlWrap(*dialog));