New module definition file for the ever chaning treectrl class interface.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 6d27531b26a7687c5d4c2bc5f67e937d20127eee..611d02bf16f5a8cad5fcddadcccd6b4a69d55f1e 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/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
      * 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
 


@@ -46,7 +46,7 @@
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern GtkWidget *wxRootWindow;
+extern GtkWidget *wxGetRootWindow();

 
 //----------------------------------------------------------------------------
 // misc.
 
 //----------------------------------------------------------------------------
 // misc.


@@ -94,6 +94,17 @@ void wxDisplaySizeMM( int *width, int *height )
     if (height) *height = gdk_screen_height_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 );


@@ -106,7 +117,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
 
 int wxDisplayDepth()
 {

-    return gdk_window_get_visual( wxRootWindow->window )->depth;
+    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;

 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 }
 
 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
 
    // 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);
 }
 
    wxHandleProcessTermination(proc_data);
 }