new wxTaskBarIcon implementation for GTK2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-02-08 22:21:24 +00:00
parent 2a90b10068
commit a1c6f06900
8 changed files with 298 additions and 106 deletions

34
include/wx/gtk/taskbar.h Normal file
View File

@@ -0,0 +1,34 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/taskbar.h
// Purpose: wxTaskBarIcon class for GTK2
// Author: Paul Cornett
// Created: 2009-02-08
// RCS-ID: $Id$
// Copyright: (c) 2009 Paul Cornett
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_TASKBARICON_H_
#define _WX_GTK_TASKBARICON_H_
class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
{
public:
wxTaskBarIcon();
~wxTaskBarIcon();
virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString());
virtual bool RemoveIcon();
virtual bool PopupMenu(wxMenu* menu);
bool IsOk() const { return true; }
bool IsIconInstalled() const;
class Private;
private:
Private* m_priv;
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
DECLARE_NO_COPY_CLASS(wxTaskBarIcon)
};
#endif // _WX_GTK_TASKBARICON_H_

View File

@@ -1,33 +0,0 @@
/////////////////////////////////////////////////////////////////////////
// File: wx/gtk/taskbarpriv.h
// Purpose: wxTaskBarIcon (src/unix/taskbarx11.cpp) helper for GTK2
// Author: Vaclav Slavik
// Modified by:
// Created: 2004/05/29
// RCS-ID: $Id$
// Copyright: (c) Vaclav Slavik, 2004
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_TASKBARPRIV_H_
#define _WX_GTK_TASKBARPRIV_H_
#include "wx/toplevel.h"
class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
{
public:
wxTaskBarIconAreaBase();
// Returns true if SYSTRAY protocol is supported by the desktop
static bool IsProtocolSupported();
wxEvtHandler *m_invokingWindow;
protected:
#if wxUSE_MENUS_NATIVE
virtual void DoPopupMenuUpdateUI(wxMenu* menu);
#endif // wxUSE_MENUS_NATIVE
};
#endif // _WX_GTK_TASKBARPRIV_H_

View File

@@ -316,7 +316,6 @@ protected:
#if wxUSE_MENUS_NATIVE
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
virtual void DoPopupMenuUpdateUI(wxMenu* menu);
#endif // wxUSE_MENUS_NATIVE
virtual void DoCaptureMouse();