Various compile fixes.

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

diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp
index bb5ab6212705c4fa4debd764253f8dccad86abcd..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__


@@ -26,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)


@@ -48,51 +48,41 @@ wxPenRefData::~wxPenRefData()
 
 wxPen::wxPen()
 {
 
 wxPen::wxPen()
 {

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

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

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

 }
 
 // Should implement Create
 wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;
 }
 
 // Should implement Create
 wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;

-    
+

     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_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 = 0 ;
-    
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+

     RealizeResource();
     RealizeResource();

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

 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     m_refData = new wxPenRefData;
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     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_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 = 0 ;
-    
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+

     RealizeResource();
     RealizeResource();

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

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


@@ -113,74 +103,74 @@ void wxPen::Unshare()
 void wxPen::SetColour(const wxColour& col)
 {
     Unshare();
 void wxPen::SetColour(const wxColour& col)
 {
     Unshare();

-    
+

     M_PENDATA->m_colour = col;
     M_PENDATA->m_colour = col;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();

-    
+

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

-    
+

     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();

-    
+

     M_PENDATA->m_width = Width;
     M_PENDATA->m_width = Width;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();

-    
+

     M_PENDATA->m_style = Style;
     M_PENDATA->m_style = Style;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();

-    
+

     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();

-    
+

     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_nbDash = nb_dashes;

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

     RealizeResource();
 }
 
 void wxPen::SetJoin(int Join)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetJoin(int Join)
 {
     Unshare();

-    
+

     M_PENDATA->m_join = Join;
     M_PENDATA->m_join = Join;

-    
+

     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();
     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();

-    
+

     M_PENDATA->m_cap = Cap;
     M_PENDATA->m_cap = Cap;

-    
+

     RealizeResource();
 }
 
     RealizeResource();
 }