]> git.saurik.com Git - wxWidgets.git/commitdiff
Comment out suspicious 1-bit bitmap conversion
authorRobert Roebling <robert@roebling.de>
Wed, 23 Aug 2006 20:01:34 +0000 (20:01 +0000)
committerRobert Roebling <robert@roebling.de>
Wed, 23 Aug 2006 20:01:34 +0000 (20:01 +0000)
    which happens to break wxAUI (its close button).

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

src/gtk/bitmap.cpp

index 3eca0eb586775fe096bedeb994549061597e7d04..c5ebe0fabd2a0ef9cf4a7c0fd7da2b68a6f552b8 100644 (file)
@@ -641,6 +641,7 @@ wxImage wxBitmap::ConvertToImage() const
     {
         GdkPixmap* pixmap = GetPixmap();
         GdkPixmap* pixmap_invert = NULL;
     {
         GdkPixmap* pixmap = GetPixmap();
         GdkPixmap* pixmap_invert = NULL;
+#if 0
         if (GetDepth() == 1)
         {
             // mono bitmaps are inverted
         if (GetDepth() == 1)
         {
             // mono bitmaps are inverted
@@ -651,6 +652,7 @@ wxImage wxBitmap::ConvertToImage() const
             g_object_unref(gc);
             pixmap = pixmap_invert;
         }
             g_object_unref(gc);
             pixmap = pixmap_invert;
         }
+#endif
         // create a pixbuf which shares data with the wxImage
         GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
             data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);
         // create a pixbuf which shares data with the wxImage
         GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
             data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);