added check for GTK 1.2
added symbol __WXGTK12__ (do not use GTK_MINOR_VERSION in your code as this is undefined anywhere outside wxGTK itself) updated wxGTK.spec for local builds fixed clipboard clear/setdata race test for wxConvLocal in dialogs sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -224,6 +224,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
|
||||
}
|
||||
else
|
||||
{
|
||||
wxTheClipboard->m_waiting = FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -239,6 +240,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
|
||||
}
|
||||
}
|
||||
|
||||
wxTheClipboard->m_waiting = FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -388,12 +390,20 @@ void wxClipboard::Clear()
|
||||
|
||||
if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
|
||||
{
|
||||
m_waiting = TRUE;
|
||||
|
||||
gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
|
||||
|
||||
while (m_waiting) gtk_main_iteration();
|
||||
}
|
||||
|
||||
if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
|
||||
{
|
||||
m_waiting = TRUE;
|
||||
|
||||
gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
|
||||
|
||||
while (m_waiting) gtk_main_iteration();
|
||||
}
|
||||
|
||||
if (m_dataBroker)
|
||||
|
Reference in New Issue
Block a user