File wxWidgets-bnc708402.patch of Package wxWidgets.import4971
Index: /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp
===================================================================
--- /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp (revision 49608)
+++ /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp (revision 65480)
@@ -947,19 +947,25 @@
void wxDropSource::UnregisterWindow()
{
- if (!m_widget)
- return;
-
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_data_get,
- this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_data_delete,
- this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_begin,
- this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_end,
- this);
+ if (m_widget)
+ {
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_data_get,
+ this);
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_data_delete,
+ this);
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_begin,
+ this);
+ g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_end,
+ this);
+ }
+
+ if (m_iconWindow)
+ {
+ g_signal_handlers_disconnect_by_func (m_iconWindow,
+ (gpointer) gtk_dnd_window_configure_callback, this);
+ }
}