diff options
| -rw-r--r-- | src/gui/serverdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/checkbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/checkbox.h | 2 | ||||
| -rw-r--r-- | src/localconsts.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 04a07198f..14f97576a 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -176,7 +176,7 @@ public: updateAlpha(); mHighlightColor.a = static_cast<int>(mAlpha * 255.0f); - graphics->setColor(mHighlightColor); + g->setColor(mHighlightColor); const int height = getRowHeight(); mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0f); diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index d46ce28bd..b9abe45fa 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -44,7 +44,7 @@ CheckBox::CheckBox(const Widget2 *const widget, const std::string &eventId) : gcn::CheckBox(caption, selected), Widget2(widget), - mForegroundColor(getThemeColor(Theme::CHECKBOX_OUTLINE)), + mForegroundColor2(getThemeColor(Theme::CHECKBOX_OUTLINE)), mPadding(0), mImagePadding(0), mImageSize(9), diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 408a52031..53e767787 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -86,7 +86,7 @@ class CheckBox final : public gcn::CheckBox, void adjustSize(); private: - gcn::Color mForegroundColor; + gcn::Color mForegroundColor2; int mPadding; int mImagePadding; int mImageSize; diff --git a/src/localconsts.h b/src/localconsts.h index 86943bb80..a6043e58f 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -48,10 +48,12 @@ #ifdef __GNUC__ #define A_UNUSED __attribute__ ((unused)) #define A_WARN_UNUSED __attribute__ ((warn_unused_result)) +#define DEPRECATED __attribute__ ((deprecated)) #else #define A_UNUSED #define A_WARN_UNUSED #define gnu_printf printf +#define DEPRECATED #endif #ifdef __clang__ #define gnu_printf printf |