AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix problem with wrong depth being used. (#89941, Jacob Berkman.) Remove

Browse Source 
Mon Aug  5 15:25:40 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
        Fix problem with wrong depth being used. (#89941, Jacob
        Berkman.) Remove an unneeded 'screen' variable.

Mon Aug  5 15:04:59 2002  Owen Taylor  <otaylor@redhat.com>

        More fixes for warnings reported by David L. Cooper II

        * gtk/gtkaccelmap.c (accel_map_parse_accel_path): Use
        GdkModifierType for accel_mods. (#85856)

        * gdk/gdkdisplay.h (struct _GdkDisplay): Make button_number
        signed, since we use -1 as an 'unset' value. (#85854)

        * gdk/x11/xsettings-client.c (parse_settings): Suppress
        a warning (#85853)

        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Fix
        accidental trailing ';'. (#85846)
This commit is contained in:
Owen Taylor 2002-08-05 19:28:56 +00:00 committed by Owen Taylor
parent 1f8ad87b9f
commit e8468d5e6d
10 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Mon Aug 5 15:25:40 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
Fix problem with wrong depth being used. (#89941, Jacob
Berkman.) Remove an unneeded 'screen' variable.
Mon Aug 5 15:04:59 2002 Owen Taylor <otaylor@redhat.com>
More fixes for warnings reported by David L. Cooper II

4
gdk/gdkpixbuf-render.c
View File

@ -316,7 +316,7 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
GdkGC *gc;
*pixmap_return = gdk_pixmap_new (gdk_screen_get_root_window (screen),
gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
gdk_screen_get_rgb_visual (screen)->depth);
gdk_colormap_get_visual (colormap)->depth);
gdk_drawable_set_colormap (GDK_DRAWABLE (*pixmap_return), colormap);
gc = gdk_gc_new (*pixmap_return);
@ -332,8 +332,6 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
{
if (gdk_pixbuf_get_has_alpha (pixbuf))
{
GdkScreen *screen = gdk_colormap_get_screen (colormap);
*mask_return = gdk_pixmap_new (gdk_screen_get_root_window (screen),
gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), 1);

2
gdk/x11/gdkfont-x11.c
View File

@ -257,7 +257,7 @@ gdk_font_charset_for_locale (void)
return g_strdup (result);
else
return g_strdup ("iso8859-1");
};
}
/**
* gdk_font_from_description_for_display:

2
gdk/x11/xsettings-client.c
View File

@ -194,7 +194,7 @@ parse_settings (unsigned char *data,
buffer.pos = buffer.data = data;
buffer.len = len;
result = fetch_card8 (&buffer, &buffer.byte_order);
result = fetch_card8 (&buffer, (char *)&buffer.byte_order);
if (buffer.byte_order != MSBFirst &&
buffer.byte_order != LSBFirst)
{

3
gtk/gtkaccelmap.c
View File

@ -407,7 +407,8 @@ gtk_accel_map_change_entry (const gchar *accel_path,
static guint
accel_map_parse_accel_path (GScanner *scanner)
{
guint accel_key = 0, accel_mods = 0;
guint accel_key = 0;
GdkModifierType accel_mods = 0;
gchar *path, *accel;
/* parse accel path */