summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-18 23:44:08 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-19 02:32:14 +0300
commit83d4185ef116b1813742399dbf40547a4c9f7216 (patch)
tree31d19acf8a47f703dd996b338e2429a9326213e0
parentf08475dbeee9fd5490afff5e50fee727685ddd09 (diff)
downloadplus-83d4185ef116b1813742399dbf40547a4c9f7216.tar.gz
plus-83d4185ef116b1813742399dbf40547a4c9f7216.tar.bz2
plus-83d4185ef116b1813742399dbf40547a4c9f7216.tar.xz
plus-83d4185ef116b1813742399dbf40547a4c9f7216.zip
Unhide some virtual methods.
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/table.cpp4
-rw-r--r--src/gui/widgets/table.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index bd43e4dc7..be817a68a 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -147,7 +147,7 @@ void TabbedArea::addTab(const std::string &caption, gcn::Widget *widget)
addTab(tab, widget);
}
-void TabbedArea::removeTab(Tab *tab)
+void TabbedArea::removeTab(gcn::Tab *tab)
{
int tabIndexToBeSelected = -1;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index b48f83240..00c1aaf23 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -102,7 +102,7 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
/**
* Overload the remove tab function as it's broken in guichan 0.8.
*/
- void removeTab(Tab *tab);
+ void removeTab(gcn::Tab *tab);
/**
* Overload the logic function since it's broken in guichan 0.8.
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp
index 81efa5d12..ab8b3a339 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -392,7 +392,7 @@ void GuiTable::moveToBottom(gcn::Widget *widget)
mTopWidget = NULL;
}
-gcn::Rectangle GuiTable::getChildrenArea() const
+gcn::Rectangle GuiTable::getChildrenArea()
{
return gcn::Rectangle(0, 0, getWidth(), getHeight());
}
@@ -515,7 +515,7 @@ void GuiTable::modelUpdated(bool completed)
}
}
-gcn::Widget *GuiTable::getWidgetAt(int x, int y) const
+gcn::Widget *GuiTable::getWidgetAt(int x, int y)
{
int row = getRowForY(y);
int column = getColumnForX(x);
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h
index 8d8577cef..f7473c535 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/table.h
@@ -94,7 +94,7 @@ public:
void setWrappingEnabled(bool wrappingEnabled)
{ mWrappingEnabled = wrappingEnabled; }
- gcn::Rectangle getChildrenArea() const;
+ gcn::Rectangle getChildrenArea();
/**
* Toggle whether to use linewise selection mode, in which the table selects
@@ -112,7 +112,7 @@ public:
// Inherited from Widget
virtual void draw(gcn::Graphics* graphics);
- virtual gcn::Widget *getWidgetAt(int x, int y) const;
+ virtual gcn::Widget *getWidgetAt(int x, int y);
virtual void moveToTop(gcn::Widget *child);