]> git.saurik.com Git - wxWidgets.git/commitdiff
Add a dependency of wxUSE_TASKBARICON on wxUSE_MENUS.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 5 Mar 2011 11:16:55 +0000 (11:16 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 5 Mar 2011 11:16:55 +0000 (11:16 +0000)
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

index 2e6a95cb38f888154225d0163261499f72651956..b5460626f8edece384a4db295acc0b6aba50f01e 100644 (file)
 #   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