Add the unified style on OS X 10.4, and default to using it.

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

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 2502b392fb674055cd560cb4061ea3757a91bb11..7f0acfebe5349bf668a4bd69535537e51519fc6c 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -1,22 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/mac/carbon/pen.cpp

 // Purpose:     wxPen
 // Purpose:     wxPen

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"
-#include "wx/utils.h"

 #include "wx/pen.h"
 
 #include "wx/pen.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()


@@ -27,12 +27,10 @@ wxPenRefData::wxPenRefData()
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;

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

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

+: wxGDIRefData()

 {
     m_style = data.m_style;
     m_width = data.m_width;
 {
     m_style = data.m_style;
     m_width = data.m_width;


@@ -41,28 +39,20 @@ 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
 
 wxPen::wxPen()
 {
 }
 
 // Pens
 
 wxPen::wxPen()
 {

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

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

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

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


@@ -79,9 +69,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();

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

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


@@ -97,24 +84,21 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
     M_PENDATA->m_dash = 0 ;
 
     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)


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

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -131,7 +115,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();
 }
 


@@ -159,7 +143,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();
 }
 


@@ -169,7 +153,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -193,8 +177,6 @@ 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;

 }
 }

-
-