Add support for specifying child process cwd and env to wxExecute().

[wxWidgets.git] / src / cocoa / brush.mm

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index 6a1bce5e7f87fc286e91944d2cfc195eece29a83..a631c1302e6d948e7d555513a0f51d257937555e 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -6,7 +6,7 @@
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -23,7 +23,8 @@
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 public:
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 public:

-    wxBrushRefData(const wxColour& colour = wxNullColour, int style = wxSOLID);
+    wxBrushRefData(const wxColour& colour = wxNullColour,
+                   wxBrushStyle style = wxBRUSHSTYLE_SOLID);

     wxBrushRefData(const wxBitmap& stipple);
     wxBrushRefData(const wxBrushRefData& data);
     virtual ~wxBrushRefData();
     wxBrushRefData(const wxBitmap& stipple);
     wxBrushRefData(const wxBrushRefData& data);
     virtual ~wxBrushRefData();


@@ -35,18 +36,18 @@ public:
 
     // accessors
     const wxColour& GetColour() const { return m_colour; }
 
     // accessors
     const wxColour& GetColour() const { return m_colour; }

-    int GetStyle() const { return m_style; }
+    wxBrushStyle GetStyle() const { return m_style; }

     wxBitmap *GetStipple() { return &m_stipple; }
 
     void SetColour(const wxColour& colour) { Free(); m_colour = colour; }
     wxBitmap *GetStipple() { return &m_stipple; }
 
     void SetColour(const wxColour& colour) { Free(); m_colour = colour; }

-    void SetStyle(int style) { Free(); m_style = style; }
+    void SetStyle(wxBrushStyle style) { Free(); m_style = style; }

     void SetStipple(const wxBitmap& stipple) { Free(); DoSetStipple(stipple); }
 
 private:
     void DoSetStipple(const wxBitmap& stipple);
 
     WX_NSColor    m_cocoaNSColor;
     void SetStipple(const wxBitmap& stipple) { Free(); DoSetStipple(stipple); }
 
 private:
     void DoSetStipple(const wxBitmap& stipple);
 
     WX_NSColor    m_cocoaNSColor;

-    int           m_style;
+    wxBrushStyle  m_style;

     wxBitmap      m_stipple;
     wxColour      m_colour;
 
     wxBitmap      m_stipple;
     wxColour      m_colour;
 


@@ -58,7 +59,7 @@ private:
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 

-wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
+wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style)

 {
     m_cocoaNSColor = NULL;
     m_style = style;
 {
     m_cocoaNSColor = NULL;
     m_style = style;


@@ -102,7 +103,8 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
     m_stipple = stipple;
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
     m_stipple = stipple;

-    m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
+    m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE
+                                : wxBRUSHSTYLE_STIPPLE;

 }
 
 WX_NSColor wxBrushRefData::GetNSColor()
 }
 
 WX_NSColor wxBrushRefData::GetNSColor()


@@ -149,11 +151,16 @@ wxBrush::~wxBrush()
 {
 }
 
 {
 }
 

-wxBrush::wxBrush(const wxColour& col, int style)
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)

 {
     m_refData = new wxBrushRefData(col, style);
 }
 
 {
     m_refData = new wxBrushRefData(col, style);
 }
 

+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
+}
+

 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData(stipple);
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData(stipple);


@@ -181,7 +188,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
     M_BRUSHDATA->SetColour(wxColour(r,g,b));
 }
 
     M_BRUSHDATA->SetColour(wxColour(r,g,b));
 }
 

-void wxBrush::SetStyle(int style)
+void wxBrush::SetStyle(wxBrushStyle style)

 {
     AllocExclusive();
     M_BRUSHDATA->SetStyle(style);
 {
     AllocExclusive();
     M_BRUSHDATA->SetStyle(style);


@@ -195,19 +202,19 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
 
 wxColour wxBrush::GetColour() const
 {
 
 wxColour wxBrush::GetColour() const
 {

-    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );

     return M_BRUSHDATA->GetColour();
 }
 
     return M_BRUSHDATA->GetColour();
 }
 

-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const

 {
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );

     return M_BRUSHDATA->GetStyle();
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
     return M_BRUSHDATA->GetStyle();
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );

     return M_BRUSHDATA->GetStipple();
 }
 
     return M_BRUSHDATA->GetStipple();
 }