Merge wxQT branch into the trunk.

This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

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

src/qt/brush.cpp

@@ -0,0 +1,196 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/brush.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/brush.h"
+#include "wx/colour.h"
+#include "wx/qt/private/utils.h"
+#include "wx/bitmap.h"
+
+#include <QtGui/QBrush>
+
+
+static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style)
+{
+    switch (style)
+    {
+        case wxBRUSHSTYLE_INVALID:
+        case wxBRUSHSTYLE_SOLID:
+            return Qt::SolidPattern;
+
+        case wxBRUSHSTYLE_TRANSPARENT:
+            return Qt::NoBrush;
+
+        case wxBRUSHSTYLE_BDIAGONAL_HATCH:
+            return Qt::BDiagPattern;
+
+        case wxBRUSHSTYLE_CROSSDIAG_HATCH:
+            return Qt::DiagCrossPattern;
+
+        case wxBRUSHSTYLE_FDIAGONAL_HATCH:
+            return Qt::FDiagPattern;
+
+        case wxBRUSHSTYLE_CROSS_HATCH:
+            return Qt::CrossPattern;
+
+        case wxBRUSHSTYLE_HORIZONTAL_HATCH:
+            return Qt::HorPattern;
+
+        case wxBRUSHSTYLE_VERTICAL_HATCH:
+            return Qt::VerPattern;
+            
+        case wxBRUSHSTYLE_STIPPLE:
+        case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
+        case wxBRUSHSTYLE_STIPPLE_MASK:
+            return Qt::TexturePattern;
+            break;
+    }
+    return Qt::SolidPattern;
+}
+
+//-----------------------------------------------------------------------------
+// wxBrush
+//-----------------------------------------------------------------------------
+
+class wxBrushRefData: public wxGDIRefData
+{
+    public:
+        wxBrushRefData()
+        {
+        }
+        
+        wxBrushRefData( const wxBrushRefData& data )
+        : wxGDIRefData()
+        {
+            m_qtBrush = data.m_qtBrush;
+        }
+        
+        bool operator == (const wxBrushRefData& data) const
+        {
+            return m_qtBrush == data.m_qtBrush;
+        }
+        
+        QBrush m_qtBrush;
+
+        // To keep if mask is stippled 
+        wxBrushStyle m_style;
+};
+
+//-----------------------------------------------------------------------------
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)->m_qtBrush
+#define M_STYLEDATA ((wxBrushRefData *)m_refData)->m_style
+
+wxBrush::wxBrush()
+{
+    m_refData = new wxBrushRefData();
+}
+
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style )
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setColor(col.GetHandle());
+    M_BRUSHDATA.setStyle(ConvertBrushStyle(style));
+    M_STYLEDATA = style;
+}
+
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setColor(col.GetHandle());
+    M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style));
+    M_STYLEDATA = (wxBrushStyle)style;
+}
+
+wxBrush::wxBrush(const wxBitmap& stipple)
+{
+    m_refData = new wxBrushRefData();
+    M_BRUSHDATA.setTexture(*stipple.GetHandle());
+    if (stipple.GetMask() != NULL)
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
+}
+
+
+void wxBrush::SetColour(const wxColour& col)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setColor(col.GetHandle());
+}
+
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setColor(QColor(r, g, b));
+}
+
+void wxBrush::SetStyle(wxBrushStyle style)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style));
+    M_STYLEDATA = style;
+}
+
+void wxBrush::SetStipple(const wxBitmap& stipple)
+{
+    AllocExclusive();
+    M_BRUSHDATA.setTexture(*stipple.GetHandle());
+
+    if (stipple.GetMask() != NULL)
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+    else
+        M_STYLEDATA = wxBRUSHSTYLE_STIPPLE;
+}
+
+
+bool wxBrush::operator==(const wxBrush& brush) const
+{
+    if (m_refData == brush.m_refData) return true;
+    
+    if (!m_refData || !brush.m_refData) return false;
+    
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+}
+
+
+wxColour wxBrush::GetColour() const
+{
+    return wxColour(M_BRUSHDATA.color());
+}
+
+wxBrushStyle wxBrush::GetStyle() const
+{
+    return M_STYLEDATA;
+}
+
+wxBitmap *wxBrush::GetStipple() const
+{
+    QPixmap p = M_BRUSHDATA.texture();
+
+    if (p.isNull())
+        return new wxBitmap();
+    else
+        return new wxBitmap(p);
+}
+
+QBrush wxBrush::GetHandle() const
+{
+    return M_BRUSHDATA;
+}
+
+wxGDIRefData *wxBrush::CreateGDIRefData() const
+{
+    return new wxBrushRefData;
+}
+
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBrushRefData(*(wxBrushRefData *)data);
+}