diff options
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r-- | src/FbTk/Menu.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 09bdd8c..a7bb982 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh | |||
@@ -108,7 +108,7 @@ public: | |||
108 | void grabInputFocus(); | 108 | void grabInputFocus(); |
109 | virtual void reconfigure(); | 109 | virtual void reconfigure(); |
110 | /// set label string | 110 | /// set label string |
111 | void setLabel(const FbString &labelstr); | 111 | void setLabel(const FbTk::BiDiString &labelstr); |
112 | /// move menu to x,y | 112 | /// move menu to x,y |
113 | virtual void move(int x, int y); | 113 | virtual void move(int x, int y); |
114 | virtual void updateMenu(); | 114 | virtual void updateMenu(); |
@@ -136,7 +136,7 @@ public: | |||
136 | const FbWindow &fbwindow() const { return menu.window; } | 136 | const FbWindow &fbwindow() const { return menu.window; } |
137 | FbWindow &titleWindow() { return menu.title; } | 137 | FbWindow &titleWindow() { return menu.title; } |
138 | FbWindow &frameWindow() { return menu.frame; } | 138 | FbWindow &frameWindow() { return menu.frame; } |
139 | const std::string &label() const { return menu.label; } | 139 | const FbTk::BiDiString &label() const { return menu.label; } |
140 | int x() const { return menu.window.x(); } | 140 | int x() const { return menu.window.x(); } |
141 | int y() const { return menu.window.y(); } | 141 | int y() const { return menu.window.y(); } |
142 | unsigned int width() const { return menu.window.width(); } | 142 | unsigned int width() const { return menu.window.width(); } |
@@ -225,7 +225,7 @@ private: | |||
225 | Pixmap frame_pixmap, title_pixmap, hilite_pixmap; | 225 | Pixmap frame_pixmap, title_pixmap, hilite_pixmap; |
226 | FbTk::FbWindow window, frame, title; | 226 | FbTk::FbWindow window, frame, title; |
227 | 227 | ||
228 | std::string label; | 228 | FbTk::BiDiString label; |
229 | int x_move, y_move, sublevels, persub, minsub, grab_x, grab_y; | 229 | int x_move, y_move, sublevels, persub, minsub, grab_x, grab_y; |
230 | 230 | ||
231 | unsigned int frame_h, item_w; | 231 | unsigned int frame_h, item_w; |