wxX11: link errors down to 1.

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

diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp
index 6bbfcd7a0cb67ebf5012482d6dc8125fb0b91d6e..4bc2b0bd899e74132e49a8881d6df5b6bda49470 100644 (file)
--- a/src/motif/pen.cpp
+++ b/src/motif/pen.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,9 +17,7 @@
 #include "wx/utils.h"
 #include "wx/pen.h"
 
 #include "wx/utils.h"
 #include "wx/pen.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)

-#endif

 
 wxPenRefData::wxPenRefData()
 {
 
 wxPenRefData::wxPenRefData()
 {


@@ -28,7 +26,7 @@ wxPenRefData::wxPenRefData()
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;

-    m_dash = 0 ;
+    m_dash = (wxMOTIFDash*)NULL;

 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)


@@ -50,14 +48,10 @@ wxPenRefData::~wxPenRefData()
 
 wxPen::wxPen()
 {
 
 wxPen::wxPen()
 {

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

 }
 
 wxPen::~wxPen()
 {
 }
 
 wxPen::~wxPen()
 {

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

 }
 
 // Should implement Create
 }
 
 // Should implement Create


@@ -71,12 +65,9 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     M_PENDATA->m_join = wxJOIN_ROUND ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_join = wxJOIN_ROUND ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;

-    M_PENDATA->m_dash = 0 ;
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;

 
     RealizeResource();
 
     RealizeResource();

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

 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)


@@ -89,27 +80,24 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_join = wxJOIN_ROUND ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
     M_PENDATA->m_join = wxJOIN_ROUND ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;

-    M_PENDATA->m_dash = 0 ;
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;

 
     RealizeResource();
 
     RealizeResource();

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

 }
 
 void wxPen::Unshare()
 {
 }
 
 void wxPen::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)

     {
     {

-               m_refData = new wxPenRefData();
-       }
+        m_refData = new wxPenRefData();
+    }

     else
     {
     else
     {

-               wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 void wxPen::SetColour(const wxColour& col)
 }
 
 void wxPen::SetColour(const wxColour& col)


@@ -117,7 +105,7 @@ void wxPen::SetColour(const wxColour& col)
     Unshare();
 
     M_PENDATA->m_colour = col;
     Unshare();
 
     M_PENDATA->m_colour = col;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -126,7 +114,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
     Unshare();
 
     M_PENDATA->m_colour.Set(r, g, b);
     Unshare();
 
     M_PENDATA->m_colour.Set(r, g, b);

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -154,7 +142,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -163,8 +151,8 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
     Unshare();
 
     M_PENDATA->m_nbDash = nb_dashes;
     Unshare();
 
     M_PENDATA->m_nbDash = nb_dashes;

-    M_PENDATA->m_dash = (wxDash *)Dash;
-  
+    M_PENDATA->m_dash = (wxMOTIFDash *)Dash;
+

     RealizeResource();
 }
 
     RealizeResource();
 }