diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-08-02 17:32:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-08-02 17:32:03 +0300 |
commit | 4f7b21282f34f38090cb6e25c60f80264192faea (patch) | |
tree | 1697237ff92daee535592d9170cb8e3a3fc90680 /src/gui/widgets | |
parent | 5e9c1e1f9645385693581dfba4625e46126bcbee (diff) | |
download | manaverse-4f7b21282f34f38090cb6e25c60f80264192faea.tar.gz manaverse-4f7b21282f34f38090cb6e25c60f80264192faea.tar.bz2 manaverse-4f7b21282f34f38090cb6e25c60f80264192faea.tar.xz manaverse-4f7b21282f34f38090cb6e25c60f80264192faea.zip |
Fix compilation with some options.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/label.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/label.h | 3 | ||||
-rw-r--r-- | src/gui/widgets/tabs/tab.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/tab.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index c32b72b99..af6fa973d 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -285,7 +285,7 @@ void Label::widgetHidden(const Event &event A_UNUSED) mTextChunk.deleteImage(); } -void Label::final() +void Label::finalCleanup() { mSkin = nullptr; } diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 028d1e8d5..b0240b74c 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -172,7 +172,8 @@ class Label final : public Widget, static int mInstances; - static void final(); + static void finalCleanup(); + private: /** * Holds the caption of the label. diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index 39e966886..25cab2221 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -479,7 +479,7 @@ void Tab::mouseExited(MouseEvent& event A_UNUSED) mHasMouse = false; } -void Tab::final() +void Tab::finalCleanup() { for (int f = 0; f < TAB_COUNT; f ++) { diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index 74b9f46be..042d0e0a8 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -202,7 +202,7 @@ class Tab notfinal : public BasicContainer, void setImage(Image *const image); - static void final(); + static void finalCleanup(); protected: friend class TabbedArea; |