diff options
| author | Tor Lillqvist <tml@iki.fi> | 1999-10-02 22:42:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 1999-10-02 22:42:58 +0000 |
| commit | c50941c82dbef8fb6122ab4f19bd592cb7fc58ef (patch) | |
| tree | b21e7fdac4d03769d10a9bb56013620918202c28 /gdk/gdkrgb.c | |
| parent | b196167dbc91b150b1f39c9cec87fffe913be199 (diff) | |
| download | gtk+-c50941c82dbef8fb6122ab4f19bd592cb7fc58ef.tar.gz | |
Change GDK_WINDOWING_WIN32 usage to #ifdef also here.
1999-10-03 Tor Lillqvist <tml@iki.fi>
* gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
to #ifdef also here.
* gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
Owen did to the X11 backend.
* gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
ScrollWindowEx when blitting inside a window, it can't be correct
in the general case.
* gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
WM_GETMINMAXINFO is easier.
* gdk/win32/gdkimage.c (gdk_image_new): Create new image with
depth equal to the bitspixel value, not the visual's depth.
* gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
to 24 even if the bitspixel value is 32.
* gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
need to check for depth==32 when bpp==32, depth will always be 24.
Diffstat (limited to 'gdk/gdkrgb.c')
| -rw-r--r-- | gdk/gdkrgb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index 806e93dee7..b0624346cc 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -2772,7 +2772,7 @@ gdk_rgb_select_conv (GdkImage *image) else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR && (mask_rgb && byte_order == GDK_MSB_FIRST)) conv = gdk_rgb_convert_0888_br; - else if (bpp == 32 && (depth == 32 || depth == 24) && vtype == GDK_VISUAL_TRUE_COLOR && + else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR && (mask_rgb && byte_order == GDK_LSB_FIRST)) conv = gdk_rgb_convert_0888; else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR && |