X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab857a4ed6687929e308ea606f65ceedc43d1319..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/utilsgtk.cpp?ds=inline diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index e1c9989495..611d02bf16 100644 --- 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" +#ifndef __WXGTK20__ #include "gtk/gtkfeatures.h" +#endif #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 - + #include "X11/XKBlib.h" - + #undef explicit #endif // HAVE_X11_XKBLIB_H -// ---------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern GtkWidget *wxGetRootWindow(); + +//---------------------------------------------------------------------------- // misc. -// ---------------------------------------------------------------------------- +//---------------------------------------------------------------------------- void wxBell() { @@ -71,7 +79,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) void *wxGetDisplay() { - return gdk_display; + return GDK_DISPLAY(); } void wxDisplaySize( int *width, int *height ) @@ -80,6 +88,23 @@ void wxDisplaySize( int *width, int *height ) 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 ); @@ -92,7 +117,7 @@ bool wxColourDisplay() 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) @@ -103,6 +128,12 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) return wxGTK; } +wxWindow* wxFindWindowAtPoint(const wxPoint& pt) +{ + return wxGenericFindWindowAtPoint(pt); +} + + // ---------------------------------------------------------------------------- // subprocess routines // ---------------------------------------------------------------------------- @@ -116,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); }