Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h
index 5fc537783cc8d59f726ac456df85c7f74af4a8db..8e6fd23233e7812d37b40fc88d4692edc07c4a1b 100644 (file)
--- a/src/frontends/xforms/FormCharacter.h
+++ b/src/frontends/xforms/FormCharacter.h
@@ -1,58 +1,76 @@
+// -*- C++ -*-
 /** 
  * \file FormCharacter.h
  * Copyright 2001 The LyX Team.
  * See the file COPYING.
  * 
  * \author Edwin Leuven, leuven@fee.uva.nl
+ * \author Angus Leeming, a.leeming@.ac.uk
  */
 
 #ifndef FORM_CHARACTER_H
 #define FORM_CHARACTER_H
 
-#include "FormBase.h"
+#include <boost/smart_ptr.hpp>
 
 #ifdef __GNUG_
 #pragma interface
 #endif
 
+#include "FormBase.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
 
-class LyXView;
-class Dialogs;
 class Combox;
 struct FD_form_character;
 
 /** 
- * This class provides an XForms implementation of the FormCharacter Dialog.
+ * This class provides an XForms implementation of the Character Dialog.
  * The character dialog allows users to change the character settings
  * in their documents.
  */
-class FormCharacter : public FormBaseBD {
+class FormCharacter
+       : public FormCB<ControlCharacter, FormDB<FD_form_character> > {
 public:
-   ///
-   FormCharacter(LyXView *, Dialogs *);
-   ///
-   ~FormCharacter();
-
+       ///
+       FormCharacter(ControlCharacter &);
 private:
-       
-   /// Build the popup
-   virtual void build();
-   
-   /// Apply from popup
-   virtual void apply();
+
+       /// Apply from dialog
+       virtual void apply();
    
-   /// Update the popup.
-   virtual void update();
+       /// Build the dialog
+       virtual void build();
    
-   /// Pointer to the actual instantiation of the xform's form
-   virtual FL_FORM * form() const;
+       /// Update the dialog.
+       virtual void update();
+
+       /// Filter the inputs on callback from xforms
+       virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
-   FD_form_character * build_character();
+       /** Callback method (used only to activate Apply button when
+           combox is changed */
+       static void ComboInputCB(int, void *, Combox *);
+
+       /// Fdesign generated method
+       FD_form_character * build_character();
        
-   /// Real GUI implementation.
-   FD_form_character  * dialog_;
-   
-   Combox * combo_language2;
+       ///
+       boost::scoped_ptr<Combox> combo_language2_;
+       ///
+       std::vector<LyXFont::FONT_FAMILY>  family_;
+       ///
+       std::vector<LyXFont::FONT_SERIES>  series_;
+       ///
+       std::vector<LyXFont::FONT_SHAPE>   shape_;
+       ///
+       std::vector<LyXFont::FONT_SIZE>    size_;
+       ///
+       std::vector<character::FONT_STATE> bar_;
+       ///
+       std::vector<LColor::color>         color_;
 };
 
 #endif