/////////////////////////////////////////////////////////////////////////
-// File: taskbar.cpp
+// File: src/unix/taskbarx11.cpp
// Purpose: wxTaskBarIcon class for common Unix desktops
// Author: Vaclav Slavik
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_TASKBARICON && !defined(__WXGTK20__)
+
#include "wx/taskbar.h"
-#include "wx/frame.h"
-#include "wx/bitmap.h"
-#include "wx/statbmp.h"
-#include "wx/sizer.h"
-#include "wx/dcclient.h"
-#include "wx/log.h"
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/frame.h"
+ #include "wx/dcclient.h"
+ #include "wx/statbmp.h"
+ #include "wx/sizer.h"
+ #include "wx/bitmap.h"
+ #include "wx/image.h"
+#endif
#ifdef __VMS
#pragma message disable nosimpint
// base class that implements toolkit-specific method:
// ----------------------------------------------------------------------------
-#ifdef __WXGTK20__
- #include <gtk/gtk.h>
- #if GTK_CHECK_VERSION(2,1,0)
- #include "wx/gtk/taskbarpriv.h"
- #define TASKBAR_ICON_AREA_BASE_INCLUDED
- #endif
-#endif
-
-#ifndef TASKBAR_ICON_AREA_BASE_INCLUDED
class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxFrame
{
public:
wxTaskBarIconAreaBase()
- : wxFrame(NULL, wxID_ANY, _T("systray icon"),
+ : wxFrame(NULL, wxID_ANY, wxT("systray icon"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
wxSIMPLE_BORDER | wxFRAME_SHAPED) {}
- bool IsProtocolSupported() const { return false; }
+ static bool IsProtocolSupported() { return false; }
};
-#endif
-
// ----------------------------------------------------------------------------
// toolkit dependent methods to set properties on helper window:
// ----------------------------------------------------------------------------
#if defined(__WXGTK__)
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
#include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
#define GetDisplay() GDK_DISPLAY()
#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
#elif defined(__WXX11__) || defined(__WXMOTIF__)
#error "You must define X11 accessors for this port!"
#endif
-
+
// ----------------------------------------------------------------------------
// wxTaskBarIconArea is the real window that shows the icon:
// ----------------------------------------------------------------------------
wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp);
void SetTrayIcon(const wxBitmap& bmp);
bool IsOk() { return true; }
-
+
protected:
void SetLegacyWMProperties();
-
+
void OnSizeChange(wxSizeEvent& event);
void OnPaint(wxPaintEvent& evt);
void OnMouseEvent(wxMouseEvent& event);
wxTaskBarIcon *m_icon;
wxPoint m_pos;
wxBitmap m_bmp;
-
+
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
- EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent)
+ EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent)
EVT_PAINT(wxTaskBarIconArea::OnPaint)
END_EVENT_TABLE()
-
+
wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
- : wxTaskBarIconAreaBase(), m_icon(icon), m_pos(0,0)
+ : wxTaskBarIconAreaBase(), m_icon(icon), m_bmp(bmp)
{
+ // Set initial size to bitmap size (tray manager may and often will
+ // change it):
+ SetClientSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
+
+ SetTrayIcon(bmp);
+
if (!IsProtocolSupported())
{
- wxLogTrace(_T("systray"),
- _T("using legacy KDE1,2 and GNOME 1.2 methods"));
+ wxLogTrace(wxT("systray"),
+ wxT("using legacy KDE1,2 and GNOME 1.2 methods"));
SetLegacyWMProperties();
}
-
-#if defined(__WXGTK20__) && defined(TASKBAR_ICON_AREA_BASE_INCLUDED)
- m_invokingWindow = icon;
-#endif
-
- // Set initial size to bitmap size (tray manager may and often will
- // change it):
- SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
-
- SetTrayIcon(bmp);
}
void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
{
m_bmp = bmp;
-
+
// determine suitable bitmap size:
- wxSize winsize(GetSize());
+ wxSize winsize(GetClientSize());
wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight());
wxSize iconsize(wxMin(winsize.x, bmpsize.x), wxMin(winsize.y, bmpsize.y));
}
void wxTaskBarIconArea::SetLegacyWMProperties()
-{
+{
#ifdef __WXGTK__
gtk_widget_realize(m_widget);
#endif
-
+
long data[1];
-
+
// KDE 2 & KDE 3:
Atom _KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR =
XInternAtom(GetDisplay(), "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False);
KWM_DOCKWINDOW, 32,
PropModeReplace, (unsigned char*)data, 1);
}
-
-void wxTaskBarIconArea::OnSizeChange(wxSizeEvent& event)
+
+void wxTaskBarIconArea::OnSizeChange(wxSizeEvent& WXUNUSED(event))
{
- wxLogTrace(_T("systray"), _T("icon size changed to %i x %i"),
+ wxLogTrace(wxT("systray"), wxT("icon size changed to %i x %i"),
GetSize().x, GetSize().y);
// rescale or reposition the icon as needed:
wxBitmap bmp(m_bmp);
wxPaintDC dc(this);
dc.DrawBitmap(m_bmp, m_pos.x, m_pos.y, true);
}
-
+
void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
{
wxEventType type = 0;
}
void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event)
-{
+{
m_icon->ProcessEvent(event);
}
+// ----------------------------------------------------------------------------
+// wxTaskBarIconBase class:
+// ----------------------------------------------------------------------------
+
+bool wxTaskBarIconBase::IsAvailable()
+{
+ return wxTaskBarIconArea::IsProtocolSupported();
+}
+
// ----------------------------------------------------------------------------
// wxTaskBarIcon class:
// ----------------------------------------------------------------------------
wxTaskBarIcon::~wxTaskBarIcon()
{
if (m_iconWnd)
+ {
+ m_iconWnd->Disconnect(wxEVT_DESTROY,
+ wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy), NULL, this);
RemoveIcon();
+ }
}
bool wxTaskBarIcon::IsOk() const
return m_iconWnd != NULL;
}
+// Destroy event from wxTaskBarIconArea
+void wxTaskBarIcon::OnDestroy(wxWindowDestroyEvent&)
+{
+ // prevent crash if wxTaskBarIconArea is destroyed by something else,
+ // for example if panel/kicker is killed
+ m_iconWnd = NULL;
+}
+
bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
{
wxBitmap bmp;
m_iconWnd = new wxTaskBarIconArea(this, bmp);
if (m_iconWnd->IsOk())
{
+ m_iconWnd->Connect(wxEVT_DESTROY,
+ wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy),
+ NULL, this);
m_iconWnd->Show();
}
else
else
{
m_iconWnd->SetTrayIcon(bmp);
- }
-
+ }
+
#if wxUSE_TOOLTIPS
if (!tooltip.empty())
m_iconWnd->SetToolTip(tooltip);
else
m_iconWnd->SetToolTip(NULL);
+#else
+ wxUnusedVar(tooltip);
#endif
return true;
}
m_iconWnd->PopupMenu(menu);
return true;
}
+
+#endif // wxUSE_TASKBARICON
projects / wxWidgets.git / blobdiff