Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index 4bc2b0bd899e74132e49a8881d6df5b6bda49470..f6dccc9a9ea68cb614d0729e64a473db4330b48d 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/motif/pen.cpp
+// Name:        src/x11/pen.cpp

 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:


@@ -9,174 +9,215 @@
 // 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/setup.h"

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

+#include "wx/colour.h"
+#include "wx/bitmap.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+//-----------------------------------------------------------------------------
+// wxPen
+//-----------------------------------------------------------------------------

 
 

-wxPenRefData::wxPenRefData()
+class wxPenRefData: public wxObjectRefData

 {
 {

-    m_style = wxSOLID;
-    m_width = 1;
-    m_join = wxJOIN_ROUND ;
-    m_cap = wxCAP_ROUND ;
-    m_nbDash = 0 ;
-    m_dash = (wxMOTIFDash*)NULL;
-}
+public:
+    wxPenRefData()
+    {
+        m_width = 1;
+        m_style = wxSOLID;
+        m_joinStyle = wxJOIN_ROUND;
+        m_capStyle = wxCAP_ROUND;
+        m_dash = (wxX11Dash*) NULL;
+        m_countDashes = 0;
+    }
+
+    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;
+        m_stipple = data.m_stipple;
+    }
+
+    bool operator == (const wxPenRefData& data) const
+    {
+        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);
+    }
+
+    int        m_width;
+    int        m_style;
+    int        m_joinStyle;
+    int        m_capStyle;
+    wxColour   m_colour;
+    int        m_countDashes;
+    wxBitmap   m_stipple;
+    wxX11Dash *m_dash;
+};
+
+//-----------------------------------------------------------------------------

 
 

-wxPenRefData::wxPenRefData(const wxPenRefData& data)
+#define M_PENDATA ((wxPenRefData *)m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
+
+wxPen::wxPen( const wxColour &colour, int width, int style )

 {
 {

-    m_style = data.m_style;
-    m_width = data.m_width;
-    m_join = data.m_join;
-    m_cap = data.m_cap;
-    m_nbDash = data.m_nbDash;
-    m_dash = data.m_dash;
-    m_colour = data.m_colour;
+    m_refData = new wxPenRefData();
+    M_PENDATA->m_width = width;
+    M_PENDATA->m_style = style;
+    M_PENDATA->m_colour = colour;

 }
 
 }
 

-wxPenRefData::~wxPenRefData()
+wxPen::~wxPen()

 {
 {

+    // m_refData unrefed in ~wxObject

 }
 
 }
 

-// Pens
-
-wxPen::wxPen()
+wxObjectRefData *wxPen::CreateRefData() const

 {
 {

+    return new wxPenRefData;

 }
 
 }
 

-wxPen::~wxPen()
+wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const

 {
 {

+    return new wxPenRefData(*(wxPenRefData *)data);

 }
 
 }
 

-// Should implement Create
-wxPen::wxPen(const wxColour& col, int Width, int Style)
+bool wxPen::operator == ( const wxPen& pen ) const

 {
 {

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

 
 

-    M_PENDATA->m_colour = col;
-    M_PENDATA->m_width = Width;
-    M_PENDATA->m_style = Style;
-    M_PENDATA->m_join = wxJOIN_ROUND ;
-    M_PENDATA->m_cap = wxCAP_ROUND ;
-    M_PENDATA->m_nbDash = 0 ;
-    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+    if (!m_refData || !pen.m_refData) return false;

 
 

-    RealizeResource();
+    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );

 }
 
 }
 

-wxPen::wxPen(const wxBitmap& stipple, int Width)
+void wxPen::SetColour( const wxColour &colour )

 {
 {

-    m_refData = new wxPenRefData;
-
-    M_PENDATA->m_stipple = stipple;
-    M_PENDATA->m_width = Width;
-    M_PENDATA->m_style = wxSTIPPLE;
-    M_PENDATA->m_join = wxJOIN_ROUND ;
-    M_PENDATA->m_cap = wxCAP_ROUND ;
-    M_PENDATA->m_nbDash = 0 ;
-    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+    AllocExclusive();

 
 

-    RealizeResource();
+    M_PENDATA->m_colour = colour;

 }
 
 }
 

-void wxPen::Unshare()
+void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )

 {
 {

-    // Don't change shared data
-    if (!m_refData)
-    {
-        m_refData = new wxPenRefData();
-    }
-    else
-    {
-        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
+    AllocExclusive();
+
+    M_PENDATA->m_countDashes = number_of_dashes;
+    M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO

 }
 
 }
 

-void wxPen::SetColour(const wxColour& col)
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )

 {
 {

-    Unshare();
+    AllocExclusive();

 
 

-    M_PENDATA->m_colour = col;
-
-    RealizeResource();
+    M_PENDATA->m_colour.Set( red, green, blue );

 }
 
 }
 

-void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
+void wxPen::SetCap( int capStyle )

 {
 {

-    Unshare();
-
-    M_PENDATA->m_colour.Set(r, g, b);
+    AllocExclusive();

 
 

-    RealizeResource();
+    M_PENDATA->m_capStyle = capStyle;

 }
 
 }
 

-void wxPen::SetWidth(int Width)
+void wxPen::SetJoin( int joinStyle )

 {
 {

-    Unshare();
-
-    M_PENDATA->m_width = Width;
+    AllocExclusive();

 
 

-    RealizeResource();
+    M_PENDATA->m_joinStyle = joinStyle;

 }
 
 }
 

-void wxPen::SetStyle(int Style)
+void wxPen::SetStipple( wxBitmap *stipple )

 {
 {

-    Unshare();
+    AllocExclusive();

 
 

-    M_PENDATA->m_style = Style;
-
-    RealizeResource();
+    M_PENDATA->m_stipple = *stipple;;

 }
 
 }
 

-void wxPen::SetStipple(const wxBitmap& Stipple)
+void wxPen::SetStyle( int style )

 {
 {

-    Unshare();
+    AllocExclusive();

 
 

-    M_PENDATA->m_stipple = Stipple;
-    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_style = style;
+}

 
 

-    RealizeResource();
+void wxPen::SetWidth( int width )
+{
+    AllocExclusive();
+
+    M_PENDATA->m_width = width;

 }
 
 }
 

-void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
+int wxPen::GetDashes( wxDash **ptr ) const

 {
 {

-    Unshare();
+     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+     return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+}

 
 

-    M_PENDATA->m_nbDash = nb_dashes;
-    M_PENDATA->m_dash = (wxMOTIFDash *)Dash;
+int wxPen::GetDashCount() const
+{
+    return (M_PENDATA->m_countDashes);
+}

 
 

-    RealizeResource();
+wxDash* wxPen::GetDash() const
+{
+    return (wxDash*)M_PENDATA->m_dash;

 }
 
 }
 

-void wxPen::SetJoin(int Join)
+int wxPen::GetCap() const

 {
 {

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

 
 

-    M_PENDATA->m_join = Join;
+    return M_PENDATA->m_capStyle;
+}
+
+int wxPen::GetJoin() const
+{
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );

 
 

-    RealizeResource();
+    return M_PENDATA->m_joinStyle;

 }
 
 }
 

-void wxPen::SetCap(int Cap)
+int wxPen::GetStyle() const

 {
 {

-    Unshare();
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_style;
+}

 
 

-    M_PENDATA->m_cap = Cap;
+int wxPen::GetWidth() const
+{
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );

 
 

-    RealizeResource();
+    return M_PENDATA->m_width;

 }
 
 }
 

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

 {
 {

-    // Nothing more to do
-    return TRUE;
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_colour;

 }
 
 }
 

+wxBitmap *wxPen::GetStipple() const
+{
+    wxCHECK_MSG( Ok(), &wxNullBitmap, wxT("invalid pen") );
+
+    return &M_PENDATA->m_stipple;
+}