X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..8da1f9a99ee0ff9493cc7845ec13100cdeac431c:/src/unix/taskbarx11.cpp

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index a4d1798111..cf94b21583 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -32,6 +32,7 @@
 #include "wx/sizer.h"
 #include "wx/dcclient.h"
 #include "wx/log.h"
+#include "wx/image.h"
 
 #ifdef __VMS
 #pragma message disable nosimpint
@@ -47,8 +48,14 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__
-    #include "wx/gtk/taskbarpriv.h"
-#else
+    #include <gtk/gtk.h>
+    #if GTK_CHECK_VERSION(2,1,0)
+        #include "wx/gtk/taskbarpriv.h"
+        #define TASKBAR_ICON_AREA_BASE_INCLUDED
+    #endif
+#endif
+
+#ifndef TASKBAR_ICON_AREA_BASE_INCLUDED
     class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxFrame
     {
     public:
@@ -310,7 +317,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     if (!m_iconWnd)
         return false;
-    wxSize size(m_iconWnd->GetClientSize());
     m_iconWnd->PopupMenu(menu);
     return true;
 }