Add wxDir::GetNameWithSep() and use it to avoid consecutive slashes.

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

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index cea57e979432df74b2201dc6791005792d98e0b8..4d53edd850a798c0fa19503f2ee980843861d62e 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -116,6 +116,7 @@ status_icon_popup_menu(GtkStatusIcon*, guint, guint, wxTaskBarIcon* taskBarIcon)
 
 bool wxTaskBarIconBase::IsAvailable()
 {
 
 bool wxTaskBarIconBase::IsAvailable()
 {

+#ifdef GDK_WINDOWING_X11

     char name[32];
     g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d",
         gdk_x11_get_default_screen());
     char name[32];
     g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d",
         gdk_x11_get_default_screen());


@@ -124,6 +125,9 @@ bool wxTaskBarIconBase::IsAvailable()
     Window manager = XGetSelectionOwner(gdk_x11_get_default_xdisplay(), atom);
 
     return manager != None;
     Window manager = XGetSelectionOwner(gdk_x11_get_default_xdisplay(), atom);
 
     return manager != None;

+#else
+    return true;
+#endif

 }
 //-----------------------------------------------------------------------------
 
 }
 //-----------------------------------------------------------------------------
 


@@ -262,7 +266,7 @@ void wxTaskBarIcon::Private::size_allocate(int width, int height)
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 

-wxTaskBarIcon::wxTaskBarIcon()
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))

 {
     m_priv = new Private(this);
 }
 {
     m_priv = new Private(this);
 }