Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp
index 1c08f89f07deba06ef9ef626b06f804c2b9f9148..667c6df8e4a55e05687633c6d9684fbfd7b3f4c3 100644 (file)
--- a/src/gtk/brush.cpp
+++ b/src/gtk/brush.cpp
@@ -7,48 +7,47 @@
 // 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"
 
 #include "wx/brush.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/brush.h"

-#include "wx/colour.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 wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID)

     {
     {

-        m_style = 0;
+        m_style = style;
+        m_colour = colour;

     }
     }

-    
+

     wxBrushRefData( const wxBrushRefData& data )
     wxBrushRefData( const wxBrushRefData& data )

-        : wxObjectRefData()
+        : wxGDIRefData()

     {
         m_style = data.m_style;
         m_stipple = data.m_stipple;
         m_colour = data.m_colour;
     }
     {
         m_style = data.m_style;
         m_stipple = data.m_stipple;
         m_colour = data.m_colour;
     }

-    
+

     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&
     bool operator == (const wxBrushRefData& data) const
     {
         return (m_style == data.m_style &&

-                m_stipple == data.m_stipple &&
+                m_stipple.IsSameAs(data.m_stipple) &&

                 m_colour == data.m_colour);
     }
                 m_colour == data.m_colour);
     }

-    
-    int       m_style;
-    wxColour  m_colour;
-    wxBitmap  m_stipple;
+
+    wxBrushStyle m_style;
+    wxColour     m_colour;
+    wxBitmap     m_stipple;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -57,24 +56,26 @@ public:
 
 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(colour, style);

 }
 
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    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_colour = *wxBLACK;
+    wxBrushStyle style = wxBRUSHSTYLE_STIPPLE;
+    if (stippleBitmap.GetMask())
+        style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;

 
 

+    m_refData = new wxBrushRefData(*wxBLACK, style);

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

-
-    if (M_BRUSHDATA->m_stipple.GetMask())
-        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
-    else
-        M_BRUSHDATA->m_style = wxSTIPPLE;

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


@@ -82,54 +83,42 @@ wxBrush::~wxBrush()
     // m_refData unrefed in ~wxObject
 }
 
     // m_refData unrefed in ~wxObject
 }
 

-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);
 }
 

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

 {
 {

-    if (m_refData == brush.m_refData) return TRUE;
-    
-    if (!m_refData || !brush.m_refData) return FALSE;
-    
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+

     return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
 }
 
     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;
 }
 
     return &M_BRUSHDATA->m_stipple;
 }


@@ -137,36 +126,35 @@ wxBitmap *wxBrush::GetStipple() const
 void wxBrush::SetColour( const wxColour& col )
 {
     AllocExclusive();
 void wxBrush::SetColour( const wxColour& col )
 {
     AllocExclusive();

-    
+

     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
     AllocExclusive();
     M_BRUSHDATA->m_colour = col;
 }
 
 void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
 {
     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 )

 {
     AllocExclusive();
 {
     AllocExclusive();

-    
+

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

-    
+

     M_BRUSHDATA->m_stipple = stipple;
     if (M_BRUSHDATA->m_stipple.GetMask())
     {
     M_BRUSHDATA->m_stipple = stipple;
     if (M_BRUSHDATA->m_stipple.GetMask())
     {

-        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;

     }
     else
     {
     }
     else
     {

-        M_BRUSHDATA->m_style = wxSTIPPLE;
+        M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE;

     }
 }
     }
 }

-