diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 15:43:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 15:43:12 +0300 |
commit | 4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06 (patch) | |
tree | 22b6f851e3ac90590828761a79e91fe1512c2adf /src/gui/widgets/layout.h | |
parent | 2c110bf45eb53807378bbd2abf70268aa0c2197f (diff) | |
download | manaplus-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.gz manaplus-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.bz2 manaplus-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.tar.xz manaplus-4e7a7c79f41a5aa509fa639f0d3e972ab7db6b06.zip |
Move Widget into gui/widgets directory.
Diffstat (limited to 'src/gui/widgets/layout.h')
-rw-r--r-- | src/gui/widgets/layout.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 85998d8e7..288c282a0 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -32,9 +32,10 @@ class LayoutCell; namespace gcn { class Container; - class Widget; } +class Widget; + /** * This class is a helper for adding widgets to nested tables in a window. */ @@ -61,7 +62,7 @@ class ContainerPlacer final * Adds the given widget to the container and places it in the layout. * @see LayoutArray::place */ - LayoutCell &operator()(const int x, const int y, gcn::Widget *const wg, + LayoutCell &operator()(const int x, const int y, Widget *const wg, const int w = 1, const int h = 1); private: @@ -94,7 +95,7 @@ class LayoutArray final * @note When @a w is 1, the width of column @a x is reset to zero if * it was AUTO_DEF. Similarly for @a h. */ - LayoutCell &place(gcn::Widget *const widget, const int x, const int y, + LayoutCell &place(Widget *const widget, const int x, const int y, const int w = 1, const int h = 1); /** @@ -220,7 +221,7 @@ class LayoutCell /** * @see LayoutArray::place */ - LayoutCell &place(gcn::Widget *wg, int x, int y, int w = 1, int h = 1) + LayoutCell &place(Widget *wg, int x, int y, int w = 1, int h = 1) { return getArray().place(wg, x, y, w, h); } /** @@ -298,7 +299,7 @@ class LayoutCell union { - gcn::Widget *mWidget; + Widget *mWidget; LayoutArray *mArray; }; |