Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 2f945402ce47202fb9a70cdabc1bd1c1cffdc481..667c6df8e4a55e05687633c6d9684fbfd7b3f4c3 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -1,46 +1,54 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

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

-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/brush.h"
 
 
 #include "wx/brush.h"
 

-#include <gdk/gdk.h>
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif

 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxBrushRefData();
-    wxBrushRefData( const wxBrushRefData& data );
+    wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID)
+    {
+        m_style = style;
+        m_colour = colour;
+    }

 
 

-    int        m_style;
-    wxBitmap   m_stipple;
-    wxColour   m_colour;
-};
+    wxBrushRefData( const wxBrushRefData& data )
+        : wxGDIRefData()
+    {
+        m_style = data.m_style;
+        m_stipple = data.m_stipple;
+        m_colour = data.m_colour;
+    }

 
 

-wxBrushRefData::wxBrushRefData()
-{
-    m_style = 0;
-}
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_style == data.m_style &&
+                m_stipple.IsSameAs(data.m_stipple) &&
+                m_colour == data.m_colour);
+    }

 
 

-wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
-{
-    m_style = data.m_style;
-    m_stipple = data.m_stipple;
-    m_colour = data.m_colour;
-}
+    wxBrushStyle m_style;
+    wxColour     m_colour;
+    wxBitmap     m_stipple;
+};

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


@@ -48,132 +56,105 @@ wxBrushRefData::wxBrushRefData( const wxBrushRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
 

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

 {
 {

-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    m_refData = new wxBrushRefData(colour, style);

 }
 
 }
 

-wxBrush::wxBrush( const wxColour &colour, int style )
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)

 {
 {

-    m_refData = new wxBrushRefData();
-    M_BRUSHDATA->m_style = style;
-    M_BRUSHDATA->m_colour = colour;
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);

 }
 }

+#endif

 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {
 
 wxBrush::wxBrush( const wxBitmap &stippleBitmap )
 {

-    m_refData = new wxBrushRefData();
-    M_BRUSHDATA->m_style = wxSTIPPLE;
-    M_BRUSHDATA->m_colour = *wxBLACK;
-    M_BRUSHDATA->m_stipple = stippleBitmap;
-
-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
-}
-
-wxBrush::wxBrush( const wxBrush &brush )
-{
-    Ref( brush );
+    wxBrushStyle style = wxBRUSHSTYLE_STIPPLE;
+    if (stippleBitmap.GetMask())
+        style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;

 
 

-    if (wxTheBrushList) wxTheBrushList->AddBrush( this );
+    m_refData = new wxBrushRefData(*wxBLACK, style);
+    M_BRUSHDATA->m_stipple = stippleBitmap;

 }
 
 wxBrush::~wxBrush()
 {
 }
 
 wxBrush::~wxBrush()
 {

-    if (wxTheBrushList) wxTheBrushList->RemoveBrush( this );
+    // m_refData unrefed in ~wxObject

 }
 
 }
 

-wxBrush& wxBrush::operator = ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CreateGDIRefData() const

 {
 {

-    if (*this == brush) return (*this);
-    Ref( brush );
-    return *this;
+    return new wxBrushRefData;

 }
 
 }
 

-bool wxBrush::operator == ( const wxBrush& brush )
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    return m_refData == brush.m_refData;
+    return new wxBrushRefData(*(wxBrushRefData *)data);

 }
 
 }
 

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

 {
 {

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

 
 

-bool wxBrush::Ok() const
-{
-    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );

 }
 
 }
 

-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const

 {
 {

-    if (m_refData == NULL)
-    {
-        wxFAIL_MSG( wxT("invalid brush") );
-        return 0;
-    }
+    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("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( IsOk(), wxNullColour, wxT("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( IsOk(), NULL, wxT("invalid brush") );

 
     return &M_BRUSHDATA->m_stipple;
 }
 
 void wxBrush::SetColour( const wxColour& col )
 {
 
     return &M_BRUSHDATA->m_stipple;
 }
 
 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 );
 }
 
     M_BRUSHDATA->m_colour.Set( r, g, b );
 }
 

-void wxBrush::SetStyle( int style )
+void wxBrush::SetStyle( wxBrushStyle 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();
-    M_BRUSHDATA->m_stipple = stipple;
-}
+    AllocExclusive();

 
 

-void wxBrush::Unshare()
-{
-    if (!m_refData)
+    M_BRUSHDATA->m_stipple = stipple;
+    if (M_BRUSHDATA->m_stipple.GetMask())

     {
     {

-        m_refData = new wxBrushRefData();
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;

     }
     else
     {
     }
     else
     {

-        wxBrushRefData* ref = new wxBrushRefData( *(wxBrushRefData*)m_refData );
-        UnRef();
-        m_refData = ref;
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE;

     }
 }
     }
 }

-