insetcharstyle drawing cosmetics

[lyx.git] / src / insets / insetcharstyle.h

diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index 8b3ea9c2b1c36b852fcf6e28992785a38b395a40..f06e485c3c03db02561d8c0e166b498969079366 100644 (file)
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -13,12 +13,11 @@
 #ifndef INSETCHARSTYLE_H
 #define INSETCHARSTYLE_H
 
-
 #include "insetcollapsable.h"
 #include "lyxtextclass.h"
 
 
- struct InsetCharStyleParams {
+struct InsetCharStyleParams {
        ///
        void write(std::ostream & os) const;
        ///
@@ -30,6 +29,8 @@
        ///
        std::string latexname;
        ///
+       std::string latexparam;
+       ///
        LyXFont font;
        ///
        LyXFont labelfont;
@@ -42,8 +43,6 @@
 class InsetCharStyle : public InsetCollapsable {
 public:
        ///
-
-
        InsetCharStyle(BufferParams const &, CharStyles::iterator);
        /// Copy constructor
        InsetCharStyle(InsetCharStyle const &);
@@ -58,10 +57,10 @@ public:
        ///
        void read(Buffer const & buf, LyXLex & lex);
        ///
-       void setButtonLabel();
-       ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
+       void draw(PainterInfo &, int, int) const;
+       ///
        void getDrawFont(LyXFont &) const;
        ///
        int latex(Buffer const &, std::ostream &,
@@ -83,17 +82,18 @@ public:
 
 protected:
        ///
-       virtual
-       DispatchResult
-       priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
+       virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
 
 private:
+       ///
        friend class InsetCharStyleParams;
 
        /// used by the constructors
        void init();
        ///
        InsetCharStyleParams params_;
+       ///
+       bool has_label_;
 };
 
 #endif