gdk/gdkkeys.c gdk/gdkscreen.c use canonical signal names.

[~andy/gtk] / gdk / gdkprivate.h

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 4dcbfe6d60f8b1bf806c5279c195decc10e28a0e..031fe9ae7f589c92e885483574202fe7738efc91 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -27,14 +27,7 @@
 #ifndef __GDK_PRIVATE_H__
 #define __GDK_PRIVATE_H__
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -50,6 +43,16 @@ void gdk_synthesize_window_state (GdkWindow     *window,
                                   GdkWindowState unset_flags,
                                   GdkWindowState set_flags);
 
+/* Tests whether a pair of x,y may cause overflows when converted to Pango
+ * units (multiplied by PANGO_SCALE).  We don't allow the entire range, leave
+ * some space for additions afterwards, to be safe...
+ */
+#define GDK_PANGO_UNITS_OVERFLOWS(x,y) (G_UNLIKELY ( \
+       (y) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
+       (x) >= PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
+       (y) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2 || \
+       (x) <=-PANGO_PIXELS (G_MAXINT-PANGO_SCALE)/2))
+
 G_END_DECLS
 
 #endif /* __GDK_PRIVATE_H__ */