X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..cb332bc6b76dd095e85322a213363fa4409f5881:/src/gtk1/utilsgtk.cpp

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index c8837d8f2e..6d27531b26 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -18,60 +18,82 @@
 #include "wx/unix/execute.h"
 
 #include <stdarg.h>
-#include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>
-#include <fcntl.h>          // for O_WRONLY and friends
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <gdk/gdkx.h>
-
-#ifdef __HPUX__
-    // under HP-UX XKBlib.h defines structures with field named "explicit" -
-    // which is, of course, an error for a C++ compiler
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#ifndef __WXGTK20__
+#include "gtk/gtkfeatures.h"
+#endif
+#include "gdk/gdkx.h"
+
+#ifdef HAVE_X11_XKBLIB_H
+    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
+     * field named "explicit" - which is, of course, an error for a C++
+     * compiler. To be on the safe side, just redefine it everywhere. */
     #define explicit __wx_explicit
+  
     #include "X11/XKBlib.h"
+  
     #undef explicit
-#endif // __HPUX__
+#endif // HAVE_X11_XKBLIB_H
 
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;
+
+//----------------------------------------------------------------------------
 // misc.
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 void wxBell()
 {
     gdk_beep();
 }
 
-// Synthesize KeyUp events holding down a key and producing
-// KeyDown events with autorepeat.
+/* Don't synthesize KeyUp events holding down a key and producing
+   KeyDown events with autorepeat. */
+#ifdef HAVE_X11_XKBLIB_H
 bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
-    return result;       // true if keyboard hardware supports this mode
+    return result;       /* TRUE if keyboard hardware supports this mode */
 }
+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
+{
+    return FALSE;
+}
+#endif
 
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
 
+void *wxGetDisplay()
+{
+    return GDK_DISPLAY();
+}
+
 void wxDisplaySize( int *width, int *height )
 {
     if (width) *width = gdk_screen_width();
     if (height) *height = gdk_screen_height();
 }
 
+void wxDisplaySizeMM( int *width, int *height )
+{
+    if (width) *width = gdk_screen_width_mm();
+    if (height) *height = gdk_screen_height_mm();
+}
+
 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
@@ -84,7 +106,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
-    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+    return gdk_window_get_visual( wxRootWindow->window )->depth;
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
@@ -95,6 +117,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxGTK;
 }
 
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+
 // ----------------------------------------------------------------------------
 // subprocess routines
 // ----------------------------------------------------------------------------
@@ -102,12 +130,14 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 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)