Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index 8de86771e47e79849c3c0615ca19d8ebd2f0df0c..080b61dc3928fe1a7ebc3bb5a7c906378f03140a 100644 (file)
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -5,27 +5,18 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
- * \author Angus Leeming 
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * 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>
 
-class Combox;
+struct LColor_color;
 struct FD_character;
 
 /**
@@ -34,10 +25,10 @@ struct FD_character;
  * in their documents.
  */
 class FormCharacter
-       : public FormCB<ControlCharacter, FormDB<FD_character> > {
+       : public FormController<ControlCharacter, FormView<FD_character> > {
 public:
        ///
-       FormCharacter();
+       FormCharacter(Dialog &);
 private:
 
        /// Apply from dialog
@@ -52,12 +43,6 @@ 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_;
        ///
@@ -69,9 +54,9 @@ private:
        ///
        std::vector<frnt::FONT_STATE>      bar_;
        ///
-       std::vector<LColor::color>         color_;
+       std::vector<LColor_color>            color_;
        ///
-       std::vector<string>                lang_;
+       std::vector<std::string>                lang_;
 };
 
 #endif