svn not cvs

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 64c5dee7ec2ae8cda946f32b8dfa2c1e2296b9a2..8bc91d1d2f26ce2e98d18ddc5e1f3469ced14969 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
 // Purpose:     Implements wxTaskBarIcon class for manipulating icons on
 //              the Windows task bar.
 // Author:      Julian Smart


@@ -10,37 +10,26 @@
 // 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #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
 
 #endif
 

-#if defined(__WIN95__)
-

 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 
 #include <string.h>
 #include "wx/taskbar.h"
 
 #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>
 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <shellapi.h>


@@ -50,18 +39,6 @@
 UINT   gs_msgTaskbar = 0;
 UINT   gs_msgRestartTaskbar = 0;
 
 UINT   gs_msgTaskbar = 0;
 UINT   gs_msgRestartTaskbar = 0;
 

-#if WXWIN_COMPATIBILITY_2_4
-BEGIN_EVENT_TABLE(wxTaskBarIcon, wxTaskBarIconBase)
-    EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
-    EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
-    EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::_OnLButtonUp)
-    EVT_TASKBAR_RIGHT_DOWN   (wxTaskBarIcon::_OnRButtonDown)
-    EVT_TASKBAR_RIGHT_UP     (wxTaskBarIcon::_OnRButtonUp)
-    EVT_TASKBAR_LEFT_DCLICK  (wxTaskBarIcon::_OnLButtonDClick)
-    EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick)
-END_EVENT_TABLE()
-#endif
-

 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 


@@ -81,11 +58,11 @@ class wxTaskBarIconWindow : public wxFrame
 {
 public:
     wxTaskBarIconWindow(wxTaskBarIcon *icon)
 {
 public:
     wxTaskBarIconWindow(wxTaskBarIcon *icon)

-        : wxFrame(NULL, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),
+        : wxFrame(NULL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0),

           m_icon(icon)
     {
     }
           m_icon(icon)
     {
     }

-    
+

     WXLRESULT MSWWindowProc(WXUINT msg,
                             WXWPARAM wParam, WXLPARAM lParam)
     {
     WXLRESULT MSWWindowProc(WXUINT msg,
                             WXWPARAM wParam, WXLPARAM lParam)
     {


@@ -103,7 +80,7 @@ private:
     wxTaskBarIcon *m_icon;
 };
 
     wxTaskBarIcon *m_icon;
 };
 

-    
+

 // ----------------------------------------------------------------------------
 // NotifyIconData: wrapper around NOTIFYICONDATA
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // NotifyIconData: wrapper around NOTIFYICONDATA
 // ----------------------------------------------------------------------------


@@ -147,8 +124,8 @@ wxTaskBarIcon::~wxTaskBarIcon()
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 // 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)
     {
     //     is initialized (as samples/taskbar used to do)
     if (!m_win)
     {


@@ -158,7 +135,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     m_icon = icon;
     m_strTooltip = tooltip;
 
     m_icon = icon;
     m_strTooltip = tooltip;
 

-    NotifyIconData notifyData((HWND)m_win->GetHWND());
+    NotifyIconData notifyData(GetHwndOf(m_win));

 
     if (icon.Ok())
     {
 
     if (icon.Ok())
     {


@@ -189,7 +166,7 @@ bool wxTaskBarIcon::RemoveIcon()
 
     m_iconAdded = false;
 
 
     m_iconAdded = false;
 

-    NotifyIconData notifyData((HWND)m_win->GetHWND());
+    NotifyIconData notifyData(GetHwndOf(m_win));

 
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
 
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }


@@ -209,18 +186,19 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     wxGetMousePosition(&x, &y);
 
     m_win->Move(x, y);
     wxGetMousePosition(&x, &y);
 
     m_win->Move(x, y);

-    
+

     m_win->PushEventHandler(this);
 
     menu->UpdateUI();
 
     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);
 
 
     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);
 
 
     m_win->PopEventHandler(false);
 


@@ -229,38 +207,12 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     return rval;
 }
 
     return rval;
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-// Overridables
-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()
 {
     static bool s_registered = false;
 
     if ( !s_registered )
 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"));
 
         // Taskbar restart msg will be sent to us if the icon needs to be redrawn
         gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated"));
 


@@ -333,5 +285,3 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
 
     return 0;
 }
 
     return 0;
 }

-
-#endif // __WIN95__