Platform/Unix/X11Display: remove setIcon(const std::string&) as this exists in Generic Display class.
This commit is contained in:
parent
a8fa3981f4
commit
36c6024649
2 changed files with 0 additions and 12 deletions
|
|
@ -224,16 +224,6 @@ void X11Display::setCaption(const std::string& caption)
|
||||||
::XStoreName(Xlib::getDisplay(), m_win, caption.c_str());
|
::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)
|
void X11Display::setIcon(unsigned int width, unsigned int height, const uint8_t *pixels)
|
||||||
{
|
{
|
||||||
::Display* disp = Xlib::getDisplay();
|
::Display* disp = Xlib::getDisplay();
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,6 @@ public :
|
||||||
|
|
||||||
virtual void setCaption(const std::string& caption);
|
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 setIcon(unsigned int width, unsigned int height, const uint8_t *pixels);
|
||||||
|
|
||||||
virtual void showCursor(bool value);
|
virtual void showCursor(bool value);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue