missing commit

[wxWidgets.git] / src / gtk1 / pen.cpp

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 90a54a25eef97bbceed2e1d04dd101be1b34e048..64484abbee5d6120621f1d5d716a922a3bb61465 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/gtk1/pen.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,59 +7,80 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 #include "wx/pen.h"
 
 
 #include "wx/pen.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif
+

 #include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 
 #include <gdk/gdk.h>
 
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
 

-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData

 {
 public:
 {
 public:

+    wxPenRefData()
+    {
+        m_width = 1;
+        m_style = wxPENSTYLE_SOLID;
+        m_joinStyle = wxJOIN_ROUND;
+        m_capStyle = wxCAP_ROUND;
+        m_dash = NULL;
+        m_countDashes = 0;
+    }

 
 

-  wxPenRefData();
-  wxPenRefData( const wxPenRefData& data );
-
-  int        m_width;
-  int        m_style;
-  int        m_joinStyle;
-  int        m_capStyle;
-  wxColour   m_colour;
-  int        m_countDashes;
-  wxGTKDash *m_dash;
-};
+    wxPenRefData( const wxPenRefData& data )
+        : wxGDIRefData()
+    {
+        m_style = data.m_style;
+        m_width = data.m_width;
+        m_joinStyle = data.m_joinStyle;
+        m_capStyle = data.m_capStyle;
+        m_colour = data.m_colour;
+        m_countDashes = data.m_countDashes;
+        m_dash = data.m_dash;
+    }

 
 

-wxPenRefData::wxPenRefData()
-{
-    m_width = 1;
-    m_style = wxSOLID;
-    m_joinStyle = wxJOIN_ROUND;
-    m_capStyle = wxCAP_ROUND;
-    m_dash = (wxGTKDash*) NULL;
-    m_countDashes = 0;
-}
+    bool operator == (const wxPenRefData& data) const
+    {
+        if ( m_countDashes != data.m_countDashes )
+            return false;
+
+        if ( m_dash )
+        {
+            if ( !data.m_dash ||
+                 memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) )
+            {
+                return false;
+            }
+        }
+        else if ( data.m_dash )
+        {
+            return false;
+        }
+
+
+        return m_style == data.m_style &&
+               m_width == data.m_width &&
+               m_joinStyle == data.m_joinStyle &&
+               m_capStyle == data.m_capStyle &&
+               m_colour == data.m_colour;
+    }

 
 

-wxPenRefData::wxPenRefData( const wxPenRefData& data )
-{
-    m_style = data.m_style;
-    m_width = data.m_width;
-    m_joinStyle = data.m_joinStyle;
-    m_capStyle = data.m_capStyle;
-    m_colour = data.m_colour;
-    m_countDashes = data.m_countDashes;
-/*
-    if (data.m_dash)  TODO
-      m_dash = new 
-*/
-    m_dash = data.m_dash;
-}
+    int        m_width;
+    wxPenStyle m_style;
+    wxPenJoin  m_joinStyle;
+    wxPenCap   m_capStyle;
+    wxColour   m_colour;
+    int        m_countDashes;
+    wxGTKDash *m_dash;
+};

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


@@ -67,159 +88,157 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
 

-wxPen::wxPen()
-{
-    if (wxThePenList) wxThePenList->AddPen( this );
-}
-
-wxPen::wxPen( const wxColour &colour, int width, int style )
+wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style )

 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
     M_PENDATA->m_style = style;
     M_PENDATA->m_colour = colour;
 {
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
     M_PENDATA->m_style = style;
     M_PENDATA->m_colour = colour;

-
-    if (wxThePenList) wxThePenList->AddPen( this );

 }
 
 }
 

-wxPen::wxPen( const wxPen& pen )
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)

 {
 {

-    Ref( pen );
-    if (wxThePenList) wxThePenList->AddPen( this );
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = (wxPenStyle)style;
+    M_PENDATA->m_colour = colour;

 }
 }

+#endif

 
 

-wxPen::~wxPen()
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
 {

-    if (wxThePenList) wxThePenList->RemovePen( this );
+    return new wxPenRefData;

 }
 
 }
 

-wxPen& wxPen::operator = ( const wxPen& pen )
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    if (*this == pen) return (*this);
-    Ref( pen );
-    return *this;
+    return new wxPenRefData(*(wxPenRefData *)data);

 }
 
 }
 

-bool wxPen::operator == ( const wxPen& pen )
+bool wxPen::operator == ( const wxPen& pen ) const

 {
 {

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

 
 

-bool wxPen::operator != ( const wxPen& pen )
-{
-    return m_refData != pen.m_refData;
+    if (!m_refData || !pen.m_refData) return false;
+
+    return *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData;

 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_countDashes = number_of_dashes;
     M_PENDATA->m_countDashes = number_of_dashes;

-    M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
+    M_PENDATA->m_dash = (wxGTKDash *)dash;

 }
 
 }
 

-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 

-void wxPen::SetCap( int capStyle )
+void wxPen::SetCap( wxPenCap capStyle )

 {
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_capStyle = capStyle;
 }
 
     M_PENDATA->m_capStyle = capStyle;
 }
 

-void wxPen::SetJoin( int joinStyle )
+void wxPen::SetJoin( wxPenJoin joinStyle )

 {
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_joinStyle = joinStyle;
 }
 
     M_PENDATA->m_joinStyle = joinStyle;
 }
 

-void wxPen::SetStyle( int style )
+void wxPen::SetStyle( wxPenStyle style )

 {
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {

-    Unshare();
+    AllocExclusive();
+

     M_PENDATA->m_width = width;
 }
 
     M_PENDATA->m_width = width;
 }
 

-int wxPen::GetDashes( wxDash **ptr ) const 
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))

 {
 {

-     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); 
-     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+    wxFAIL_MSG( "stippled pens not supported" );

 }
 
 }
 

-int wxPen::GetDashCount() const 
-{ 
-    return (M_PENDATA->m_countDashes); 
+int wxPen::GetDashes( wxDash **ptr ) const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    *ptr = (wxDash*)M_PENDATA->m_dash;
+    return M_PENDATA->m_countDashes;

 }
 
 }
 

-wxDash* wxPen::GetDash() const 
-{ 
-    return (wxDash*)M_PENDATA->m_dash; 
+int wxPen::GetDashCount() const
+{
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
+
+    return (M_PENDATA->m_countDashes);
+}
+
+wxDash* wxPen::GetDash() const
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
+
+    return (wxDash*)M_PENDATA->m_dash;

 }
 
 }
 

-int wxPen::GetCap() const
+wxPenCap wxPen::GetCap() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_capStyle;
 }
 
 
     return M_PENDATA->m_capStyle;
 }
 

-int wxPen::GetJoin() const
+wxPenJoin wxPen::GetJoin() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_joinStyle;
 }
 
 
     return M_PENDATA->m_joinStyle;
 }
 

-int wxPen::GetStyle() const
+wxPenStyle wxPen::GetStyle() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {
 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );

 
     return M_PENDATA->m_width;
 }
 
 
     return M_PENDATA->m_width;
 }
 

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

 {
 {

-    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );

 
     return M_PENDATA->m_colour;
 }
 
 
     return M_PENDATA->m_colour;
 }
 

-bool wxPen::Ok() const
-{
-    return (m_refData != NULL);
-}
-
-void wxPen::Unshare()
+wxBitmap *wxPen::GetStipple() const

 {
 {

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

 }
 
 }