Corrected include/wx/palette.h; added wxGenericTreeCtrl::SetFont

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

diff --git a/src/stubs/pen.cpp b/src/stubs/pen.cpp
index d7b2ce264cb548485b611004010fb563ccf718c9..ff76f284a4b16a9f976fa835ce94b02a84884dd5 100644 (file)
--- a/src/stubs/pen.cpp
+++ b/src/stubs/pen.cpp
@@ -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 = (wxXSTUBXDash*)NULL;

 /* TODO: null data
     m_hPen = 0;
 */
 /* TODO: null data
     m_hPen = 0;
 */


@@ -78,7 +76,7 @@ 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 = (wxXSTUBXDash*)NULL;

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -96,25 +94,7 @@ 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 ;
-
-    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 ;
+    M_PENDATA->m_dash = (wxXSTUBXDash*)NULL;

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -146,16 +126,7 @@ void wxPen::SetColour(const wxColour& col)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetColour(const wxString& col)
-{
-    Unshare();
-
-    M_PENDATA->m_colour = col;
-  
-    RealizeResource();
-}
-
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -197,7 +168,7 @@ 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 = (wxXSTUBXDash*)Dash;

   
     RealizeResource();
 }
   
     RealizeResource();
 }