From f704c288e0028131cad5a248f7b02a9631a5dba6 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 17 Dec 2017 21:52:35 -0800 Subject: [PATCH] Stub out wxTaskBarIcon with GTK+4 GtkStatusIcon is no longer available --- src/gtk/taskbar.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp index b12d1a6c4e..f501457b03 100644 --- a/src/gtk/taskbar.cpp +++ b/src/gtk/taskbar.cpp @@ -15,6 +15,8 @@ #include "wx/taskbar.h" +#ifndef __WXGTK4__ + #ifndef WX_PRECOMP #include "wx/toplevel.h" #include "wx/menu.h" @@ -30,6 +32,8 @@ #endif #include "wx/gtk/private/gtk2-compat.h" +wxGCC_WARNING_SUPPRESS(deprecated-declarations) + #if !GTK_CHECK_VERSION(2,10,0) typedef struct _GtkStatusIcon GtkStatusIcon; #endif @@ -342,4 +346,36 @@ bool wxTaskBarIcon::PopupMenu(wxMenu* menu) return true; } +#else +wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler); + +wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType) +{ + m_priv = NULL; +} + +wxTaskBarIcon::~wxTaskBarIcon() +{ +} + +bool wxTaskBarIcon::SetIcon(const wxIcon&, const wxString&) +{ + return false; +} + +bool wxTaskBarIcon::RemoveIcon() +{ + return false; +} + +bool wxTaskBarIcon::IsIconInstalled() const +{ + return false; +} + +bool wxTaskBarIcon::PopupMenu(wxMenu*) +{ + return false; +} +#endif // __WXGTK4__ #endif // wxUSE_TASKBARICON