don't use static buffer needing a critical section to protect it for logging; this...

[wxWidgets.git] / src / aui / dockart.cpp

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 99f782d50936062b1586dfad96e0937061f18c98..b0867750de97e35afaa5b45cbb8fc692b9bd1413 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -25,13 +25,17 @@
 
 #if wxUSE_AUI
 
-#include "wx/image.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/image.h"
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
 #endif
 
 // -- wxDefaultDockArt class implementation --
@@ -72,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);
 }
@@ -158,11 +162,16 @@ wxDefaultDockArt::wxDefaultDockArt()
 #endif
 
     // some built in bitmaps
-#ifdef __WXMAC__
+#if defined( __WXMAC__ )
      static unsigned char close_bits[]={
          0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
          0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
          0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#elif defined( __WXGTK__)
+    static unsigned char close_bits[]={
+         0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+         0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+         0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 #else
     static unsigned char close_bits[]={
         0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xfb,0xcf,0xf9,
@@ -359,7 +368,7 @@ void wxDefaultDockArt::DrawBorder(wxDC& dc, const wxRect& _rect,
             rect.Deflate(1);
         }
     }
-     else
+    else
     {
         for (i = 0; i < border_width; ++i)
         {
@@ -381,7 +390,7 @@ void wxDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool
 
         dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
     }
-     else
+    else
     {
         if (active)
         {
@@ -430,7 +439,7 @@ void wxDefaultDockArt::DrawCaption(wxDC& dc,
 
     if (pane.state & wxPaneInfo::optionActive)
         dc.SetTextForeground(m_active_caption_text_colour);
-     else
+    else
         dc.SetTextForeground(m_inactive_caption_text_colour);