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.

4 files changed, 13 insertions, 16 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
    */
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 229dea954..5cabe70de 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2097,7 +2097,7 @@ struct _NetWmSupportedAtoms
  * a way that impacts persistent application state. A common bug
  * is that your application can start up before the window manager
  * does when the user logs in, and before the window manager starts
- * gdk_net_wm_supports() will return %FALSE for every property.
+ * gdk_x11_screen_supports_net_wm_hint() will return %FALSE for every property.
  * 
  * Return value: %TRUE if the window manager supports @property
  **/
@@ -2197,7 +2197,6 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
 
 /**
  * gdk_net_wm_supports:
- * @screen : the relevant #GdkScreen.
  * @property: a property atom.
  * 
  * This function is specific to the X11 backend of GDK, and indicates
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 775dc4db7..723c1f52f 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -311,7 +311,7 @@ gdk_pixmap_create_from_data (GdkWindow   *window,
 
 /**
  * gdk_pixmap_foreign_new_for_display:
- * @screen : The #GdkScreen the @anid is located.
+ * @display: The #GdkDisplay where @anid is located.
  * @anid: a native pixmap handle.
  * 
  * Wraps a native window in a #GdkPixmap.
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index c4b35c889..8985a97fc 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -145,12 +145,10 @@ void          gdk_x11_ungrab_server  ();
 
 GdkDisplay   *gdk_x11_lookup_xdisplay (Display *xdisplay);
 
-GList *gdk_list_visuals_for_screen (GdkScreen *screen);
-
 
 /* Functions to get the X Atom equivalent to the GdkAtom */
 Atom	              gdk_x11_atom_to_xatom_for_display (GdkDisplay  *display,
-							 GdkAtom      virtual_atom);
+							 GdkAtom      atom);
 GdkAtom		      gdk_x11_xatom_to_atom_for_display (GdkDisplay  *display,
 							 Atom	      xatom);
 Atom		      gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,