remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index 8de86771e47e79849c3c0615ca19d8ebd2f0df0c..c70c0b7c1b9adb87a5a98bd5b6fde70624f7036f 100644 (file)
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -5,7 +5,7 @@
  * 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
  */
@@ -13,19 +13,13 @@
 #ifndef FORM_CHARACTER_H
 #define FORM_CHARACTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "FormBase.h"
+#include "FormDialogView.h"
 #include "lyxfont.h"          // for LyXFont enums
 #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 FD_character;
 
 /**
@@ -34,10 +28,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 +46,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_;
        ///