Comment out suspicious 1-bit bitmap conversion
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
This commit is contained in:
@@ -641,6 +641,7 @@ wxImage wxBitmap::ConvertToImage() const
|
|||||||
{
|
{
|
||||||
GdkPixmap* pixmap = GetPixmap();
|
GdkPixmap* pixmap = GetPixmap();
|
||||||
GdkPixmap* pixmap_invert = NULL;
|
GdkPixmap* pixmap_invert = NULL;
|
||||||
|
#if 0
|
||||||
if (GetDepth() == 1)
|
if (GetDepth() == 1)
|
||||||
{
|
{
|
||||||
// mono bitmaps are inverted
|
// mono bitmaps are inverted
|
||||||
@@ -651,6 +652,7 @@ wxImage wxBitmap::ConvertToImage() const
|
|||||||
g_object_unref(gc);
|
g_object_unref(gc);
|
||||||
pixmap = pixmap_invert;
|
pixmap = pixmap_invert;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
// create a pixbuf which shares data with the wxImage
|
// create a pixbuf which shares data with the wxImage
|
||||||
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
|
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
|
||||||
data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);
|
data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);
|
||||||
|
Reference in New Issue
Block a user