fixed wxXmlResource::Load's detection of filenames to be done as early as possible

[wxWidgets.git] / src / unix / taskbarx11.cpp

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 759be00a01e04cc204b18d8d031ea081b054cfcf..0978d60c1acb190599b2638afc2db73b1c77fe17 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// File:        taskbar.cpp
+// File:        src/unix/taskbarx11.cpp

 // Purpose:     wxTaskBarIcon class for common Unix desktops
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxTaskBarIcon class for common Unix desktops
 // Author:      Vaclav Slavik
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbarx11.h"
-#endif
-

 // NB: This implementation does *not* work with every X11 window manager.
 //     Currently only GNOME 1.2 and KDE 1,2,3 methods are implemented here.
 //     Freedesktop.org's System Tray specification is implemented in
 // NB: This implementation does *not* work with every X11 window manager.
 //     Currently only GNOME 1.2 and KDE 1,2,3 methods are implemented here.
 //     Freedesktop.org's System Tray specification is implemented in


@@ -25,13 +21,19 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_TASKBARICON && !defined(__WXGTK20__)
+

 #include "wx/taskbar.h"
 #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"
+
+#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
 
 #ifdef __VMS
 #pragma message disable nosimpint


@@ -46,9 +48,6 @@
 // base class that implements toolkit-specific method:
 // ----------------------------------------------------------------------------
 
 // base class that implements toolkit-specific method:
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
-    #include "wx/gtk/taskbarpriv.h"
-#else

     class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxFrame
     {
     public:
     class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxFrame
     {
     public:


@@ -58,19 +57,16 @@
                       wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR |
                       wxSIMPLE_BORDER | wxFRAME_SHAPED) {}
 
                       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__)
 
 // ----------------------------------------------------------------------------
 // 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 <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__)
     #define GetDisplay()        GDK_DISPLAY()
     #define GetXWindow(wxwin)   GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
 #elif defined(__WXX11__) || defined(__WXMOTIF__)


@@ -81,7 +77,7 @@
     #error "You must define X11 accessors for this port!"
 #endif
 
     #error "You must define X11 accessors for this port!"
 #endif
 

-    
+

 // ----------------------------------------------------------------------------
 // wxTaskBarIconArea is the real window that shows the icon:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTaskBarIconArea is the real window that shows the icon:
 // ----------------------------------------------------------------------------


@@ -92,10 +88,10 @@ public:
     wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp);
     void SetTrayIcon(const wxBitmap& bmp);
     bool IsOk() { return true; }
     wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp);
     void SetTrayIcon(const wxBitmap& bmp);
     bool IsOk() { return true; }

-    
+

 protected:
     void SetLegacyWMProperties();
 protected:
     void SetLegacyWMProperties();

-    
+

     void OnSizeChange(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& evt);
     void OnMouseEvent(wxMouseEvent& event);
     void OnSizeChange(wxSizeEvent& event);
     void OnPaint(wxPaintEvent& evt);
     void OnMouseEvent(wxMouseEvent& event);


@@ -104,40 +100,40 @@ protected:
     wxTaskBarIcon *m_icon;
     wxPoint        m_pos;
     wxBitmap       m_bmp;
     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)
     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()
     EVT_PAINT(wxTaskBarIconArea::OnPaint)
 END_EVENT_TABLE()

-        
+

 wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
 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"));
         SetLegacyWMProperties();
     }
     if (!IsProtocolSupported())
     {
         wxLogTrace(_T("systray"),
                    _T("using legacy KDE1,2 and GNOME 1.2 methods"));
         SetLegacyWMProperties();
     }

-   
-    // 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;
 }
 
 void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
 {
     m_bmp = bmp;

-    
+

     // determine suitable bitmap size:
     // 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));
 
     wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight());
     wxSize iconsize(wxMin(winsize.x, bmpsize.x), wxMin(winsize.y, bmpsize.y));
 


@@ -150,10 +146,7 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
     }
 
     wxRegion region;
     }
 
     wxRegion region;

-    if (m_bmp.GetMask())
-        region.Union(m_bmp);
-    else
-        region.Union(0,0, iconsize.x, iconsize.y);
+    region.Union(m_bmp);

 
     // if the bitmap is smaller than the window, offset it:
     if (winsize != iconsize)
 
     // if the bitmap is smaller than the window, offset it:
     if (winsize != iconsize)


@@ -169,13 +162,13 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
 }
 
 void wxTaskBarIconArea::SetLegacyWMProperties()
 }
 
 void wxTaskBarIconArea::SetLegacyWMProperties()

-{ 
+{

 #ifdef __WXGTK__
     gtk_widget_realize(m_widget);
 #endif
 #ifdef __WXGTK__
     gtk_widget_realize(m_widget);
 #endif

-    
+

     long data[1];
     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);
     // KDE 2 & KDE 3:
     Atom _KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR =
         XInternAtom(GetDisplay(), "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False);


@@ -194,8 +187,8 @@ void wxTaskBarIconArea::SetLegacyWMProperties()
                     KWM_DOCKWINDOW, 32,
                     PropModeReplace, (unsigned char*)data, 1);
 }
                     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"),
                GetSize().x, GetSize().y);
 {
     wxLogTrace(_T("systray"), _T("icon size changed to %i x %i"),
                GetSize().x, GetSize().y);


@@ -209,7 +202,7 @@ void wxTaskBarIconArea::OnPaint(wxPaintEvent& WXUNUSED(event))
     wxPaintDC dc(this);
     dc.DrawBitmap(m_bmp, m_pos.x, m_pos.y, true);
 }
     wxPaintDC dc(this);
     dc.DrawBitmap(m_bmp, m_pos.x, m_pos.y, true);
 }

-    
+

 void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
 {
     wxEventType type = 0;
 void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
 {
     wxEventType type = 0;


@@ -237,10 +230,19 @@ void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event)
 }
 
 void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event)
 }
 
 void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event)

-{    
+{

     m_icon->ProcessEvent(event);
 }
 
     m_icon->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// wxTaskBarIconBase class:
+// ----------------------------------------------------------------------------
+
+bool wxTaskBarIconBase::IsAvailable()
+{
+    return wxTaskBarIconArea::IsProtocolSupported();
+}
+

 // ----------------------------------------------------------------------------
 // wxTaskBarIcon class:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTaskBarIcon class:
 // ----------------------------------------------------------------------------


@@ -254,7 +256,11 @@ wxTaskBarIcon::wxTaskBarIcon() : m_iconWnd(NULL)
 wxTaskBarIcon::~wxTaskBarIcon()
 {
     if (m_iconWnd)
 wxTaskBarIcon::~wxTaskBarIcon()
 {
     if (m_iconWnd)

+    {
+        m_iconWnd->Disconnect(wxEVT_DESTROY,
+            wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy), NULL, this);

         RemoveIcon();
         RemoveIcon();

+    }

 }
 
 bool wxTaskBarIcon::IsOk() const
 }
 
 bool wxTaskBarIcon::IsOk() const


@@ -267,6 +273,14 @@ bool wxTaskBarIcon::IsIconInstalled() const
     return m_iconWnd != NULL;
 }
 
     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;
 bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 {
     wxBitmap bmp;


@@ -277,6 +291,9 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         m_iconWnd = new wxTaskBarIconArea(this, bmp);
         if (m_iconWnd->IsOk())
         {
         m_iconWnd = new wxTaskBarIconArea(this, bmp);
         if (m_iconWnd->IsOk())
         {

+            m_iconWnd->Connect(wxEVT_DESTROY,
+                wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy),
+                NULL, this);

             m_iconWnd->Show();
         }
         else
             m_iconWnd->Show();
         }
         else


@@ -289,13 +306,15 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     else
     {
         m_iconWnd->SetTrayIcon(bmp);
     else
     {
         m_iconWnd->SetTrayIcon(bmp);

-    }    
-    
+    }
+

 #if wxUSE_TOOLTIPS
     if (!tooltip.empty())
         m_iconWnd->SetToolTip(tooltip);
     else
         m_iconWnd->SetToolTip(NULL);
 #if wxUSE_TOOLTIPS
     if (!tooltip.empty())
         m_iconWnd->SetToolTip(tooltip);
     else
         m_iconWnd->SetToolTip(NULL);

+#else
+    wxUnusedVar(tooltip);

 #endif
     return true;
 }
 #endif
     return true;
 }


@@ -313,7 +332,8 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     if (!m_iconWnd)
         return false;
 {
     if (!m_iconWnd)
         return false;

-    wxSize size(m_iconWnd->GetClientSize());

     m_iconWnd->PopupMenu(menu);
     return true;
 }
     m_iconWnd->PopupMenu(menu);
     return true;
 }

+
+#endif // wxUSE_TASKBARICON