X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fcontrollers%2FControlCharacter.h;h=454ff33680e06a1d39e7cb6e470863eea6548de7;hb=120c89f24fae05379fbdc8539d3cfae574c2aecd;hp=6266b10f38cbc252f38d276d34767263b93cfa04;hpb=cda84cbcdfa4e4b0881c7dda6d91862b4356ac0e;p=lyx.git

diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h
index 6266b10f38..454ff33680 100644
--- a/src/frontends/controllers/ControlCharacter.h
+++ b/src/frontends/controllers/ControlCharacter.h
@@ -1,25 +1,26 @@
+// -*- C++ -*-
 /**
  * \file ControlCharacter.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 Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef CONTROLCHARACTER_H
 #define CONTROLCHARACTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "ControlDialogs.h"
+#include "ControlDialog_impl.h"
 #include "character.h"
 
+#include <boost/scoped_ptr.hpp>
+
 /** A controller for Character dialogs.
  */
-class ControlCharacter : public ControlDialog<ControlConnectBD>
-{
+class ControlCharacter : public ControlDialogBD {
 public:
 	///
 	ControlCharacter(LyXView &, Dialogs &);
@@ -33,7 +34,7 @@ public:
 	///
 	void setSize(LyXFont::FONT_SIZE);
 	///
-	void setBar(character::FONT_STATE);
+	void setBar(frnt::FONT_STATE);
 	///
 	void setColor(LColor::color);
 	///
@@ -41,16 +42,31 @@ public:
 	///
 	void setToggleAll(bool);
 
-private:
+	///
+	LyXFont::FONT_FAMILY getFamily() const;
+	///
+	LyXFont::FONT_SERIES getSeries() const;
+	///
+	LyXFont::FONT_SHAPE getShape() const;
+	///
+	LyXFont::FONT_SIZE getSize() const;
+	///
+	frnt::FONT_STATE getBar() const;
+	///
+	LColor::color getColor() const;
+	///
+	string getLanguage() const;
+	///
+	bool getToggleAll() const;
+
 	/// Get changed parameters and Dispatch them to the kernel.
 	virtual void apply();
+private:
 	/// set the params before show or update.
 	virtual void setParams();
-	/// clean-up on hide.
-	virtual void clearParams();
 
 	///
-	LyXFont * font_;
+	boost::scoped_ptr<LyXFont> font_;
 	///
 	bool toggleall_;
 };