diff options
| author | Alex Larsson <alexl@redhat.com> | 2002-04-30 16:29:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-04-30 16:29:49 +0000 |
| commit | 3e8df3c326078625761332a8f2d872e0070a9015 (patch) | |
| tree | f100c2f947d0bfb4f345e73ec05f681779c2e0de /gdk/x11/gdkdisplay-x11.c | |
| parent | 7618be2daff51e655abca4125f4266036ef9bfae (diff) | |
| download | gdk-pixbuf-3e8df3c326078625761332a8f2d872e0070a9015.tar.gz | |
Doc fixes.
Tue Apr 30 12:28:27 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.c gdk/gdkpango.c gdk/gdkpixmap.c
gdk/x11/gdkdisplay-x11.c gdk/x11/gdkevents-x11.c
gdk/x11/gdkpixmap-x11.c gdk/x11/gdkx.h: Doc fixes.
Tue Apr 30 11:37:09 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Make multihead-safe;
use a different IM context per display.
* configure.in acconfig.h: Add Xinerama checks from
multihead branch, changing HAS_XINERAMA => HAVE_XINERAMA.
* gdk/x11/gdkdisplay-x11.c: HAS_XINERAMA => HAVE_XINERAMA.
2002-04-29 Alex Larsson <alexl@redhat.com>
* gdk/gdkpango.c (gdk_draw_layout_line_with_colors):
Use tmp also if foreground is set.
Diffstat (limited to 'gdk/x11/gdkdisplay-x11.c')
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 41b0078ca..bbd9624a2 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -41,10 +41,10 @@ #include <X11/XKBlib.h> #endif -#ifdef HAS_SOLARIS_XINERAMA +#ifdef HAVE_SOLARIS_XINERAMA #include <X11/extensions/xinerama.h> #endif -#ifdef HAS_XFREE_XINERAMA +#ifdef HAVE_XFREE_XINERAMA #include <X11/extensions/Xinerama.h> #endif @@ -101,11 +101,11 @@ gdk_display_x11_class_init (GdkDisplayX11Class * class) parent_class = g_type_class_peek_parent (class); } -#ifdef HAS_XINERAMA +#ifdef HAVE_XINERAMA static gboolean check_solaris_xinerama (GdkScreen *screen) { -#ifdef HAS_SOLARIS_XINERAMA +#ifdef HAVE_SOLARIS_XINERAMA if (XineramaGetState (GDK_SCREEN_XDISPLAY (screen), gdk_screen_get_number (screen))) { @@ -139,7 +139,7 @@ check_solaris_xinerama (GdkScreen *screen) return TRUE; } } -#endif /* HAS_SOLARIS_XINERAMA */ +#endif /* HAVE_SOLARIS_XINERAMA */ return FALSE; } @@ -147,7 +147,7 @@ check_solaris_xinerama (GdkScreen *screen) static gboolean check_xfree_xinerama (GdkScreen *screen) { -#ifdef HAS_XFREE_XINERAMA +#ifdef HAVE_XFREE_XINERAMA if (XineramaIsActive (GDK_SCREEN_XDISPLAY (screen))) { XineramaScreenInfo *monitors = XineramaQueryScreens (GDK_SCREEN_XDISPLAY (screen), @@ -178,18 +178,18 @@ check_xfree_xinerama (GdkScreen *screen) return TRUE; } } -#endif /* HAS_XFREE_XINERAMA */ +#endif /* HAVE_XFREE_XINERAMA */ return FALSE; } -#endif /* HAS_XINERAMA */ +#endif /* HAVE_XINERAMA */ static void init_xinerama_support (GdkScreen * screen) { GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); -#ifdef HAS_XINERAMA +#ifdef HAVE_XINERAMA int opcode, firstevent, firsterror; gint result; @@ -200,7 +200,7 @@ init_xinerama_support (GdkScreen * screen) check_xfree_xinerama (screen)) return; } -#endif /* HAS_XINERAMA */ +#endif /* HAVE_XINERAMA */ /* No Xinerama */ |