defs.h doubled include fixed.

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

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 14b4f1dd5b82c960b09a8d7f1cb0788bc2ab8bd3..b08d6cf20d61ba210800e0505a3f3bb53254df17 100644 (file)
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -25,6 +21,7 @@
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
 
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
 

+#include "wx/menu.h"

 #include "wx/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )
 #include "wx/taskbar.h"
 
 DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )


@@ -40,7 +37,7 @@ BEGIN_EVENT_TABLE(wxTaskBarIconBase, wxEvtHandler)
     EVT_TASKBAR_RIGHT_DOWN(wxTaskBarIconBase::OnRightButtonDown)
 END_EVENT_TABLE()
 
     EVT_TASKBAR_RIGHT_DOWN(wxTaskBarIconBase::OnRightButtonDown)
 END_EVENT_TABLE()
 

-void wxTaskBarIconBase::OnRightButtonDown(wxEvent& WXUNUSED(event))
+void wxTaskBarIconBase::OnRightButtonDown(wxTaskBarIconEvent& WXUNUSED(event))

 {
     wxMenu *menu = CreatePopupMenu();
     if (menu)
 {
     wxMenu *menu = CreatePopupMenu();
     if (menu)


@@ -49,5 +46,5 @@ void wxTaskBarIconBase::OnRightButtonDown(wxEvent& WXUNUSED(event))
         delete menu;
     }
 }
         delete menu;
     }
 }

-    
+

 #endif // defined(wxHAS_TASK_BAR_ICON)
 #endif // defined(wxHAS_TASK_BAR_ICON)