From 36c6024649acf051d194eb47e476ab74fd5bf73f Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 2 Oct 2022 17:06:02 +0200 Subject: [PATCH] Platform/Unix/X11Display: remove setIcon(const std::string&) as this exists in Generic Display class. --- source/Platform/Unix/X11Display.cpp | 10 ---------- source/Platform/Unix/X11Display.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/source/Platform/Unix/X11Display.cpp b/source/Platform/Unix/X11Display.cpp index dea7205..a2f157a 100644 --- a/source/Platform/Unix/X11Display.cpp +++ b/source/Platform/Unix/X11Display.cpp @@ -224,16 +224,6 @@ void X11Display::setCaption(const std::string& caption) ::XStoreName(Xlib::getDisplay(), m_win, caption.c_str()); } -// TODO: Move this up to the non-platform layer. -void X11Display::setIcon(const std::string& icon) -{ - Image img; - - if (img.loadFromFile(icon)) { - setIcon(img.getWidth(), img.getHeight(), img.getPixels()); - } -} - void X11Display::setIcon(unsigned int width, unsigned int height, const uint8_t *pixels) { ::Display* disp = Xlib::getDisplay(); diff --git a/source/Platform/Unix/X11Display.h b/source/Platform/Unix/X11Display.h index 04ee0e9..b2bdeb3 100644 --- a/source/Platform/Unix/X11Display.h +++ b/source/Platform/Unix/X11Display.h @@ -46,8 +46,6 @@ public : virtual void setCaption(const std::string& caption); - virtual void setIcon(const std::string& icon); - virtual void setIcon(unsigned int width, unsigned int height, const uint8_t *pixels); virtual void showCursor(bool value);