added wxUSE_TASKBARICON; corrected condition for generating the taskbar sample makefile in configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
10
configure.in
10
configure.in
@@ -829,6 +829,7 @@ WX_ARG_FEATURE(statline, [ --enable-statline use wxStaticLine class],
|
||||
WX_ARG_FEATURE(stattext, [ --enable-stattext use wxStaticText class], wxUSE_STATTEXT)
|
||||
WX_ARG_FEATURE(statusbar, [ --enable-statusbar use wxStatusBar class], wxUSE_STATUSBAR)
|
||||
WX_ARG_FEATURE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TAB_DIALOG)
|
||||
WX_ARG_FEATURE(taskbaricon, [ --enable-taskbaricon use wxTaskBarIcon class], wxUSE_TASKBARICON)
|
||||
WX_ARG_FEATURE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxUSE_TEXTCTRL)
|
||||
WX_ARG_FEATURE(togglebtn, [ --enable-togglebtn use wxToggleButton class], wxUSE_TOGGLEBTN)
|
||||
WX_ARG_FEATURE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
|
||||
@@ -6891,10 +6892,11 @@ fi
|
||||
|
||||
if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
|
||||
AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
|
||||
if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
|
||||
"$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TASKBARICON" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TASKBARICON)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
|
||||
fi
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user