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
2007-07-19 01:02:28 +00:00
parent 6f7f0d0a2d
commit 4f167b46b4
21 changed files with 367 additions and 220 deletions
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -21,7 +21,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#ifdef wxHAS_TASK_BAR_ICON
+#if wxUSE_TASKBARICON

 #include "wx/taskbar.h"

@@ -328,4 +328,4 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
    return true;
 }

-#endif // wxHAS_TASK_BAR_ICON
+#endif // wxUSE_TASKBARICON