compilation fix for wxUSE_ON_FATAL_EXCEPTION == 0

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 6be5dd0428a38ef9471ed34f0c02134099222a23..612c198adf2ed9375d1cec8f0e2625f7667cad33 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -3,14 +3,14 @@
 // 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

-// Modified by:
+// Modified by: Vaclav Slavik

 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "taskbar.h"
 #endif
 
 #pragma implementation "taskbar.h"
 #endif
 


@@ -29,47 +29,29 @@
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"
 #endif
 

-#if defined(__WIN95__) && !defined(__TWIN32__)
-
-#include <windows.h>
+#if defined(__WIN95__)

 
 

+#include "wx/msw/private.h"

 #include "wx/msw/winundef.h"
 
 #include <string.h>
 #include "wx/msw/winundef.h"
 
 #include <string.h>

-#include "wx/msw/taskbar.h"
-#include "wx/msw/private.h"
+#include "wx/taskbar.h"

 
 

-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"

 #endif
 
 #endif
 

-#ifdef __SALFORDC__
+#ifdef __WXWINCE__
+    #include <winreg.h>

     #include <shellapi.h>
 #endif
 
     #include <shellapi.h>
 #endif
 

-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxTaskBarIconList);
-
-LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
-                                     UINT wParam, LONG lParam );
-
-wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass");
-
-wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons;
-bool   wxTaskBarIcon::sm_registeredClass = FALSE;
-UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
+// initialized on demand
+UINT   gs_msgTaskbar = 0;
+UINT   gs_msgRestartTaskbar = 0;

 
 

-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK )
-DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK )
-
-BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
+#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_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
     EVT_TASKBAR_LEFT_UP      (wxTaskBarIcon::_OnLButtonUp)


@@ -78,97 +60,143 @@ BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_LEFT_DCLICK  (wxTaskBarIcon::_OnLButtonDClick)
     EVT_TASKBAR_RIGHT_DCLICK (wxTaskBarIcon::_OnRButtonDClick)
 END_EVENT_TABLE()
     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)
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxTaskBarIconWindow: helper window
+// ----------------------------------------------------------------------------

 
 

-wxTaskBarIcon::wxTaskBarIcon(void)
+// NB: this class serves two purposes:
+//     1. win32 needs a HWND associated with taskbar icon, this provides it
+//     2. we need wxTopLevelWindow so that the app doesn't exit when
+//        last frame is closed but there still is a taskbar icon
+class wxTaskBarIconWindow : public wxFrame

 {
 {

-    m_hWnd = 0;
-    m_iconAdded = false;
+public:
+    wxTaskBarIconWindow(wxTaskBarIcon *icon)
+        : 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(msg, wParam, lParam);
+        }
+        else
+        {
+            return wxFrame::MSWWindowProc(msg, wParam, lParam);
+        }
+    }

 
 

-    AddObject(this);
+private:
+    wxTaskBarIcon *m_icon;
+};

 
 

-    if (RegisterWindowClass())
-        m_hWnd = CreateTaskBarWindow();
-}

 
 

-wxTaskBarIcon::~wxTaskBarIcon(void)
+// ----------------------------------------------------------------------------
+// NotifyIconData: wrapper around NOTIFYICONDATA
+// ----------------------------------------------------------------------------
+
+struct NotifyIconData : public NOTIFYICONDATA
+{
+    NotifyIconData(WXHWND hwnd)
+    {
+        memset(this, 0, sizeof(NOTIFYICONDATA));
+        cbSize = sizeof(NOTIFYICONDATA);
+        hWnd = (HWND) hwnd;
+        uCallbackMessage = gs_msgTaskbar;
+        uFlags = NIF_MESSAGE;
+
+        // we use the same id for all taskbar icons as we don't need it to
+        // distinguish between them
+        uID = 99;
+    }
+};
+
+// ----------------------------------------------------------------------------
+// wxTaskBarIcon
+// ----------------------------------------------------------------------------
+
+wxTaskBarIcon::wxTaskBarIcon()

 {
 {

-    RemoveObject(this);
+    m_win = NULL;
+    m_iconAdded = false;
+    RegisterWindowMessages();
+}

 
 

+wxTaskBarIcon::~wxTaskBarIcon()
+{

     if (m_iconAdded)
     if (m_iconAdded)

-    {

         RemoveIcon();
         RemoveIcon();

-    }

 
 

-    if (m_hWnd)
-    {
-        ::DestroyWindow((HWND) m_hWnd);
-        m_hWnd = 0;
-    }
+    if (m_win)
+        m_win->Destroy();

 }
 
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 }
 
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    if (!IsOK())
-        return false;
+    // NB: we have to create the window lazily because of backward compatiblity,
+    //     old aplications may create wxTaskBarIcon instance before wxApp
+    //     is initialized (as samples/taskbar used to do)
+    if (!m_win)
+    {
+        m_win = new wxTaskBarIconWindow(this);
+    }
+
+    m_icon = icon;
+    m_strTooltip = tooltip;

 
 

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

 
 

-    memset(&notifyData, 0, sizeof(notifyData));
-        notifyData.cbSize = sizeof(notifyData);
-        notifyData.hWnd = (HWND) m_hWnd;
-        notifyData.uCallbackMessage = sm_taskbarMsg;
-        notifyData.uFlags = NIF_MESSAGE ;

     if (icon.Ok())
     {
         notifyData.uFlags |= NIF_ICON;
     if (icon.Ok())
     {
         notifyData.uFlags |= NIF_ICON;

-        notifyData.hIcon = (HICON) icon.GetHICON();
+        notifyData.hIcon = GetHiconOf(icon);

     }
 
     }
 

-    if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
+    if ( !tooltip.empty() )

     {
     {

-        notifyData.uFlags |= NIF_TIP ;
-                lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
+        notifyData.uFlags |= NIF_TIP;
+//        lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
+        wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));

     }
 
     }
 

-    notifyData.uID = 99;
+    bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY
+                                           : NIM_ADD, &notifyData) != 0;

 
 

-    if (m_iconAdded)
-        return (Shell_NotifyIcon(NIM_MODIFY, & notifyData) != 0);
-    else
-    {
-        m_iconAdded = (Shell_NotifyIcon(NIM_ADD, & notifyData) != 0);
-        return m_iconAdded;
-    }
+    if ( !m_iconAdded && ok )
+        m_iconAdded = true;
+
+    return ok;

 }
 
 }
 

-bool wxTaskBarIcon::RemoveIcon(void)
+bool wxTaskBarIcon::RemoveIcon()

 {
     if (!m_iconAdded)
         return false;
 
 {
     if (!m_iconAdded)
         return false;
 

-    NOTIFYICONDATA notifyData;
-
-    memset(&notifyData, 0, sizeof(notifyData));
-        notifyData.cbSize = sizeof(notifyData);
-        notifyData.hWnd = (HWND) m_hWnd;
-        notifyData.uCallbackMessage = sm_taskbarMsg;
-        notifyData.uFlags = NIF_MESSAGE;
-        notifyData.hIcon = 0 ; // hIcon;
-    notifyData.uID = 99;

     m_iconAdded = false;
 
     m_iconAdded = false;
 

-    return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
+    NotifyIconData notifyData((HWND)m_win->GetHWND());
+
+    return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;

 }
 
 }
 

-bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
+bool wxTaskBarIcon::PopupMenu(wxMenu *menu)

 {
 {

-    // OK, so I know this isn't thread-friendly, but
-    // what to do? We need this check.
+    wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") );

 
     static bool s_inPopup = false;
 
 
     static bool s_inPopup = false;
 


@@ -177,158 +205,90 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 
     s_inPopup = true;
 
 
     s_inPopup = true;
 

-    bool        rval = false;
-    wxWindow*   win;

     int         x, y;
     wxGetMousePosition(&x, &y);
 
     int         x, y;
     wxGetMousePosition(&x, &y);
 

-    // is wxFrame the best window type to use???
-    win = new wxFrame(NULL, -1, wxEmptyString, wxPoint(x,y), wxSize(-1,-1), 0);
-    win->PushEventHandler(this);
+    m_win->Move(x, y);

 
 

-    // Remove from record of top-level windows, or will confuse wxWindows
-    // if we try to exit right now.
-    wxTopLevelWindows.DeleteObject(win);
+    m_win->PushEventHandler(this);

 
     menu->UpdateUI();
 
     // Work around a WIN32 bug
 
     menu->UpdateUI();
 
     // Work around a WIN32 bug

-    ::SetForegroundWindow ((HWND) win->GetHWND ());
+    ::SetForegroundWindow((HWND)m_win->GetHWND());

 
 

-    rval = win->PopupMenu(menu, 0, 0);
+    bool rval = m_win->PopupMenu(menu, 0, 0);

 
     // Work around a WIN32 bug
 
     // Work around a WIN32 bug

-    ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
+    ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L);

 
 

-    win->PopEventHandler(false);
-    win->Destroy();
-    delete win;
+    m_win->PopEventHandler(false);

 
     s_inPopup = false;
 
     return rval;
 }
 
 
     s_inPopup = false;
 
     return rval;
 }
 

-
+#if WXWIN_COMPATIBILITY_2_4

 // Overridables
 // Overridables

-void wxTaskBarIcon::OnMouseMove(wxEvent&)
-{
-}
+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::OnLButtonDown(wxEvent&)
+void wxTaskBarIcon::RegisterWindowMessages()

 {
 {

-}
+    static bool s_registered = false;

 
 

-void wxTaskBarIcon::OnLButtonUp(wxEvent&)
-{
-}
+    if ( !s_registered )
+    {
+        // Taskbar restart msg will be sent to us if the icon needs to be redrawn
+        gs_msgRestartTaskbar = RegisterWindowMessage(wxT("TaskbarCreated"));

 
 

-void wxTaskBarIcon::OnRButtonDown(wxEvent&)
-{
-}
+        // Also register the taskbar message here
+        gs_msgTaskbar = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));

 
 

-void wxTaskBarIcon::OnRButtonUp(wxEvent&)
-{
+        s_registered = true;
+    }

 }
 
 }
 

-void wxTaskBarIcon::OnLButtonDClick(wxEvent&)
-{
-}
+// ----------------------------------------------------------------------------
+// wxTaskBarIcon window proc
+// ----------------------------------------------------------------------------

 
 

-void wxTaskBarIcon::OnRButtonDClick(wxEvent&)
+long wxTaskBarIcon::WindowProc(unsigned int msg,
+                               unsigned int WXUNUSED(wParam),
+                               long lParam)

 {
 {

-}
-
-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); }
-
+    wxEventType eventType = 0;

 
 

-wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
-{
-    wxTaskBarIconList::Node *node = sm_taskBarIcons.GetFirst();
-    while (node)
+    if (msg == gs_msgRestartTaskbar)   // does the icon need to be redrawn?

     {
     {

-        wxTaskBarIcon *obj = node->GetData();
-        if (obj->GetHWND() == hWnd)
-            return obj;
-        node = node->GetNext();
+        m_iconAdded = false;
+        SetIcon(m_icon, m_strTooltip);

     }
     }

-    return NULL;
-}
-
-void wxTaskBarIcon::AddObject(wxTaskBarIcon* obj)
-{
-    sm_taskBarIcons.Append(obj);
-}
-
-void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj)
-{
-    sm_taskBarIcons.DeleteObject(obj);
-}

 
 

-bool wxTaskBarIcon::RegisterWindowClass()
-{
-    if (sm_registeredClass)
-        return true;
-
-    // Also register the taskbar message here
-    sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
-
-    WNDCLASS        wc;
-    bool        rc;
-
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-
-    /*
-     * set up and register window class
-     */
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc = (WNDPROC) wxTaskBarIconWindowProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = 0;
-    wc.hInstance = hInstance;
-    wc.hIcon = 0;
-    wc.hCursor = 0;
-    wc.hbrBackground = 0;
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = wxTaskBarWindowClass ;
-    rc = (::RegisterClass( &wc ) != 0);
-
-    sm_registeredClass = (rc != 0);
-
-    return( (rc != 0) );
-}
-
-WXHWND wxTaskBarIcon::CreateTaskBarWindow()
-{
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-
-    HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
-            wxT("wxTaskBarWindow"),
-            WS_OVERLAPPED,
-            0,
-            0,
-            10,
-            10,
-            NULL,
-            (HMENU) 0,
-            hInstance,
-            NULL);
-
-    return (WXHWND) hWnd;
-}
-
-long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam )
-{
-    wxEventType eventType = 0;
-
-    if (msg != sm_taskbarMsg)
-        return DefWindowProc((HWND) hWnd, msg, wParam, lParam);
+    // this function should only be called for gs_msg(Restart)Taskbar messages
+    wxASSERT(msg == gs_msgTaskbar);

 
     switch (lParam)
     {
 
     switch (lParam)
     {


@@ -362,25 +322,16 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar
 
         default:
             break;
 
         default:
             break;

-        }
+    }

 
 

-    if (eventType) {
+    if (eventType)
+    {

         wxTaskBarIconEvent event(eventType, this);
 
         ProcessEvent(event);
     }
         wxTaskBarIconEvent event(eventType, this);
 
         ProcessEvent(event);
     }

-    return 0;
-}

 
 

-LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
-                                     UINT wParam, LONG lParam )
-{
-    wxTaskBarIcon *obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd);
-    if (obj)
-        return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam);
-    else
-        return DefWindowProc(hWnd, msg, wParam, lParam);
+    return 0;

 }
 
 }
 

-#endif
-    // __WIN95__
+#endif // __WIN95__