removed log record

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 5f563ac295e73b4ac21ca1f461226ed38d4d3101..611d02bf16f5a8cad5fcddadcccd6b4a69d55f1e 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -26,7 +26,9 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.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


@@ -34,15 +36,21 @@
      * 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
      * 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"
     #include "X11/XKBlib.h"

-  
+

     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 

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

 // misc.
 // misc.

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

 
 void wxBell()
 {
 
 void wxBell()
 {


@@ -69,12 +77,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 );


@@ -87,7 +117,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)


@@ -98,6 +128,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
   return wxGTK;
 }
 
   return wxGTK;
 }
 

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

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


@@ -105,12 +141,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)