deprecation fixes, plus some code size reduction and cleanup

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

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 26ea8e74f6623c569ba0e7765ca60cb8dd5a2b95..9415eea4487c04f8494e6deb4a316aacaa1d1cdc 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -50,7 +50,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
 
     if ( mask && bitmap.GetMask() )
     {
-        mem.SelectObject(*bitmap.GetMask()->GetBitmap());
+        mem.SelectObject(bitmap.GetMask()->GetBitmap());
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
@@ -59,7 +59,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
             mask->p[y] = 0;
             for (x = 0; x < 8; x++)
                 if ( dc->getPixelFast(x, y) != 0 )
-                    mask->p[y] |= 1 << (7 - x);
+                    mask->p[y] = (uchar)(mask->p[y] | (1 << (7 - x)));
         }
         dc->endPixel();
     }
@@ -143,18 +143,6 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap)
         M_BRUSHDATA->m_style = wxSTIPPLE;
 }
 
-wxBrush::wxBrush(const wxBrush &brush)
-{
-    Ref(brush);
-}
-
-wxBrush& wxBrush::operator = (const wxBrush& brush)
-{
-    if (*this == brush) return (*this);
-    Ref(brush);
-    return *this;
-}
-
 bool wxBrush::operator == (const wxBrush& brush) const
 {
     return m_refData == brush.m_refData;
@@ -165,7 +153,7 @@ bool wxBrush::operator != (const wxBrush& brush) const
     return m_refData != brush.m_refData;
 }
 
-bool wxBrush::Ok() const
+bool wxBrush::IsOk() const
 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
@@ -223,7 +211,7 @@ void wxBrush::SetColour(const wxColour& col)
     M_BRUSHDATA->m_colour = col;
 }
 
-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     AllocExclusive();
     M_BRUSHDATA->m_colour.Set(r, g, b);