From 9b72a74d94bca6303a65a3a13958461eb6c7290a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 15 Jan 2002 16:21:09 +0000 Subject: [PATCH] gdk_rgb doesn't work on SGI. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/bitmap.cpp | 4 ++++ src/gtk1/bitmap.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index c60e094b35..4f5ad6a770 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -453,7 +453,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit // visuals are not supported by GDK so we do these ourselves, too. // 15-bit and 16-bit should actually work and 24-bit certainly does. +#ifdef __sgi + if (!image.HasMask() && (bpp > 16)) +#else if (!image.HasMask() && (bpp > 12)) +#endif { static bool s_hasInitialized = FALSE; diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index c60e094b35..4f5ad6a770 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -453,7 +453,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit // visuals are not supported by GDK so we do these ourselves, too. // 15-bit and 16-bit should actually work and 24-bit certainly does. +#ifdef __sgi + if (!image.HasMask() && (bpp > 16)) +#else if (!image.HasMask() && (bpp > 12)) +#endif { static bool s_hasInitialized = FALSE; -- 2.45.2