Add tests for XShape extension API in configure,

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 68c7ac60aa166b993a29445e3c85e88604635fa4..da4ab58764ea18e4179e26338b6674c6c4582295 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////
 // File:        taskbar.cpp
 /////////////////////////////////////////////////////////////////////////
 // File:        taskbar.cpp

-// Purpose:        Implements wxTaskBarIcon class for manipulating icons on
+// Purpose:     Implements wxTaskBarIcon class for manipulating icons on

 //              the Windows task bar.
 // Author:      Julian Smart
 // Modified by:
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 //              the Windows task bar.
 // Author:      Julian Smart
 // Modified by:
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -26,30 +26,42 @@
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"

+#include "wx/menu.h"

 #endif
 
 #endif
 

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__TWIN32__)

 
 #include <windows.h>
 
 #include <windows.h>

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

 #include <string.h>
 #include <string.h>

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

 
 

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

 #endif
 
 #endif
 

+#ifdef __SALFORDC__
+    #include <shellapi.h>
+#endif
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxTaskBarIconList);
+

 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,

-                                    UINT wParam, LONG lParam );
+                                     UINT wParam, LONG lParam );

 
 

-char *wxTaskBarWindowClass = "wxTaskBarWindowClass";
+wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass");

 
 

-wxList wxTaskBarIcon::sm_taskBarIcons;
+wxTaskBarIconList wxTaskBarIcon::sm_taskBarIcons;

 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 

-
-#if !USE_SHARED_LIBRARY
+#if WXWIN_COMPATIBILITY_2_4

 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)


@@ -59,16 +71,16 @@ 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)

-#endif

 
 
 wxTaskBarIcon::wxTaskBarIcon(void)
 {
     m_hWnd = 0;
 
 
 wxTaskBarIcon::wxTaskBarIcon(void)
 {
     m_hWnd = 0;

-    m_iconAdded = FALSE;
+    m_iconAdded = false;

 
     AddObject(this);
 
 
     AddObject(this);
 


@@ -95,26 +107,26 @@ wxTaskBarIcon::~wxTaskBarIcon(void)
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
 // Operations
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {

-    if (!IsOK())
-        return FALSE;
+    if (!IsOk())
+        return false;

 
     NOTIFYICONDATA notifyData;
 
     memset(&notifyData, 0, sizeof(notifyData));
 
     NOTIFYICONDATA notifyData;
 
     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.cbSize = sizeof(notifyData);
+        notifyData.hWnd = (HWND) m_hWnd;
+        notifyData.uCallbackMessage = sm_taskbarMsg;
+        notifyData.uFlags = NIF_MESSAGE ;
+    if (icon.Ok())

     {
     {

-               notifyData.uFlags |= NIF_ICON;
-           notifyData.hIcon = (HICON) icon.GetHICON();
+        notifyData.uFlags |= NIF_ICON;
+        notifyData.hIcon = (HICON) icon.GetHICON();

     }
 
     }
 

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

     {
         notifyData.uFlags |= NIF_TIP ;
     {
         notifyData.uFlags |= NIF_TIP ;

-               lstrcpyn(notifyData.szTip, (char*) (const char*) tooltip, sizeof(notifyData.szTip));
+                lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));

     }
 
     notifyData.uID = 99;
     }
 
     notifyData.uID = 99;


@@ -131,69 +143,75 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 bool wxTaskBarIcon::RemoveIcon(void)
 {
     if (!m_iconAdded)
 bool wxTaskBarIcon::RemoveIcon(void)
 {
     if (!m_iconAdded)

-        return FALSE;
+        return false;

 
     NOTIFYICONDATA notifyData;
 
     memset(&notifyData, 0, sizeof(notifyData));
 
     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.cbSize = sizeof(notifyData);
+        notifyData.hWnd = (HWND) m_hWnd;
+        notifyData.uCallbackMessage = sm_taskbarMsg;
+        notifyData.uFlags = NIF_MESSAGE;
+        notifyData.hIcon = 0 ; // hIcon;

     notifyData.uID = 99;
     notifyData.uID = 99;

-    m_iconAdded = FALSE;
+    m_iconAdded = false;

 
     return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
 }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 {
 
     return (Shell_NotifyIcon(NIM_DELETE, & notifyData) != 0);
 }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 {

-    bool        rval = FALSE;
+    // OK, so I know this isn't thread-friendly, but
+    // what to do? We need this check.
+
+    static bool s_inPopup = false;
+
+    if (s_inPopup)
+        return false;
+
+    s_inPopup = true;
+
+    bool        rval = false;

     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);
 
     // is wxFrame the best window type to use???
     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);
 
     // is wxFrame the best window type to use???

-    win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0);
+    win = new wxFrame(NULL, -1, wxEmptyString, wxPoint(x,y), wxSize(-1,-1), 0);

     win->PushEventHandler(this);
 
     win->PushEventHandler(this);
 

-    rval = win->PopupMenu(menu, 0, 0);
+    // Remove from record of top-level windows, or will confuse wxWindows
+    // if we try to exit right now.
+    wxTopLevelWindows.DeleteObject(win);

 
 

-    win->PopEventHandler(FALSE);
-    win->Destroy();
-    return rval;
-}
+    menu->UpdateUI();

 
 

+    // Work around a WIN32 bug
+    ::SetForegroundWindow ((HWND) win->GetHWND ());

 
 

-// Overridables
-void wxTaskBarIcon::OnMouseMove(wxEvent&)
-{
-}
+    rval = win->PopupMenu(menu, 0, 0);

 
 

-void wxTaskBarIcon::OnLButtonDown(wxEvent&)
-{
-}
+    // Work around a WIN32 bug
+    ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);

 
 

-void wxTaskBarIcon::OnLButtonUp(wxEvent&)
-{
-}
-
-void wxTaskBarIcon::OnRButtonDown(wxEvent&)
-{
-}
+    win->PopEventHandler(false);
+    win->Destroy();
+    delete win;

 
 

-void wxTaskBarIcon::OnRButtonUp(wxEvent&)
-{
-}
+    s_inPopup = false;

 
 

-void wxTaskBarIcon::OnLButtonDClick(wxEvent&)
-{
+    return rval;

 }
 
 }
 

-void wxTaskBarIcon::OnRButtonDClick(wxEvent&)
-{
-}
+#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::_OnMouseMove(wxEvent& e)      { OnMouseMove(e);     }
 void wxTaskBarIcon::_OnLButtonDown(wxEvent& e)    { OnLButtonDown(e);   }


@@ -202,17 +220,17 @@ 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::_OnRButtonUp(wxEvent& e)      { OnRButtonUp(e);     }
 void wxTaskBarIcon::_OnLButtonDClick(wxEvent& e)  { OnLButtonDClick(e); }
 void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e)  { OnRButtonDClick(e); }

-
+#endif

 
 wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
 {
 
 wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
 {

-    wxNode*node = sm_taskBarIcons.First();
+    wxTaskBarIconList::Node *node = sm_taskBarIcons.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxTaskBarIcon* obj = (wxTaskBarIcon*) node->Data();
+        wxTaskBarIcon *obj = node->GetData();

         if (obj->GetHWND() == hWnd)
             return obj;
         if (obj->GetHWND() == hWnd)
             return obj;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
     }
     return NULL;
 }


@@ -230,13 +248,13 @@ void wxTaskBarIcon::RemoveObject(wxTaskBarIcon* obj)
 bool wxTaskBarIcon::RegisterWindowClass()
 {
     if (sm_registeredClass)
 bool wxTaskBarIcon::RegisterWindowClass()
 {
     if (sm_registeredClass)

-        return TRUE;
+        return true;

 
     // Also register the taskbar message here
 
     // Also register the taskbar message here

-    sm_taskbarMsg = ::RegisterWindowMessage("wxTaskBarIconMessage");
+    sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));

 
 

-    WNDCLASS   wc;
-    bool       rc;
+    WNDCLASS        wc;
+    bool        rc;

 
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
 
     HINSTANCE hInstance = GetModuleHandle(NULL);
 


@@ -265,7 +283,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,

-            "wxTaskBarWindow",
+            wxT("wxTaskBarWindow"),

             WS_OVERLAPPED,
             0,
             0,
             WS_OVERLAPPED,
             0,
             0,


@@ -288,42 +306,40 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar
 
     switch (lParam)
     {
 
     switch (lParam)
     {

-       case WM_LBUTTONDOWN:
+        case WM_LBUTTONDOWN:

             eventType = wxEVT_TASKBAR_LEFT_DOWN;
             break;
 
             eventType = wxEVT_TASKBAR_LEFT_DOWN;
             break;
 

-       case WM_LBUTTONUP:
+        case WM_LBUTTONUP:

             eventType = wxEVT_TASKBAR_LEFT_UP;
             break;
 
             eventType = wxEVT_TASKBAR_LEFT_UP;
             break;
 

-       case WM_RBUTTONDOWN:
+        case WM_RBUTTONDOWN:

             eventType = wxEVT_TASKBAR_RIGHT_DOWN;
             break;
 
             eventType = wxEVT_TASKBAR_RIGHT_DOWN;
             break;
 

-       case WM_RBUTTONUP:
+        case WM_RBUTTONUP:

             eventType = wxEVT_TASKBAR_RIGHT_UP;
             break;
 
             eventType = wxEVT_TASKBAR_RIGHT_UP;
             break;
 

-       case WM_LBUTTONDBLCLK:
+        case WM_LBUTTONDBLCLK:

             eventType = wxEVT_TASKBAR_LEFT_DCLICK;
             break;
 
             eventType = wxEVT_TASKBAR_LEFT_DCLICK;
             break;
 

-       case WM_RBUTTONDBLCLK:
+        case WM_RBUTTONDBLCLK:

             eventType = wxEVT_TASKBAR_RIGHT_DCLICK;
             break;
 
             eventType = wxEVT_TASKBAR_RIGHT_DCLICK;
             break;
 

-       case WM_MOUSEMOVE:
+        case WM_MOUSEMOVE:

             eventType = wxEVT_TASKBAR_MOVE;
             break;
 
             eventType = wxEVT_TASKBAR_MOVE;
             break;
 

-       default:
+        default:

             break;
             break;

-       }
+        }

 
     if (eventType) {
 
     if (eventType) {

-        wxEvent event;
-        event.SetEventType(eventType);
-        event.SetEventObject(this);
+        wxTaskBarIconEvent event(eventType, this);

 
         ProcessEvent(event);
     }
 
         ProcessEvent(event);
     }


@@ -331,9 +347,9 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar
 }
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
 }
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,

-                                    UINT wParam, LONG lParam )
+                                     UINT wParam, LONG lParam )

 {
 {

-    wxTaskBarIcon* obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd);
+    wxTaskBarIcon *obj = wxTaskBarIcon::FindObjectForHWND((WXHWND) hWnd);

     if (obj)
         return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam);
     else
     if (obj)
         return obj->WindowProc((WXHWND) hWnd, msg, wParam, lParam);
     else