Compile fix when not using WXR resources.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1675dfe547b0ebf44790392f5a5e8ce906c2b5d6..1bc1106f93e420c45945d76e6a8c140b809139cd 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/gtk/utilsgtk.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -21,31 +21,37 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

+#include <sys/wait.h>   // for WNOHANG

 #include <unistd.h>
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include <unistd.h>
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

+#ifndef __WXGTK20__

 #include "gtk/gtkfeatures.h"
 #include "gtk/gtkfeatures.h"

+#endif

 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
 #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
     #define explicit __wx_explicit

-  #endif
-  
-  #include "X11/XKBlib.h"
-  
-  #ifdef __HPUX__
+
+    #include "X11/XKBlib.h"
+

     #undef explicit
     #undef explicit

-  #endif // __HPUX__

 #endif // HAVE_X11_XKBLIB_H
 
 #endif // HAVE_X11_XKBLIB_H
 

-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxGetRootWindow();
+
+//----------------------------------------------------------------------------

 // misc.
 // misc.

-// ----------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 
 void wxBell()
 {
 
 void wxBell()
 {


@@ -72,12 +78,34 @@ 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();
     if (height) *height = gdk_screen_height();
 }
 
 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 );
 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );


@@ -90,7 +118,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
 
 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)
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)


@@ -101,19 +129,46 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxGTK;
 }
 
   return wxGTK;
 }
 

+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+

 // ----------------------------------------------------------------------------
 // subprocess routines
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // subprocess routines
 // ----------------------------------------------------------------------------
 

-static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition WXUNUSED(condition) )
+extern "C"
+void GTK_EndProcessDetector(gpointer data, gint source,
+                            GdkInputCondition WXUNUSED(condition) )

 {
 {

-    wxEndProcessData *proc_data = (wxEndProcessData *)data;
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;
+
+   // has the process really terminated? unfortunately GDK (or GLib) seem to
+   // generate G_IO_HUP notification even when it simply tries to read from a
+   // closed fd and hasn't terminated at all
+   int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+   int status = 0;
+   int rc = waitpid(pid, &status, WNOHANG);
+
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }
+
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;
+
+   // child exited, end waiting
+   close(source);

 
 

-    wxHandleProcessTermination(proc_data);
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);

 
 

-    close(source);
-    gdk_input_remove(proc_data->tag);
+   wxHandleProcessTermination(proc_data);

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