added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index d422b3c214ff7528490cc73a073b7e09e958bac5..6be5dd0428a38ef9471ed34f0c02134099222a23 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -49,12 +49,15 @@
     #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");
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                      UINT wParam, LONG lParam );
 
 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;
 


@@ -83,7 +86,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 wxTaskBarIcon::wxTaskBarIcon(void)
 {
     m_hWnd = 0;
 wxTaskBarIcon::wxTaskBarIcon(void)
 {
     m_hWnd = 0;

-    m_iconAdded = FALSE;
+    m_iconAdded = false;

 
     AddObject(this);
 
 
     AddObject(this);
 


@@ -111,7 +114,7 @@ wxTaskBarIcon::~wxTaskBarIcon(void)
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
     if (!IsOK())
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
     if (!IsOK())

-        return FALSE;
+        return false;

 
     NOTIFYICONDATA notifyData;
 
 
     NOTIFYICONDATA notifyData;
 


@@ -146,7 +149,7 @@ 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;
 
 
     NOTIFYICONDATA notifyData;
 


@@ -157,7 +160,7 @@ bool wxTaskBarIcon::RemoveIcon(void)
         notifyData.uFlags = NIF_MESSAGE;
         notifyData.hIcon = 0 ; // hIcon;
     notifyData.uID = 99;
         notifyData.uFlags = NIF_MESSAGE;
         notifyData.hIcon = 0 ; // hIcon;
     notifyData.uID = 99;

-    m_iconAdded = FALSE;
+    m_iconAdded = false;

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


@@ -167,14 +170,14 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     // OK, so I know this isn't thread-friendly, but
     // what to do? We need this check.
 
     // OK, so I know this isn't thread-friendly, but
     // what to do? We need this check.
 

-    static bool s_inPopup = FALSE;
+    static bool s_inPopup = false;

 
     if (s_inPopup)
 
     if (s_inPopup)

-        return FALSE;
+        return false;

 
 

-    s_inPopup = TRUE;
+    s_inPopup = true;

 
 

-    bool        rval = FALSE;
+    bool        rval = false;

     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);
     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);


@@ -197,11 +200,11 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     // Work around a WIN32 bug
     ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
 
     // Work around a WIN32 bug
     ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
 

-    win->PopEventHandler(FALSE);
+    win->PopEventHandler(false);

     win->Destroy();
     delete win;
 
     win->Destroy();
     delete win;
 

-    s_inPopup = FALSE;
+    s_inPopup = false;

 
     return rval;
 }
 
     return rval;
 }


@@ -247,13 +250,13 @@ void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e)  { OnRButtonDClick(e); }
 
 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;
 }


@@ -271,7 +274,7 @@ 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
     sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
 
     // Also register the taskbar message here
     sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));


@@ -372,7 +375,7 @@ long wxTaskBarIcon::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wPar
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                      UINT wParam, LONG lParam )
 {
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                      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