From dc90b8d411d682f10278368d7ead9b1e7383fc03 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Mar 2011 11:16:55 +0000 Subject: [PATCH] Add a dependency of wxUSE_TASKBARICON on wxUSE_MENUS. PopupMenu() method of wxTaskBarIcon doesn't make much sense without wxMenu. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 2e6a95cb38..b5460626f8 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -2084,6 +2084,15 @@ # endif #endif /* wxUSE_SVG */ +#if wxUSE_TASKBARICON && !wxUSE_MENUS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TASKBARICON requires wxUSE_MENUS" +# else +# undef wxUSE_TASKBARICON +# define wxUSE_TASKBARICON 0 +# endif +#endif /* wxUSE_TASKBARICON */ + #if !wxUSE_VARIANT # if wxUSE_DATAVIEWCTRL # ifdef wxABORT_ON_CONFIG_ERROR -- 2.45.2