diff options
| author | Alexander Larsson <alexl@redhat.com> | 2000-11-09 12:15:40 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2000-11-09 12:15:40 +0000 |
| commit | 8898529c12e0d2d4a5dd4e3b9917a6a1272f4882 (patch) | |
| tree | a39b6ae3282377218c9f7f85c764fcbef8499222 /gdk/linux-fb/gdkimage-fb.c | |
| parent | 8ced8f9d842a75dda1ed650a83b1465f868d50f6 (diff) | |
| download | gtk+-8898529c12e0d2d4a5dd4e3b9917a6a1272f4882.tar.gz | |
Changes to make the new testgtk compile after gtk_menu_append was removed.
2000-11-09 Alexander Larsson <alexl@redhat.com>
* demos/testgtk/menus.c:
Changes to make the new testgtk compile after
gtk_menu_append was removed.
* gdk/linux-fb/gdkdrawable-fb2.c
(gdk_fb_get_depth, gdk_fb_get_visual,
gdk_drawable_impl_fb_class_init): Implement
these drawable functions. Now GtkImages work again.
* gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Change prototype.
* gdk/linux-fb/gdkprivate-fb.h (_gdk_fb_get_image): Change prototype.
* gdk/linux-fb/gdkmain-fb.c (fb_modes_parse_mode,
gdk_fb_setup_mode_from_name, gdk_fb_set_mode, gdk_fb_display_new);
Parse /etc/fb.modes, use the environment variables GDK_DISPLAY_MODE,
GDK_DISPLAY_DEPTH, GDK_DISPLAY_WIDTH, GDK_DISPLAY_HEIGHT.
Diffstat (limited to 'gdk/linux-fb/gdkimage-fb.c')
| -rw-r--r-- | gdk/linux-fb/gdkimage-fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c index 859b9bd8ee..96e518d4b3 100644 --- a/gdk/linux-fb/gdkimage-fb.c +++ b/gdk/linux-fb/gdkimage-fb.c @@ -151,7 +151,7 @@ gdk_image_new (GdkImageType type, } GdkImage* -_gdk_fb_get_image (GdkWindow *window, +_gdk_fb_get_image (GdkDrawable *drawable, gint x, gint y, gint width, @@ -162,12 +162,12 @@ _gdk_fb_get_image (GdkWindow *window, gint bits_per_pixel = GDK_DRAWABLE_IMPL_FBDATA(gdk_parent_root)->depth; GdkPixmapFBData fbd; - g_return_val_if_fail (window != NULL, NULL); + g_return_val_if_fail (drawable != NULL, NULL); image = (GdkImage *)private = (GdkImagePrivateFB *)g_object_new (gdk_image_get_type(), NULL); image->type = GDK_IMAGE_NORMAL; - image->visual = gdk_window_get_visual (window); + image->visual = gdk_drawable_get_visual (drawable); image->width = width; image->height = height; image->depth = bits_per_pixel; @@ -193,7 +193,7 @@ _gdk_fb_get_image (GdkWindow *window, fbd.drawable_data.depth = image->depth; fbd.drawable_data.window_type = GDK_DRAWABLE_PIXMAP; - gdk_fb_draw_drawable_2((GdkPixmap *)&fbd, NULL, window, x, y, 0, 0, width, height, TRUE, TRUE); + gdk_fb_draw_drawable_2((GdkPixmap *)&fbd, NULL, drawable, x, y, 0, 0, width, height, TRUE, TRUE); return image; } |