bitmap and image updates

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 5f563ac295e73b4ac21ca1f461226ed38d4d3101..e1c998949556a0c83ed3a72a22df712d59e7f12a 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -69,6 +69,11 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 // display characterstics
 // ----------------------------------------------------------------------------
 
 // display characterstics
 // ----------------------------------------------------------------------------
 

+void *wxGetDisplay()
+{
+    return gdk_display;
+}
+

 void wxDisplaySize( int *width, int *height )
 {
     if (width) *width = gdk_screen_width();
 void wxDisplaySize( int *width, int *height )
 {
     if (width) *width = gdk_screen_width();


@@ -105,12 +110,14 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {

-    wxEndProcessData *proc_data = (wxEndProcessData *)data;
-
-    wxHandleProcessTermination(proc_data);
-
-    close(source);
-    gdk_input_remove(proc_data->tag);
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;
+   close(source);
+   gdk_input_remove(proc_data->tag);
+
+   // This has to come after gdk_input_remove() or we will
+   // occasionally receive multiple callbacks with corrupt data
+   // pointers. (KB) 
+   wxHandleProcessTermination(proc_data);

 }
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 }
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)