X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/904a68b6f648fc7802b41a8d176c78394252a4b7..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/utilsgtk.cpp?ds=sidebyside

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 6d27531b26..611d02bf16 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -36,9 +36,9 @@
      * 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 // HAVE_X11_XKBLIB_H
 
@@ -46,7 +46,7 @@
 // data
 //-----------------------------------------------------------------------------
 
-extern GtkWidget *wxRootWindow;
+extern GtkWidget *wxGetRootWindow();
 
 //----------------------------------------------------------------------------
 // misc.
@@ -94,6 +94,17 @@ void wxDisplaySizeMM( int *width, int *height )
     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 );
@@ -106,7 +117,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
-    return gdk_window_get_visual( wxRootWindow->window )->depth;
+    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
@@ -136,7 +147,7 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
 
    // This has to come after gdk_input_remove() or we will
    // occasionally receive multiple callbacks with corrupt data
-   // pointers. (KB) 
+   // pointers. (KB)
    wxHandleProcessTermination(proc_data);
 }