Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FormCharacter.h

diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index daa890b2905d7680847a9f34c95435f74f6c54b6..d07255d83f5223d04db4b418d7b3e4a0a32195d6 100644 (file)
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -1,29 +1,26 @@
 // -*- C++ -*-
 /**
  * \file FormCharacter.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Edwin Leuven, leuven@fee.uva.nl
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Edwin Leuven
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORM_CHARACTER_H
 #define FORM_CHARACTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "FormBase.h"
-#include "lyxfont.h"          // for LyXFont enums
+#include "FormDialogView.h"
 #include "ControlCharacter.h" // for ControlCharacter enum
-#include "LColor.h"           // for LColor enum
-#include "character.h"        // for FONT_STATE enum
 
-#include <boost/scoped_ptr.hpp>
+#include "LColor.h"
+
+namespace lyx {
+namespace frontend {
 
-class Combox;
 struct FD_character;
 
 /**
@@ -32,10 +29,10 @@ struct FD_character;
  * in their documents.
  */
 class FormCharacter
-       : public FormCB<ControlCharacter, FormDB<FD_character> > {
+       : public FormController<ControlCharacter, FormView<FD_character> > {
 public:
        ///
-       FormCharacter(ControlCharacter &);
+       FormCharacter(Dialog &);
 private:
 
        /// Apply from dialog
@@ -50,26 +47,23 @@ private:
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-       /** Callback method (used only to activate Apply button when
-           combox is changed */
-       static void ComboInputCB(int, void *, Combox *);
-
-       ///
-       boost::scoped_ptr<Combox> combo_language2_;
        ///
-       std::vector<LyXFont::FONT_FAMILY>  family_;
+       std::vector<LyXFont::FONT_FAMILY> family_;
        ///
-       std::vector<LyXFont::FONT_SERIES>  series_;
+       std::vector<LyXFont::FONT_SERIES> series_;
        ///
-       std::vector<LyXFont::FONT_SHAPE>   shape_;
+       std::vector<LyXFont::FONT_SHAPE> shape_;
        ///
-       std::vector<LyXFont::FONT_SIZE>    size_;
+       std::vector<LyXFont::FONT_SIZE> size_;
        ///
-       std::vector<frnt::FONT_STATE>      bar_;
+       std::vector<FONT_STATE> bar_;
        ///
-       std::vector<LColor::color>         color_;
+       std::vector<LColor_color> color_;
        ///
-       std::vector<string>                lang_;
+       std::vector<std::string> lang_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif