forked from AuroraMiddleware/gtk
merging changes from owen:
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure that when we are running with a non-installed colormap, in 8-bit pseudo-color, we actually are using the system visual. (Fixes *Bad Match* errors on Digital Unix machines with multiple 8-bit pseudo-color visuals) -r HEAD and -r gtk-1-0 are in sync now!
This commit is contained in:
parent
3e3c14e9ef
commit
5647eeecf3
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -58,6 +58,14 @@ Wed Apr 15 05:13:09 1998 Tim Janik <timj@gtk.org>
|
||||
(Damon Chaplin), which i got wrong when applying Damon's patch the last
|
||||
time.
|
||||
|
||||
Wed Apr 15 20:42:46 1998 Owen Taylor <otaylor@gtk.org>
|
||||
|
||||
* gtk/gtkpreview.c (gtk_preview_get_visuals): Make sure
|
||||
that when we are running with a non-installed colormap,
|
||||
in 8-bit pseudo-color, we actually are using the system
|
||||
visual. (Fixes *Bad Match* errors on Digital Unix machines
|
||||
with multiple 8-bit pseudo-color visuals)
|
||||
|
||||
1998-04-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||
|
||||
* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
|
||||
|
@ -872,6 +872,18 @@ gtk_preview_get_visuals (GtkPreviewClass *klass)
|
||||
return;
|
||||
}
|
||||
|
||||
/* If we are _not_ running with an installed cmap, we must run
|
||||
* with the system visual. Otherwise, we let GDK pick the visual,
|
||||
* and it makes some effort to pick a non-default visual, which
|
||||
* will hopefully provide minimum color flashing.
|
||||
*/
|
||||
if ((klass->info.visual->depth == gdk_visual_get_system()->depth) &&
|
||||
(klass->info.visual->type == gdk_visual_get_system()->type) &&
|
||||
!install_cmap)
|
||||
{
|
||||
klass->info.visual = gdk_visual_get_system();
|
||||
}
|
||||
|
||||
switch (klass->info.visual->depth)
|
||||
{
|
||||
case 8:
|
||||
|
Loading…
Reference in New Issue
Block a user