Commit d142827b authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent 4851efe2
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
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.
Sun May 3 21:32:35 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdk.c (gdk_event_translate): Grab with OwnerEvents = False
to make this consistent with the gtk-1-0 tree.
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org> Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c * configure.in acheader.h gdk/gdkwindow.c
...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org> ...@@ -49,7 +72,7 @@ Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org> Sun May 3 19:45:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function * gtk/gtkadjustment.c (gtk_adjustment_assimilate_value): new function
to set the adjustments value when there is no current emissioin. to set the adjustments value when there is no current emission.
[ Removed by mutual agreement owt 5/3/1998 ] [ Removed by mutual agreement owt 5/3/1998 ]
* gtk/gtksignal.c: added new functions to retrive the number of * gtk/gtksignal.c: added new functions to retrive the number of
......
...@@ -163,6 +163,23 @@ name="http://www.gnome.org">) ...@@ -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 is using GTK+ to build a free desktop for Linux. Many more programs can be found
there. 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+ <sect>How to find, configure, install, and troubleshoot GTK+
...@@ -202,8 +219,7 @@ handle the automatically generated Makefiles. ...@@ -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 <sect1>I've compiled and installed GTK+, but I can't get any programs to link with it!
with it!
<p> <p>
This problem is most often encountered when the GTK+ libraries can't be 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 found or are the wrong version. Generally, the compiler will complain about an
...@@ -249,6 +265,47 @@ the libraries libgtk, libgdk, libglib, or libgck. If they do exist, remove them ...@@ -249,6 +265,47 @@ the libraries libgtk, libgdk, libglib, or libgck. If they do exist, remove them
and reinstall gtk+. and reinstall gtk+.
</itemize> </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. <sect1>When installing The GIMP, configure reports that it can't find GTK.
<p> <p>
......
...@@ -163,6 +163,23 @@ name="http://www.gnome.org">) ...@@ -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 is using GTK+ to build a free desktop for Linux. Many more programs can be found
there. 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+ <sect>How to find, configure, install, and troubleshoot GTK+
...@@ -202,8 +219,7 @@ handle the automatically generated Makefiles. ...@@ -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 <sect1>I've compiled and installed GTK+, but I can't get any programs to link with it!
with it!
<p> <p>
This problem is most often encountered when the GTK+ libraries can't be 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 found or are the wrong version. Generally, the compiler will complain about an
...@@ -249,6 +265,47 @@ the libraries libgtk, libgdk, libglib, or libgck. If they do exist, remove them ...@@ -249,6 +265,47 @@ the libraries libgtk, libgdk, libglib, or libgck. If they do exist, remove them
and reinstall gtk+. and reinstall gtk+.
</itemize> </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. <sect1>When installing The GIMP, configure reports that it can't find GTK.
<p> <p>
......
...@@ -2329,7 +2329,7 @@ gdk_event_translate (GdkEvent *event, ...@@ -2329,7 +2329,7 @@ gdk_event_translate (GdkEvent *event,
gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw);
gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw);
xgpret = xgpret =
XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, True, XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, False,
ButtonMotionMask | PointerMotionMask | ButtonMotionMask | PointerMotionMask |
/* PointerMotionHintMask | */ /* HINTME */ /* PointerMotionHintMask | */ /* HINTME */
ButtonPressMask | ButtonReleaseMask, ButtonPressMask | ButtonReleaseMask,
......
...@@ -1226,7 +1226,7 @@ gdk_window_get_colormap (GdkWindow *window) ...@@ -1226,7 +1226,7 @@ gdk_window_get_colormap (GdkWindow *window)
g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL); g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL);
if (!window_private->destroyed) if (!window_private->destroyed)
{ {
if (window_private->colormap == NULL) if (window_private->colormap == NULL)
{ {
XGetWindowAttributes (window_private->xdisplay, XGetWindowAttributes (window_private->xdisplay,
window_private->xwindow, window_private->xwindow,
......
...@@ -2329,7 +2329,7 @@ gdk_event_translate (GdkEvent *event, ...@@ -2329,7 +2329,7 @@ gdk_event_translate (GdkEvent *event,
gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw);
gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw);
xgpret = xgpret =
XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, True, XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, False,
ButtonMotionMask | PointerMotionMask | ButtonMotionMask | PointerMotionMask |
/* PointerMotionHintMask | */ /* HINTME */ /* PointerMotionHintMask | */ /* HINTME */
ButtonPressMask | ButtonReleaseMask, ButtonPressMask | ButtonReleaseMask,
......
...@@ -1226,7 +1226,7 @@ gdk_window_get_colormap (GdkWindow *window) ...@@ -1226,7 +1226,7 @@ gdk_window_get_colormap (GdkWindow *window)
g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL); g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL);
if (!window_private->destroyed) if (!window_private->destroyed)
{ {
if (window_private->colormap == NULL) if (window_private->colormap == NULL)
{ {
XGetWindowAttributes (window_private->xdisplay, XGetWindowAttributes (window_private->xdisplay,
window_private->xwindow, window_private->xwindow,
......
...@@ -73,12 +73,6 @@ void gtk_adjustment_clamp_page (GtkAdjustment *adjustment, ...@@ -73,12 +73,6 @@ void gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
gfloat upper); gfloat upper);
void gtk_adjustment_set_value (GtkAdjustment *adjustment, void gtk_adjustment_set_value (GtkAdjustment *adjustment,
gfloat value); gfloat value);
void gtk_adjustment_assimilate_value (GtkAdjustment *adjustment,
gfloat value);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -396,13 +396,15 @@ static void ...@@ -396,13 +396,15 @@ static void
gtk_label_state_changed (GtkWidget *widget, gtk_label_state_changed (GtkWidget *widget,
guint previous_state) guint previous_state)
{ {
GTK_LABEL (widget)->needs_clear = 1; if (GTK_WIDGET_DRAWABLE (widget))
GTK_LABEL (widget)->needs_clear = 1;
} }
static void static void
gtk_label_style_set (GtkWidget *widget, gtk_label_style_set (GtkWidget *widget,
GtkStyle *previous_style) GtkStyle *previous_style)
{ {
GTK_LABEL (widget)->needs_clear = 1; if (GTK_WIDGET_DRAWABLE (widget))
GTK_LABEL (widget)->needs_clear = 1;
} }
...@@ -1238,7 +1238,7 @@ gtk_trim_cmap (GtkPreviewClass *klass) ...@@ -1238,7 +1238,7 @@ gtk_trim_cmap (GtkPreviewClass *klass)
nred = nred - 1; nred = nred - 1;
else else
{ {
tmp = log (ngray) / log (2); tmp = log ((gdouble)ngray) / log (2.0);
if (ngreen >= tmp) if (ngreen >= tmp)
ngreen = ngreen - 1; ngreen = ngreen - 1;
......
...@@ -249,19 +249,6 @@ gtk_type_describe_tree (GtkType type, ...@@ -249,19 +249,6 @@ gtk_type_describe_tree (GtkType type,
indent = old_indent; indent = old_indent;
} }
static gint type_isas[512];
static void
show_isas (void)
{
int i;
for (i=0;i<512;i++)
if (type_isas[i])
g_print ("%s: %d\n",gtk_type_name(GTK_TYPE_MAKE(GTK_TYPE_OBJECT,i)),
type_isas[i]);
}
gint gint
gtk_type_is_a (GtkType type, gtk_type_is_a (GtkType type,
GtkType is_a_type) GtkType is_a_type)
...@@ -271,8 +258,6 @@ gtk_type_is_a (GtkType type, ...@@ -271,8 +258,6 @@ gtk_type_is_a (GtkType type,
if (initialize) if (initialize)
gtk_type_init (); gtk_type_init ();
type_isas[GTK_TYPE_SEQNO(is_a_type)]++;
node = g_hash_table_lookup (type_hash_table, &type); node = g_hash_table_lookup (type_hash_table, &type);
while (node)