Minipage is no more (long live the box inset)

[lyx.git] / src / frontends / Painter.h

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 482f77fa1c8bf1de2aef4cd75b051d991a3c227e..18835ff4686f3d171d732e3ea0435c84ae8844e2 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,8 +13,7 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-
-#include "support/std_string.h"
+#include <string>
 
 
 class LColor_color;
@@ -140,7 +139,7 @@ public:
 
        /// draw a string at position x, y (y is the baseline)
        virtual Painter & text(int x, int y,
-               string const & str, LyXFont const & f) = 0;
+               std::string const & str, LyXFont const & f) = 0;
 
        /**
         * Draw a string at position x, y (y is the baseline)
@@ -161,14 +160,14 @@ public:
         * around the text with the given color.
         */
        Painter & rectText(int x, int baseline,
-               string const & string,
+               std::string const & str,
                LyXFont const & font,
                LColor_color back,
                LColor_color frame);
 
        /// draw a string and enclose it inside a button frame
        Painter & buttonText(int x,
-               int baseline, string const & s,
+               int baseline, std::string const & s,
                LyXFont const & font);
 
 protected: