call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consist...

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

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index bfd2341e2deb5c70276a3e5a12a1c9ae135270ac..86e5433c6be0bb4d2f1974ca230715f2619ea363 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -22,14 +22,9 @@
     #include "wx/menu.h"
 #endif
 
     #include "wx/menu.h"
 #endif
 

+#include <gtk/gtk.h>

 #include <gdk/gdkx.h>
 
 #include <gdk/gdkx.h>
 

-#ifdef __WXGTK20__
-#include <gtk/gtkversion.h>
-#if GTK_CHECK_VERSION(2, 1, 0)
-
-#include "gtk/gtk.h"
-

 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()


@@ -49,6 +44,16 @@ wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
             wxFRAME_SHAPED,
             wxEmptyString /*eggtray doesn't like setting wmclass*/);
 
             wxFRAME_SHAPED,
             wxEmptyString /*eggtray doesn't like setting wmclass*/);
 

+    // WM frame extents are not useful for wxTaskBarIcon
+    m_deferShow = false;
+    gulong handler_id = g_signal_handler_find(
+        m_widget,
+        GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+        g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
+        0, NULL, NULL, this);
+    if (handler_id != 0)
+        g_signal_handler_disconnect(m_widget, handler_id);
+

     m_invokingWindow = NULL;
 }
 
     m_invokingWindow = NULL;
 }
 


@@ -60,9 +65,10 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
         Display *display = GDK_DISPLAY();
         Screen *screen = DefaultScreenOfDisplay(display);
 
         Display *display = GDK_DISPLAY();
         Screen *screen = DefaultScreenOfDisplay(display);
 

-        wxString name;
-        name.Printf(_T("_NET_SYSTEM_TRAY_S%d"), XScreenNumberOfScreen(screen));
-        Atom atom = XInternAtom(display, name.ToAscii(), False);
+        char name[32];
+        g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d",
+            XScreenNumberOfScreen(screen));
+        Atom atom = XInternAtom(display, name, False);

 
         Window manager = XGetSelectionOwner(display, atom);
 
 
         Window manager = XGetSelectionOwner(display, atom);
 


@@ -142,9 +148,6 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
 
     return true;
 }
 
     return true;
 }

-#endif // wxUSE_MENUS_NATIVE
-
-#endif // __WXGTK20__
-#endif // GTK_CHECK_VERSION(2, 1, 0)

 
 

+#endif // wxUSE_MENUS_NATIVE

 #endif // wxUSE_TASKBARICON
 #endif // wxUSE_TASKBARICON