fix DrawLine() and DrawPolygon() which were totally broken for GTK1 since rev 36998

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

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index d97544d123efefa6c89c51ef08ea790a095c369a..b151db8a0a5b0d9663daf021a058aa0c6f347b96 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/mgl/dcmemory.h"
+#include "wx/dcmemory.h"
 
 
 // ---------------------------------------------------------------------------
@@ -35,7 +35,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 
     if ( pix != NULL )
     {
-        mem.SelectObject(bitmap);
+        mem.SelectObjectAsSource(bitmap);
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
@@ -50,7 +50,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 
     if ( mask && bitmap.GetMask() )
     {
-        mem.SelectObject(bitmap.GetMask()->GetBitmap());
+        mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap());
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
@@ -79,7 +79,7 @@ public:
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
-                m_stipple.IsRefTo(&data.m_stipple) &&
+                m_stipple.IsSameAs(data.m_stipple) &&
                 m_colour == data.m_colour);
     }