Fixed printf-related warnings

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

diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp
index 8579529fc8193fd6f942b155b6bfd6d16ba0efb6..c5f2b03cc083c33d28cce3f451d33f45bc39a878 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$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
 


@@ -20,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"

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


@@ -30,31 +26,31 @@
 // 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 )
     {
     if ( pix != NULL )
     {

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

         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         dc->beginPixel();
         for (y = 0; y < 8; y++)
             for (x = 0; x < 8; x++)
         dc = mem.GetMGLDC();
         wxCurrentDCSwitcher curDC(dc);
         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.SelectObjectAsSource(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();
     }


@@ -74,13 +70,22 @@ 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);
 

-    int            m_style;
+    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);
+    }
+
+    wxBrushStyle   m_style;

     wxColour       m_colour;
     wxBitmap       m_stipple;
     pixpattern24_t m_pixPattern;
     wxColour       m_colour;
     wxBitmap       m_stipple;
     pixpattern24_t m_pixPattern;


@@ -121,47 +126,48 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

-wxBrush::wxBrush(const wxColour &colour, int style)
+wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)

 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;
 }
 
 {
     m_refData = new wxBrushRefData();
     M_BRUSHDATA->m_style = style;
     M_BRUSHDATA->m_colour = colour;
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData;
+    M_BRUSHDATA->m_style = (wxBrushStyle)style;
+    M_BRUSHDATA->m_colour = colour;
+}
+#endif
+

 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;
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;

 }
 
 }
 

-wxBrush::wxBrush(const wxBrush &brush)
+bool wxBrush::operator == (const wxBrush& brush) const

 {
 {

-    Ref(brush);
-}
+    if (m_refData == brush.m_refData) return true;

 
 

-wxBrush& wxBrush::operator = (const wxBrush& brush)
-{
-    if (*this == brush) return (*this);
-    Ref(brush);
-    return *this;
-}
+    if (!m_refData || !brush.m_refData) return false;

 
 

-bool wxBrush::operator == (const wxBrush& brush) const
-{
-    return m_refData == brush.m_refData;
+    return *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData;

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


@@ -169,40 +175,23 @@ bool wxBrush::operator != (const wxBrush& brush) const
     return m_refData != brush.m_refData;
 }
 
     return m_refData != brush.m_refData;
 }
 

-bool wxBrush::Ok() const
-{
-    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
-}
-
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const

 {
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return 0;
-    }
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );

 
     return M_BRUSHDATA->m_style;
 }
 
 
     return M_BRUSHDATA->m_style;
 }
 

-wxColour &wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const

 {
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return wxNullColour;
-    }
+    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );

 
     return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
 
     return M_BRUSHDATA->m_colour;
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return &wxNullBitmap;
-    }
+    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );

 
     return &M_BRUSHDATA->m_stipple;
 }
 
     return &M_BRUSHDATA->m_stipple;
 }


@@ -233,7 +222,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 
     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 

-void wxBrush::SetStyle( int style )
+void wxBrush::SetStyle( wxBrushStyle style )

 {
     AllocExclusive();
     M_BRUSHDATA->m_style = style;
 {
     AllocExclusive();
     M_BRUSHDATA->m_style = style;


@@ -244,7 +233,7 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
     AllocExclusive();
 
     wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
     AllocExclusive();
 
     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;


@@ -257,13 +246,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);
 }

-