fix for the dialog controls font

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

diff --git a/src/mac/pen.cpp b/src/mac/pen.cpp
index 65da06087d46a85e349477da4755290109648f0a..356fedcd6caab03dfac8da41a6201bd68b84f1e3 100644 (file)
--- a/src/mac/pen.cpp
+++ b/src/mac/pen.cpp
@@ -17,7 +17,9 @@
 #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()
 {


@@ -26,10 +28,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 = (wxMACDash*)NULL;
-/* TODO: null data
-    m_hPen = 0;
-*/
+    m_dash = 0 ;

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


@@ -41,14 +40,10 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;

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

 }
 
 wxPenRefData::~wxPenRefData()
 {
 }
 
 wxPenRefData::~wxPenRefData()
 {

-    // TODO: delete data

 }
 
 // Pens
 }
 
 // Pens


@@ -76,7 +71,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 = (wxMACDash*)NULL;
+    M_PENDATA->m_dash = 0 ;

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -94,7 +89,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 = (wxMACDash*)NULL;
+    M_PENDATA->m_dash = 0 ;

 
     RealizeResource();
 
 
     RealizeResource();
 


@@ -168,7 +163,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 = (wxMACDash *)Dash;
+    M_PENDATA->m_dash = (wxDash *)Dash;

   
     RealizeResource();
 }
   
     RealizeResource();
 }


@@ -193,8 +188,8 @@ void wxPen::SetCap(int Cap)
 
 bool wxPen::RealizeResource()
 {
 
 bool wxPen::RealizeResource()
 {

-    // TODO: create actual pen
-    return FALSE;
+       // nothing to do here for mac
+    return TRUE;

 }
 
 
 }