Modified wxGetHomeDir to take environment variable HOME into account.

[wxWidgets.git] / src / common / taskbarcmn.cpp

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 0d3559c7baf1dd3db8a7b15cff4a71d19dcc4bdd..61414495e28270862e2855ceff3810ee4083c756 100644 (file)
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -9,13 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "taskbar.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/defs.h"
+
+#ifdef wxHAS_TASK_BAR_ICON
+
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxAdvanced")
+
+
 #include "wx/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )
@@ -25,3 +34,5 @@ DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN )
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP )
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK )
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK )
+
+#endif //def wxHAS_TASK_BAR_ICON