From c4d3971185bf67ebe90c1bee21697b9d8ca733c1 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Thu, 24 Aug 2006 09:54:36 +0000
Subject: [PATCH]   revert bits for XBM bitmaps under MSW   adapt XBM usage in
 wxAUI to this logic

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/aui/dockart.cpp  | 4 ++--
 src/gtk/minifram.cpp | 3 +--
 src/msw/bitmap.cpp   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 933390a24d..b0867750de 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -76,8 +76,8 @@ static wxBitmap BitmapFromBits(const unsigned char bits[], int w, int h,
                                const wxColour& color)
 {
     wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage();
-    img.Replace(255,255,255,123,123,123);
-    img.Replace(0,0,0,color.Red(),color.Green(),color.Blue());
+    img.Replace(0,0,0,123,123,123);
+    img.Replace(255,255,255,color.Red(),color.Green(),color.Blue());
     img.SetMaskColour(123,123,123);
     return wxBitmap(img);
 }
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 56b53b91c4..e4c0dcf342 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -293,8 +293,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
         ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
     {
         wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage();
-        img.Replace(255,255,255,123,123,123);
-        img.Replace(0,0,0,255,255,255);
+        img.Replace(0,0,0,123,123,123);
         img.SetMaskColour(123,123,123);
         m_closeButton = wxBitmap( img );
     }
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index a07199e234..c964726d83 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -445,7 +445,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
                     reversed |= (unsigned char)(val & 0x01);
                     val >>= 1;
                 }
-                *dst++ = reversed;
+                *dst++ = ~reversed;
             }
 
             if ( padding )