From: Vadim Zeitlin Date: Mon, 19 Mar 2012 12:53:32 +0000 (+0000) Subject: Define wxUSE_TASKBARICON_BALLOONS as 1 for wxMSW builds using configure. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6d1bebabf92c05155e09a06cf3168bf2ee95f220?hp=2392b8e8712b34c635f7079970a6ca2852493c69 Define wxUSE_TASKBARICON_BALLOONS as 1 for wxMSW builds using configure. Defining it as 1 is better than not allowing to set it at all and this setting is not important enough to warrant its own command-line configure option. Closes #14106. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/configure b/configure index e0050ad556..b91aa76595 100755 --- a/configure +++ b/configure @@ -50572,6 +50572,10 @@ fi if test "$wxUSE_TASKBARICON" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_TASKBARICON 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TASKBARICON_BALLOONS 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" diff --git a/configure.in b/configure.in index 1423cbb8d7..613a505c6c 100644 --- a/configure.in +++ b/configure.in @@ -7225,6 +7225,10 @@ fi if test "$wxUSE_TASKBARICON" = "yes"; then AC_DEFINE(wxUSE_TASKBARICON) + dnl This is used under MSW, just enable it always without testing for the + dnl toolkit nor providing a separate option for it because it's totally + dnl harmless to have it defined even if it's unnecessary. + AC_DEFINE(wxUSE_TASKBARICON_BALLOONS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi