Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when all frames are closed, it must be destroyed explicitly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-03-23 23:20:16 +00:00
parent 814e9c24c2
commit 1e6d9c20fd
5 changed files with 107 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/wx/msw/taskbar.h
View File

@@ -3,7 +3,7 @@
// Purpose: Defines 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) Julian Smart
@@ -17,24 +17,20 @@
#pragma interface "taskbar.h"
#endif
#include "wx/list.h"
#include "wx/icon.h"
class WXDLLIMPEXP_ADV wxTaskBarIcon;
WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
class WXDLLIMPEXP_ADV);
// private helper class:
class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public:
wxTaskBarIcon(void);
virtual ~wxTaskBarIcon(void);
wxTaskBarIcon();
virtual ~wxTaskBarIcon();
// Accessors
inline WXHWND GetHWND() const { return m_hWnd; }
inline bool IsOk() const { return (m_hWnd != 0) ; }
inline bool IsOk() const { return true; }
inline bool IsIconInstalled() const { return m_iconAdded; }
// Operations
@@ -56,21 +52,18 @@ public:
#endif
// Implementation
static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
static void AddObject(wxTaskBarIcon* obj);
static void RemoveObject(wxTaskBarIcon* obj);
static bool RegisterWindowClass();
static WXHWND CreateTaskBarWindow();
long WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam );
protected:
friend class wxTaskBarIconWindow;
long WindowProc(WXHWND hWnd, unsigned int msg,
unsigned int wParam, long lParam);
void RegisterWindowMessages();
// Data members
protected:
WXHWND m_hWnd;
bool m_iconAdded;
wxIcon m_icon;
wxString m_strTooltip;
static wxTaskBarIconList sm_taskBarIcons;
wxTaskBarIconWindow *m_win;
bool m_iconAdded;
wxIcon m_icon;
wxString m_strTooltip;
#if WXWIN_COMPATIBILITY_2_4
// non-virtual default event handlers to forward events to the virtuals
@@ -92,8 +85,3 @@ inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
#endif
// _TASKBAR_H_