X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/279338910fbf9be5229ec2ece0a896c71cc004f4..fae5c452834a398c06a318e5da65cff7791eff2b:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index dddd561bcc..611d02bf16 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -18,41 +18,39 @@
 #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>
+
+#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
-  #ifdef __HPUX__
-    /* under HP-UX XKBlib.h defines structures with field named "explicit" -
-     * which is, of course, an error for a C++ compiler */
+    /* 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
-  #endif
-  
-  #include "X11/XKBlib.h"
-  
-  #ifdef __HPUX__
+
+    #include "X11/XKBlib.h"
+
     #undef explicit
-  #endif // __HPUX__
 #endif // HAVE_X11_XKBLIB_H
 
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxGetRootWindow();
+
+//----------------------------------------------------------------------------
 // misc.
-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 
 void wxBell()
 {
@@ -79,12 +77,34 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 // 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 wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+}
+
 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
@@ -97,7 +117,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
-    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
@@ -108,6 +128,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxGTK;
 }
 
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+
 // ----------------------------------------------------------------------------
 // subprocess routines
 // ----------------------------------------------------------------------------
@@ -115,12 +141,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)