diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-08-24 10:31:38 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-08-24 10:31:38 +0000 |
| commit | afdf592637e488beeceba371234035c14235322f (patch) | |
| tree | 5c742af11c01c48bdd7e2fd4e6b6080663defde4 /gtk/gtk_bitmap.c | |
| parent | 11d7e4574a06a2c34e53e2ce31b17576fba9520a (diff) | |
| download | netsurf-afdf592637e488beeceba371234035c14235322f.tar.gz netsurf-afdf592637e488beeceba371234035c14235322f.tar.bz2 | |
Merge Mike's tabs changes. Still needs some cleaning.
svn path=/trunk/netsurf/; revision=5189
Diffstat (limited to 'gtk/gtk_bitmap.c')
| -rw-r--r-- | gtk/gtk_bitmap.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtk_bitmap.c b/gtk/gtk_bitmap.c index dd62aad26..e08741260 100644 --- a/gtk/gtk_bitmap.c +++ b/gtk/gtk_bitmap.c @@ -58,12 +58,8 @@ void *bitmap_create(int width, int height, unsigned int state) { struct bitmap *bmp = malloc(sizeof(struct bitmap)); -// if ((state & BITMAP_OPAQUE) != 0) -// bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, -// 8, width, height); -// else - bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, - 8, width, height); + bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, + 8, width, height); /* fill the pixbuf in with 100% transparent black, as the memory * won't have been cleared. @@ -289,7 +285,10 @@ gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y) GdkPixbuf * gtk_bitmap_get_primary(struct bitmap *bitmap) { - return bitmap->primary; + if (bitmap != NULL) + return bitmap->primary; + else + return NULL; } /** |