diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/gui/widgets/layout.h | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.gz manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.bz2 manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.xz manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/gui/widgets/layout.h')
| -rw-r--r-- | src/gui/widgets/layout.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 5e3ac4532..c4c703644 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -23,6 +23,8 @@ #ifndef WIDGET_LAYOUT_H #define WIDGET_LAYOUT_H +#include "localconsts.h" + #include <guichan/widgets/container.hpp> #include <vector> @@ -35,7 +37,7 @@ class LayoutCell; class ContainerPlacer { public: - ContainerPlacer(gcn::Container *c = NULL, LayoutCell *l = NULL): + ContainerPlacer(gcn::Container *c = nullptr, LayoutCell *l = nullptr): mContainer(c), mCell(l) {} @@ -172,7 +174,7 @@ class LayoutCell }; LayoutCell(): - mWidget(0), + mWidget(nullptr), mHPadding(0), mVPadding(0), mType(NONE) |