Made wxBORDER_THEME the same as wxBORDER_DEFAULT

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

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 14b4f1dd5b82c960b09a8d7f1cb0788bc2ab8bd3..29f39c23ee4357d95b20ec850ce782473a1beadb 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:
@@ -9,22 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#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 __BORLANDC__
+    #pragma hdrstop
+#endif
 
-#ifdef wxHAS_TASK_BAR_ICON
+#if wxUSE_TASKBARICON
+
+#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/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )
@@ -37,10 +38,10 @@ DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK )
 
 
 BEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler)
-    EVT_TASKBAR_RIGHT_DOWN(wxTaskBarIconBase::OnRightButtonDown)
+    EVT_TASKBAR_CLICK(wxTaskBarIconBase::OnRightButtonDown)
 END_EVENT_TABLE()
 
-void wxTaskBarIconBase::OnRightButtonDown(wxEvent& WXUNUSED(event))
+void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event))
 {
     wxMenu *menu = CreatePopupMenu();
     if (menu)
@@ -49,5 +50,5 @@ void wxTaskBarIconBase::OnRightButtonDown(wxEvent& WXUNUSED(event))
         delete menu;
     }
 }
-    
-#endif // defined(wxHAS_TASK_BAR_ICON)
+
+#endif // wxUSE_TASKBARICON