This commit includes the following changes:

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index e1c998949556a0c83ed3a72a22df712d59e7f12a..7df68cdf1f25170886be30e4b787ab9aa2044687 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -40,9 +40,15 @@
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 
     #undef explicit
 #endif // HAVE_X11_XKBLIB_H
 

-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxRootWindow;
+
+//----------------------------------------------------------------------------

 // misc.
 // misc.

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

 
 void wxBell()
 {
 
 void wxBell()
 {


@@ -71,7 +77,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 
 void *wxGetDisplay()
 {
 
 void *wxGetDisplay()
 {

-    return gdk_display;
+    return GDK_DISPLAY();

 }
 
 void wxDisplaySize( int *width, int *height )
 }
 
 void wxDisplaySize( int *width, int *height )


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