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/scrollarea.cpp | |
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/scrollarea.cpp')
-rw-r--r-- | src/gui/widgets/scrollarea.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index b508e2dd4..2ca851254 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -50,7 +50,7 @@ static std::string const buttonFiles[2] = }; ScrollArea::ScrollArea(Widget2 *const widget2, - gcn::Widget *const widget, + Widget *const widget, const bool opaque, const std::string &skin) : gcn::ScrollArea(widget2, widget), @@ -179,7 +179,7 @@ void ScrollArea::logic() } gcn::ScrollArea::logic(); - gcn::Widget *const content = getContent(); + Widget *const content = getContent(); // When no scrollbar in a certain direction, adapt content size to match // the content dimension exactly. @@ -656,7 +656,7 @@ void ScrollArea::widgetResized(const Event &event A_UNUSED) { mRedraw = true; const unsigned int frameSize = 2 * mFrameSize; - gcn::Widget *const content = getContent(); + Widget *const content = getContent(); if (content) { content->setSize(mDimension.width - frameSize, @@ -900,7 +900,7 @@ Rectangle ScrollArea::getVerticalMarkerDimension() int height; const int h2 = mShowButtons ? mScrollbarWidth : mMarkerSize / 2; - const gcn::Widget *content; + const Widget *content; if (!mWidgets.empty()) content = *mWidgets.begin(); else @@ -958,7 +958,7 @@ Rectangle ScrollArea::getHorizontalMarkerDimension() int width; const int w2 = mShowButtons ? mScrollbarWidth : mMarkerSize / 2; - const gcn::Widget *content; + const Widget *content; if (!mWidgets.empty()) content = *mWidgets.begin(); else |