Removed xpm[d].lib

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

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


@@ -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 );


@@ -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);
 }