diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-01 21:26:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-01 21:26:32 +0300 |
| commit | 6709f3df268223662c9ae1622db3bbc93a83cf8f (patch) | |
| tree | ed6bace0737982a3ed69700ed8cfedd5a0bdd12a /src/gui/base/widgets | |
| parent | 54f1b48226c5aaa20926a93fbfdc8a54712e78f1 (diff) | |
| download | manaverse-6709f3df268223662c9ae1622db3bbc93a83cf8f.tar.gz manaverse-6709f3df268223662c9ae1622db3bbc93a83cf8f.tar.bz2 manaverse-6709f3df268223662c9ae1622db3bbc93a83cf8f.tar.xz manaverse-6709f3df268223662c9ae1622db3bbc93a83cf8f.zip | |
Move basiccontainer into gui/widgets.
Diffstat (limited to 'src/gui/base/widgets')
| -rw-r--r-- | src/gui/base/widgets/container.hpp | 2 | ||||
| -rw-r--r-- | src/gui/base/widgets/scrollarea.cpp | 6 | ||||
| -rw-r--r-- | src/gui/base/widgets/scrollarea.hpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/base/widgets/container.hpp b/src/gui/base/widgets/container.hpp index 3e6c0a587..37984bbc9 100644 --- a/src/gui/base/widgets/container.hpp +++ b/src/gui/base/widgets/container.hpp @@ -64,7 +64,7 @@ #ifndef GCN_CONTAINER_HPP #define GCN_CONTAINER_HPP -#include "gui/base/basiccontainer.hpp" +#include "gui/widgets/basiccontainer.h" namespace gcn { diff --git a/src/gui/base/widgets/scrollarea.cpp b/src/gui/base/widgets/scrollarea.cpp index 665830ce4..3c830c239 100644 --- a/src/gui/base/widgets/scrollarea.cpp +++ b/src/gui/base/widgets/scrollarea.cpp @@ -72,7 +72,7 @@ namespace gcn { ScrollArea::ScrollArea(const Widget2 *const widget) : - gcn::BasicContainer(widget), + BasicContainer(widget), MouseListener(), mVScroll(0), mHScroll(0), @@ -100,7 +100,7 @@ namespace gcn ScrollArea::ScrollArea(const Widget2 *const widget, Widget *const content) : - gcn::BasicContainer(widget), + BasicContainer(widget), MouseListener(), mVScroll(0), mHScroll(0), @@ -131,7 +131,7 @@ namespace gcn Widget *content, ScrollPolicy hPolicy, ScrollPolicy vPolicy) : - gcn::BasicContainer(widget), + BasicContainer(widget), MouseListener(), mVScroll(0), mHScroll(0), diff --git a/src/gui/base/widgets/scrollarea.hpp b/src/gui/base/widgets/scrollarea.hpp index 879792019..624debc35 100644 --- a/src/gui/base/widgets/scrollarea.hpp +++ b/src/gui/base/widgets/scrollarea.hpp @@ -64,7 +64,8 @@ #ifndef GCN_SCROLLAREA_HPP #define GCN_SCROLLAREA_HPP -#include "gui/base/basiccontainer.hpp" +#include "gui/widgets/basiccontainer.h" + #include "listeners/mouselistener.h" namespace gcn |