Tinderbox build fix.

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

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 173c3b2b3c205e418314aab4509e93f39c5775a7..9415eea4487c04f8494e6deb4a316aacaa1d1cdc 100644 (file)
--- a/src/mgl/brush.cpp
+++ b/src/mgl/brush.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/mgl/brush.cpp

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:    wxWindows licence
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,13 +26,13 @@
 // This function converts wxBitmap into pixpattern24_t representation
 // (used by wxBrush and wxPen)
 
 // This function converts wxBitmap into pixpattern24_t representation
 // (used by wxBrush and wxPen)
 

-void wxBitmapToPixPattern(const wxBitmap& bitmap, 
+void wxBitmapToPixPattern(const wxBitmap& bitmap,

                           pixpattern24_t *pix, pattern_t *mask)
 {
     wxMemoryDC mem;
     MGLDevCtx *dc;
     int x, y;
                           pixpattern24_t *pix, pattern_t *mask)
 {
     wxMemoryDC mem;
     MGLDevCtx *dc;
     int x, y;

-    
+

     if ( pix != NULL )
     {
         mem.SelectObject(bitmap);
     if ( pix != NULL )
     {
         mem.SelectObject(bitmap);


@@ -45,16 +41,16 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap,
         dc->beginPixel();
         for (y = 0; y < 8; y++)
             for (x = 0; x < 8; x++)
         dc->beginPixel();
         for (y = 0; y < 8; y++)
             for (x = 0; x < 8; x++)

-                dc->unpackColorFast(dc->getPixelFast(x, y), 
+                dc->unpackColorFast(dc->getPixelFast(x, y),

                                     pix->p[y][x][2],
                                     pix->p[y][x][2],

-                                    pix->p[y][x][1], 
+                                    pix->p[y][x][1],

                                     pix->p[y][x][0]);
         dc->endPixel();
     }
 
     if ( mask && bitmap.GetMask() )
     {
                                     pix->p[y][x][0]);
         dc->endPixel();
     }
 
     if ( mask && bitmap.GetMask() )
     {

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

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


@@ -63,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] = 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();
     }
         }
         dc->endPixel();
     }


@@ -121,58 +117,30 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

-wxBrush::wxBrush()
-{
-    if (wxTheBrushList) wxTheBrushList->AddBrush(this);
-}
-

 wxBrush::wxBrush(const wxColour &colour, int style)
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;
 wxBrush::wxBrush(const wxColour &colour, int style)
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;

-
-    if (wxTheBrushList) wxTheBrushList->AddBrush(this);

 }
 
 wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 {
     wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") );
 }
 
 wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 {
     wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") );

-    wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8, 
+    wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8,

                   _T("stipple bitmap must be 8x8") );
 
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;
                   _T("stipple bitmap must be 8x8") );
 
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_colour = *wxBLACK;

-    
+

     M_BRUSHDATA->m_stipple = stippleBitmap;
     M_BRUSHDATA->m_stipple = stippleBitmap;

-    wxBitmapToPixPattern(stippleBitmap, &(M_BRUSHDATA->m_pixPattern), 
+    wxBitmapToPixPattern(stippleBitmap, &(M_BRUSHDATA->m_pixPattern),

                                         &(M_BRUSHDATA->m_maskPattern));
 
     if (M_BRUSHDATA->m_stipple.GetMask())
                                         &(M_BRUSHDATA->m_maskPattern));
 
     if (M_BRUSHDATA->m_stipple.GetMask())

-               M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-       else
-               M_BRUSHDATA->m_style = wxSTIPPLE;
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush(this);
-}
-
-wxBrush::wxBrush(const wxBrush &brush)
-{
-    Ref(brush);
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush(this);
-}
-
-wxBrush::~wxBrush()
-{
-    if (wxTheBrushList) wxTheBrushList->RemoveBrush(this);
-}
-
-wxBrush& wxBrush::operator = (const wxBrush& brush)
-{
-    if (*this == brush) return (*this);
-    Ref(brush);
-    return *this;
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;

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


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

-bool wxBrush::Ok() const
+bool wxBrush::IsOk() const

 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }


@@ -239,28 +207,28 @@ void* wxBrush::GetPixPattern() const
 
 void wxBrush::SetColour(const wxColour& col)
 {
 
 void wxBrush::SetColour(const wxColour& col)
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 
 void wxBrush::SetStyle( int style )
 {
     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 
 void wxBrush::SetStyle( int style )
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple(const wxBitmap& stipple)
 {
     M_BRUSHDATA->m_style = style;
 }
 
 void wxBrush::SetStipple(const wxBitmap& stipple)
 {

-    Unshare();
+    AllocExclusive();

 
     wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
 
     wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );

-    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, 
+    wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

                   _T("stipple bitmap must be 8x8") );
 
     M_BRUSHDATA->m_stipple = stipple;
                   _T("stipple bitmap must be 8x8") );
 
     M_BRUSHDATA->m_stipple = stipple;


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

-void wxBrush::Unshare()
+wxObjectRefData *wxBrush::CreateRefData() const

 {
 {

-    if (!m_refData)
-    {
-        m_refData = new wxBrushRefData();
-    }
-    else
-    {
-        wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    return new wxBrushRefData;

 }
 
 }
 

+wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxBrushRefData(*(wxBrushRefData *)data);
+}