Disabled masked bitmaps under GTK 2.0 until I know

    why they crash.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 634273f99e71df99c7c753400a9de4beb5140c0f..92bd009d71c0d18b12484e6caf41c75cdff6e6b9 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -33,10 +33,7 @@
 #ifdef __WXGTK20__
     #include <gdk/gdkimage.h>
 #else // GTK+ 1.2
-    // VZ: is this still needed? seems to compile fine without it...
-    #if (GTK_MINOR_VERSION > 0)
-        #include <gdk/gdkrgb.h>
-    #endif
+    #include <gdk/gdkrgb.h>
 #endif // GTK+ 2.0/1.2
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
@@ -360,7 +357,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
 
         SetDepth( 1 );
-
+        
         GdkVisual *visual = wxTheApp->GetGdkVisual();
 
         // Create picture image
@@ -460,7 +457,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         int bpp = visual->depth;
 
         SetDepth( bpp );
-
+        
         if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
         if (bpp < 8) bpp = 8;
 
@@ -705,7 +702,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
-
+    
     if (!data)
     {
         gdk_image_destroy( gdk_image );

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index d7eee8e5dec280213ee27222a1eb2e04ae5ffc8c..ffd39ac0a7403ab801dd1ef16982cb7609a571b2 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1010,6 +1010,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     {
         use_bitmap = bitmap;
     }
+    
+#ifdef __WXGTK20__
+    useMask = FALSE;
+#endif
 
     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 634273f99e71df99c7c753400a9de4beb5140c0f..92bd009d71c0d18b12484e6caf41c75cdff6e6b9 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -33,10 +33,7 @@
 #ifdef __WXGTK20__
     #include <gdk/gdkimage.h>
 #else // GTK+ 1.2
-    // VZ: is this still needed? seems to compile fine without it...
-    #if (GTK_MINOR_VERSION > 0)
-        #include <gdk/gdkrgb.h>
-    #endif
+    #include <gdk/gdkrgb.h>
 #endif // GTK+ 2.0/1.2
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
@@ -360,7 +357,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
 
         SetDepth( 1 );
-
+        
         GdkVisual *visual = wxTheApp->GetGdkVisual();
 
         // Create picture image
@@ -460,7 +457,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         int bpp = visual->depth;
 
         SetDepth( bpp );
-
+        
         if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
         if (bpp < 8) bpp = 8;
 
@@ -705,7 +702,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
-
+    
     if (!data)
     {
         gdk_image_destroy( gdk_image );

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index d7eee8e5dec280213ee27222a1eb2e04ae5ffc8c..ffd39ac0a7403ab801dd1ef16982cb7609a571b2 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1010,6 +1010,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     {
         use_bitmap = bitmap;
     }
+    
+#ifdef __WXGTK20__
+    useMask = FALSE;
+#endif
 
     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;