[ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.

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

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index b08d6cf20d61ba210800e0505a3f3bb53254df17..ad25c102e45bedea997b4f54fa9c9c1f6d476f5a 100644 (file)
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// File:        taskbarcmn.cpp
+// File:        src/common/taskbarcmn.cpp
 // Purpose:     Common parts of wxTaskBarIcon class
 // Author:      Julian Smart
 // Modified by:
@@ -12,16 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #ifdef wxHAS_TASK_BAR_ICON
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/menu.h"
+#endif
+
 // DLL options compatibility check:
-#include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
-
-#include "wx/menu.h"
 #include "wx/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )