unused parameter warning fix after last change

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index f6512bba8bb4103a82f36ca2f92d1786b5e7c91c..503480beae4d2d1d313affb2367734e031054cb2 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// File:        taskbar.cpp
+// File:        src/msw/taskbar.cpp
 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the Windows task bar.
 // Author:      Julian Smart
@@ -10,37 +10,26 @@
 // 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"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/utils.h"
-#include "wx/menu.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/utils.h"
+    #include "wx/menu.h"
 #endif
 
-#if defined(__WIN95__)
-
 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 
 #include <string.h>
 #include "wx/taskbar.h"
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <shellapi.h>
@@ -51,7 +40,7 @@ UINT   gs_msgTaskbar = 0;
 UINT   gs_msgRestartTaskbar = 0;
 
 #if WXWIN_COMPATIBILITY_2_4
-BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
+BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
     EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::_OnLButtonUp)
@@ -81,17 +70,17 @@ class wxTaskBarIconWindow : public wxFrame
 {
 public:
     wxTaskBarIconWindow(wxTaskBarIcon *icon)
-        : wxFrame(NULL, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),
+        : wxFrame(NULL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),
           m_icon(icon)
     {
     }
-    
+
     WXLRESULT MSWWindowProc(WXUINT msg,
                             WXWPARAM wParam, WXLPARAM lParam)
     {
         if (msg == gs_msgRestartTaskbar || msg == gs_msgTaskbar)
         {
-            return m_icon->WindowProc(GetHWND(), msg, wParam, lParam);
+            return m_icon->WindowProc(msg, wParam, lParam);
         }
         else
         {
@@ -103,7 +92,7 @@ private:
     wxTaskBarIcon *m_icon;
 };
 
-    
+
 // ----------------------------------------------------------------------------
 // NotifyIconData: wrapper around NOTIFYICONDATA
 // ----------------------------------------------------------------------------
@@ -147,8 +136,8 @@ wxTaskBarIcon::~wxTaskBarIcon()
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
-    // NB: we have to create the window lazily because of backward compatiblity,
-    //     old aplications may create wxTaskBarIcon instance before wxApp
+    // NB: we have to create the window lazily because of backward compatibility,
+    //     old applications may create a wxTaskBarIcon instance before wxApp
     //     is initialized (as samples/taskbar used to do)
     if (!m_win)
     {
@@ -158,7 +147,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     m_icon = icon;
     m_strTooltip = tooltip;
 
-    NotifyIconData notifyData((HWND)m_win->GetHWND());
+    NotifyIconData notifyData(GetHwndOf(m_win));
 
     if (icon.Ok())
     {
@@ -189,7 +178,7 @@ bool wxTaskBarIcon::RemoveIcon()
 
     m_iconAdded = false;
 
-    NotifyIconData notifyData((HWND)m_win->GetHWND());
+    NotifyIconData notifyData(GetHwndOf(m_win));
 
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
@@ -209,18 +198,19 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     wxGetMousePosition(&x, &y);
 
     m_win->Move(x, y);
-    
+
     m_win->PushEventHandler(this);
 
     menu->UpdateUI();
 
-    // Work around a WIN32 bug
-    ::SetForegroundWindow((HWND)m_win->GetHWND());
+    // the SetForegroundWindow() and PostMessage() calls are needed to work
+    // around Win32 bug with the popup menus shown for the notifications as
+    // documented at http://support.microsoft.com/kb/q135788/
+    ::SetForegroundWindow(GetHwndOf(m_win));
 
     bool rval = m_win->PopupMenu(menu, 0, 0);
 
-    // Work around a WIN32 bug
-    ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L);
+    ::PostMessage(GetHwndOf(m_win), WM_NULL, 0, 0L);
 
     m_win->PopEventHandler(false);
 
@@ -231,21 +221,28 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 
 #if WXWIN_COMPATIBILITY_2_4
 // Overridables
-void wxTaskBarIcon::OnMouseMove(wxEvent&)         {}
-void wxTaskBarIcon::OnLButtonDown(wxEvent&)       {}
-void wxTaskBarIcon::OnLButtonUp(wxEvent&)         {}
-void wxTaskBarIcon::OnRButtonDown(wxEvent&)       {}
-void wxTaskBarIcon::OnRButtonUp(wxEvent&)         {}
-void wxTaskBarIcon::OnLButtonDClick(wxEvent&)     {}
-void wxTaskBarIcon::OnRButtonDClick(wxEvent&)     {}
-
-void wxTaskBarIcon::_OnMouseMove(wxEvent& e)      { OnMouseMove(e);     }
-void wxTaskBarIcon::_OnLButtonDown(wxEvent& e)    { OnLButtonDown(e);   }
-void wxTaskBarIcon::_OnLButtonUp(wxEvent& e)      { OnLButtonUp(e);     }
-void wxTaskBarIcon::_OnRButtonDown(wxEvent& e)    { OnRButtonDown(e);   }
-void wxTaskBarIcon::_OnRButtonUp(wxEvent& e)      { OnRButtonUp(e);     }
-void wxTaskBarIcon::_OnLButtonDClick(wxEvent& e)  { OnLButtonDClick(e); }
-void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e)  { OnRButtonDClick(e); }
+void wxTaskBarIcon::OnMouseMove(wxEvent& e)         { e.Skip(); }
+void wxTaskBarIcon::OnLButtonDown(wxEvent& e)       { e.Skip(); }
+void wxTaskBarIcon::OnLButtonUp(wxEvent& e)         { e.Skip(); }
+void wxTaskBarIcon::OnRButtonDown(wxEvent& e)       { e.Skip(); }
+void wxTaskBarIcon::OnRButtonUp(wxEvent& e)         { e.Skip(); }
+void wxTaskBarIcon::OnLButtonDClick(wxEvent& e)     { e.Skip(); }
+void wxTaskBarIcon::OnRButtonDClick(wxEvent& e)     { e.Skip(); }
+
+void wxTaskBarIcon::_OnMouseMove(wxTaskBarIconEvent& e)
+    { OnMouseMove(e);     }
+void wxTaskBarIcon::_OnLButtonDown(wxTaskBarIconEvent& e)
+    { OnLButtonDown(e);   }
+void wxTaskBarIcon::_OnLButtonUp(wxTaskBarIconEvent& e)
+    { OnLButtonUp(e);     }
+void wxTaskBarIcon::_OnRButtonDown(wxTaskBarIconEvent& e)
+    { OnRButtonDown(e);   }
+void wxTaskBarIcon::_OnRButtonUp(wxTaskBarIconEvent& e)
+    { OnRButtonUp(e);     }
+void wxTaskBarIcon::_OnLButtonDClick(wxTaskBarIconEvent& e)
+    { OnLButtonDClick(e); }
+void wxTaskBarIcon::_OnRButtonDClick(wxTaskBarIconEvent& e)
+    { OnRButtonDClick(e); }
 #endif
 
 void wxTaskBarIcon::RegisterWindowMessages()
@@ -253,7 +250,7 @@ void wxTaskBarIcon::RegisterWindowMessages()
     static bool s_registered = false;
 
     if ( !s_registered )
-    {   
+    {
         // Taskbar restart msg will be sent to us if the icon needs to be redrawn
         gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated"));
 
@@ -268,9 +265,8 @@ void wxTaskBarIcon::RegisterWindowMessages()
 // wxTaskBarIcon window proc
 // ----------------------------------------------------------------------------
 
-long wxTaskBarIcon::WindowProc(WXHWND hWnd,
-                               unsigned int msg,
-                               unsigned int wParam,
+long wxTaskBarIcon::WindowProc(unsigned int msg,
+                               unsigned int WXUNUSED(wParam),
                                long lParam)
 {
     wxEventType eventType = 0;
@@ -327,5 +323,3 @@ long wxTaskBarIcon::WindowProc(WXHWND hWnd,
 
     return 0;
 }
-
-#endif // __WIN95__