Added missing includes

[wxWidgets.git] / src / mgl / brush.cpp

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 9415eea4487c04f8494e6deb4a316aacaa1d1cdc..b8f6073f388fcfb6c45294161a306f0a2d1bf52f 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -16,7 +16,7 @@
 
 #include "wx/brush.h"
 #include "wx/mgl/private.h"
 
 #include "wx/brush.h"
 #include "wx/mgl/private.h"

-#include "wx/mgl/dcmemory.h"
+#include "wx/dcmemory.h"

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------


@@ -35,7 +35,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 
     if ( pix != NULL )
     {
 
     if ( pix != NULL )
     {

-        mem.SelectObject(bitmap);
+        mem.SelectObjectAsSource(bitmap);

         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();


@@ -50,7 +50,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 
     if ( mask && bitmap.GetMask() )
     {
 
     if ( mask && bitmap.GetMask() )
     {

-        mem.SelectObject(bitmap.GetMask()->GetBitmap());
+        mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap());

         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();


@@ -70,12 +70,21 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData : public wxGDIRefData

 {
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
 
 {
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
 

+    virtual bool IsOk() const { return m_colour.IsOk(); }
+
+    bool operator==(const wxBrushRefData& data) const
+    {
+        return (m_style == data.m_style &&
+                m_stipple.IsSameAs(data.m_stipple) &&
+                m_colour == data.m_colour);
+    }
+

     int            m_style;
     wxColour       m_colour;
     wxBitmap       m_stipple;
     int            m_style;
     wxColour       m_colour;
     wxBitmap       m_stipple;


@@ -145,7 +154,11 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 
 bool wxBrush::operator == (const wxBrush& brush) const
 {
 
 bool wxBrush::operator == (const wxBrush& brush) const
 {

-    return m_refData == brush.m_refData;
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData;

 }
 
 bool wxBrush::operator != (const wxBrush& brush) const
 }
 
 bool wxBrush::operator != (const wxBrush& brush) const


@@ -153,11 +166,6 @@ bool wxBrush::operator != (const wxBrush& brush) const
     return m_refData != brush.m_refData;
 }
 
     return m_refData != brush.m_refData;
 }
 

-bool wxBrush::IsOk() const
-{
-    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
-}
-

 int wxBrush::GetStyle() const
 {
     if (m_refData == NULL)
 int wxBrush::GetStyle() const
 {
     if (m_refData == NULL)


@@ -241,12 +249,12 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
         M_BRUSHDATA->m_style = wxSTIPPLE;
 }
 
         M_BRUSHDATA->m_style = wxSTIPPLE;
 }
 

-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const

 {
     return new wxBrushRefData;
 }
 
 {
     return new wxBrushRefData;
 }
 

-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }