Merges from the gtk-1-0 branch

Sun May  3 14:55:34 1998  Owen Taylor  <otaylor@gtk.org>

	* docs/gtkfaq.sgml (CPPFLAGS): Added a FAQ entry about
	"glibconfig.h" and another about writing another IRC
	client.

Sat May  2 00:14:05 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkpreview.c (gtk_trim_cmap): Make sure the
	parameters to log are doubles. Digital Unix apparently
	is missing the argument in its prototype.

Sun May  3 19:04:46 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtklabel.c (gtk_label_state_changed): Don't
	force a clear until the widget is actually on
	screen.

Hopefully nothing else though CVS think there are a whole
bunch more changed files.

2 files changed, 118 insertions, 4 deletions

diff --git a/docs/faq/gtkfaq.sgml b/docs/faq/gtkfaq.sgml
index 1e9257d2c7..26d5981fc2 100644
--- a/docs/faq/gtkfaq.sgml
+++ b/docs/faq/gtkfaq.sgml
@@ -163,6 +163,23 @@ name="http://www.gnome.org">)
 is using GTK+ to build a free desktop for Linux. Many more programs can be found
 there.
 
+<!-- ----------------------------------------------------------------- -->
+<sect1>I'm looking for an application to write in GTK+. How about an IRC client?
+<p> 
+
+Ask on gtk-list for suggestions. There are at least four IRC
+clients already under development
+
+<itemize>
+<item>girc. (Included with GNOME)
+<item>Bezerk (<htmlurl url="http://www.gtk.org/~trog/"
+                       name="http://www.gtk.org/~trog/">)
+<item>gsirc. (Location?)
+<item>Gnirc. (<htmlurl url="http://www.imaginet.fr/~dramboz/gnirc"
+                       name="http://www.imaginet.fr/~dramboz/gnirc">)
+</itemize>
+
+
 <!-- ***************************************************************** -->
 <sect>How to find, configure, install, and troubleshoot GTK+
 
@@ -202,8 +219,7 @@ handle the automatically generated Makefiles.
 
 <!-- ----------------------------------------------------------------- -->
  
-<sect1>I've compiled and installed GTK+, but I can't get any programs to link
-with it!
+<sect1>I've compiled and installed GTK+, but I can't get any programs to link with it!
 <p>
 This problem is most often encountered when the GTK+ libraries can't be 
 found or are the wrong version. Generally, the compiler will complain about an
@@ -250,6 +266,47 @@ and reinstall gtk+.
 </itemize>
 
 <!-- ----------------------------------------------------------------- -->
+<sect1>When compiling programs with GTK+, I get compiler error messages about not being able to find <tt/"glibconfig.h"/.
+
+<p> The header file "glibconfig.h" was moved to the directory
+$exec_prefix/lib/glib/include/. $exec_prefix is the
+directory that was specified by giving the --exec-prefix
+flags to ./configure when compiling GTK+. It defaults to 
+$prefix, (specified with --prefix), which in turn defaults
+to /usr/local/.
+
+<p> This was done because "glibconfig.h" includes architecture
+dependent information, and the rest of the include files
+are put in $prefix/include, which can be shared between different
+architectures. 
+
+<p> GTK+ includes a shell script, <tt/gtk-config/, that
+makes it easy to find out the correct include paths.
+The GTK+ tutorial includes an example of using <tt/gtk-config/
+for simple compilation from the command line. For information
+about more complicated configuration, see the file
+docs/gtk-config.txt in the GTK+ distribution.
+
+<p> If you are trying to compile an old program, you may
+be able to work around the problem by configuring it
+with a command line like: 
+
+<tscreen><verb>
+CPPFLAGS="-I/usr/local/include/glib/include ./configure
+</verb></tscreen>
+
+<p>
+for Bourne-compatible shells like bash, or for csh variants:
+
+<tscreen><verb>
+setenv CPPFLAGS "-I/usr/local/include/glib/include 
+./configure
+</verb></tscreen>
+
+<p>
+(Substitute the appropriate value of $exec_prefix for /usr/local.)
+
+<!-- ----------------------------------------------------------------- -->
 <sect1>When installing The GIMP, configure reports that it can't find GTK.
 <p>
 There are several common reasons for this:
diff --git a/docs/gtkfaq.sgml b/docs/gtkfaq.sgml
index 1e9257d2c7..26d5981fc2 100644
--- a/docs/gtkfaq.sgml
+++ b/docs/gtkfaq.sgml
@@ -163,6 +163,23 @@ name="http://www.gnome.org">)
 is using GTK+ to build a free desktop for Linux. Many more programs can be found
 there.
 
+<!-- ----------------------------------------------------------------- -->
+<sect1>I'm looking for an application to write in GTK+. How about an IRC client?
+<p> 
+
+Ask on gtk-list for suggestions. There are at least four IRC
+clients already under development
+
+<itemize>
+<item>girc. (Included with GNOME)
+<item>Bezerk (<htmlurl url="http://www.gtk.org/~trog/"
+                       name="http://www.gtk.org/~trog/">)
+<item>gsirc. (Location?)
+<item>Gnirc. (<htmlurl url="http://www.imaginet.fr/~dramboz/gnirc"
+                       name="http://www.imaginet.fr/~dramboz/gnirc">)
+</itemize>
+
+
 <!-- ***************************************************************** -->
 <sect>How to find, configure, install, and troubleshoot GTK+
 
@@ -202,8 +219,7 @@ handle the automatically generated Makefiles.
 
 <!-- ----------------------------------------------------------------- -->
  
-<sect1>I've compiled and installed GTK+, but I can't get any programs to link
-with it!
+<sect1>I've compiled and installed GTK+, but I can't get any programs to link with it!
 <p>
 This problem is most often encountered when the GTK+ libraries can't be 
 found or are the wrong version. Generally, the compiler will complain about an
@@ -250,6 +266,47 @@ and reinstall gtk+.
 </itemize>
 
 <!-- ----------------------------------------------------------------- -->
+<sect1>When compiling programs with GTK+, I get compiler error messages about not being able to find <tt/"glibconfig.h"/.
+
+<p> The header file "glibconfig.h" was moved to the directory
+$exec_prefix/lib/glib/include/. $exec_prefix is the
+directory that was specified by giving the --exec-prefix
+flags to ./configure when compiling GTK+. It defaults to 
+$prefix, (specified with --prefix), which in turn defaults
+to /usr/local/.
+
+<p> This was done because "glibconfig.h" includes architecture
+dependent information, and the rest of the include files
+are put in $prefix/include, which can be shared between different
+architectures. 
+
+<p> GTK+ includes a shell script, <tt/gtk-config/, that
+makes it easy to find out the correct include paths.
+The GTK+ tutorial includes an example of using <tt/gtk-config/
+for simple compilation from the command line. For information
+about more complicated configuration, see the file
+docs/gtk-config.txt in the GTK+ distribution.
+
+<p> If you are trying to compile an old program, you may
+be able to work around the problem by configuring it
+with a command line like: 
+
+<tscreen><verb>
+CPPFLAGS="-I/usr/local/include/glib/include ./configure
+</verb></tscreen>
+
+<p>
+for Bourne-compatible shells like bash, or for csh variants:
+
+<tscreen><verb>
+setenv CPPFLAGS "-I/usr/local/include/glib/include 
+./configure
+</verb></tscreen>
+
+<p>
+(Substitute the appropriate value of $exec_prefix for /usr/local.)
+
+<!-- ----------------------------------------------------------------- -->
 <sect1>When installing The GIMP, configure reports that it can't find GTK.
 <p>
 There are several common reasons for this: