X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfc5454127ac2195e10deebb216d82c674e757df..f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15:/src/motif/pen.cpp?ds=inline

diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp
index 076335cccf..3163d410e4 100644
--- a/src/motif/pen.cpp
+++ b/src/motif/pen.cpp
@@ -17,9 +17,7 @@
 #include "wx/utils.h"
 #include "wx/pen.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-#endif
 
 wxPenRefData::wxPenRefData()
 {
@@ -28,7 +26,7 @@ wxPenRefData::wxPenRefData()
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
-    m_dash = 0 ;
+    m_dash = (wxMOTIFDash*)NULL;
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
@@ -64,152 +62,125 @@ wxPen::~wxPen()
 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_dash = 0 ;
-
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+    
     RealizeResource();
-
-    if ( wxThePenList )
+    
+    if (wxThePenList)
         wxThePenList->AddPen(this);
 }
 
 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_dash = 0 ;
-
+    M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
+    
     RealizeResource();
-
-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
-}
-
-wxPen::wxPen(const wxString& 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_dash = 0 ;
-
-    RealizeResource();
-
+    
     if ( wxThePenList )
         wxThePenList->AddPen(this);
 }
 
 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
     {
-		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)
 {
     Unshare();
-
+    
     M_PENDATA->m_colour = col;
-  
+    
     RealizeResource();
 }
 
-void wxPen::SetColour(const wxString& col)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
-
-    M_PENDATA->m_colour = col;
-  
-    RealizeResource();
-}
-
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
-{
-    Unshare();
-
+    
     M_PENDATA->m_colour.Set(r, g, b);
-  
+    
     RealizeResource();
 }
 
 void wxPen::SetWidth(int Width)
 {
     Unshare();
-
+    
     M_PENDATA->m_width = Width;
-
+    
     RealizeResource();
 }
 
 void wxPen::SetStyle(int Style)
 {
     Unshare();
-
+    
     M_PENDATA->m_style = Style;
-
+    
     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
-
+    
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
-  
+    
     RealizeResource();
 }
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
     Unshare();
-
+    
     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();
-
+    
     M_PENDATA->m_join = Join;
-
+    
     RealizeResource();
 }
 
 void wxPen::SetCap(int Cap)
 {
     Unshare();
-
+    
     M_PENDATA->m_cap = Cap;
-
+    
     RealizeResource();
 }
 
@@ -219,4 +190,3 @@ bool wxPen::RealizeResource()
     return TRUE;
 }
 
-