Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index 1c0b78b1c6a1b1e7c4ae978dac310b03c9b8659b..2a5d851adbce362143026f36358cd4cc85045f1c 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -113,6 +113,7 @@
 
 
 using std::string;
+using namespace lyx::frontend;
 
 
 namespace {
@@ -127,7 +128,7 @@ FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
 
 char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "error", "errorlist" , "ert", "external", "file",
+"citation", "document", "errorlist" , "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log",
 "mathpanel", "mathaccents", "matharrows", "mathoperators", "mathrelations",
 "mathgreek", "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
@@ -191,14 +192,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(new ControlBranch(*dialog));
                dialog->setView(new FormBranch(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
-       } else if (name == "character") {
-               dialog->setController(new ControlCharacter(*dialog));
-               dialog->setView(new FormCharacter(*dialog));
-               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "changes") {
                dialog->setController(new ControlChanges(*dialog));
                dialog->setView(new FormChanges(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
+       } else if (name == "character") {
+               dialog->setController(new ControlCharacter(*dialog));
+               dialog->setView(new FormCharacter(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "citation") {
                dialog->setController(new ControlCitation(*dialog));
                dialog->setView(new FormCitation(*dialog));
@@ -450,7 +451,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
        } else if (name == "prefs") {
                dialog->setController(new ControlPrefs(*dialog));
                dialog->setView(new FormPreferences(*dialog));
-               dialog->bc().bp(new OkApplyCancelPolicy);
+               dialog->bc().bp(new PreferencesPolicy);
        } else if (name == "print") {
                dialog->setController(new ControlPrint(*dialog));
                dialog->setView(new FormPrint(*dialog));