X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc65a0384df4007a96cd5bab98b0f7abef0af52..0cdd04ad993f86710bc5c9d9c8c12ec25a34ac71:/src/unix/taskbarx11.cpp diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 10373179fb..cf5e12e52a 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -21,14 +21,19 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#ifdef wxHAS_TASK_BAR_ICON + #include "wx/taskbar.h" -#include "wx/frame.h" -#include "wx/bitmap.h" -#include "wx/statbmp.h" -#include "wx/sizer.h" -#include "wx/dcclient.h" -#include "wx/log.h" -#include "wx/image.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/dcclient.h" + #include "wx/statbmp.h" + #include "wx/sizer.h" + #include "wx/bitmap.h" + #include "wx/image.h" +#endif #ifdef __VMS #pragma message disable nosimpint @@ -114,7 +119,7 @@ protected: BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase) EVT_SIZE(wxTaskBarIconArea::OnSizeChange) EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent) - EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent) + EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent) EVT_PAINT(wxTaskBarIconArea::OnPaint) END_EVENT_TABLE() @@ -322,3 +327,5 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) m_iconWnd->PopupMenu(menu); return true; } + +#endif // wxHAS_TASK_BAR_ICON