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

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 933390a24ddaa3807205fa1cea965956ad8b4d0e..b0867750de97e35afaa5b45cbb8fc692b9bd1413 100644 (file)
--- 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();
                                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);
 }
     img.SetMaskColour(123,123,123);
     return wxBitmap(img);
 }

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 56b53b91c47c73ea485d73c04c71d176f9f89e83..e4c0dcf3422757e4236610b4e881adfa37beb086 100644 (file)
--- 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();
         ((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 );
     }
         img.SetMaskColour(123,123,123);
         m_closeButton = wxBitmap( img );
     }

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index a07199e234054d006f2735c3263b6d4650430028..c964726d839d59bbc811eec65f45fa45cca61f02 100644 (file)
--- 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;
                 }
                     reversed |= (unsigned char)(val & 0x01);
                     val >>= 1;
                 }

-                *dst++ = reversed;
+                *dst++ = ~reversed;

             }
 
             if ( padding )
             }
 
             if ( padding )