added wxSpinCtrlDouble (slightly modified patch 1835864)

[wxWidgets.git] / include / wx / cocoa / pen.h

diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h
index f13fcdfdacc4ca94a0d332f1d0c376db8c3b9cd5..223c2d43cce6f5e0acc88c10b36b88a776b70291 100644 (file)
--- a/include/wx/cocoa/pen.h
+++ b/include/wx/cocoa/pen.h
@@ -1,103 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.h
+// Name:        wx/cocoa/pen.h

 // Purpose:     wxPen class
 // Purpose:     wxPen class

-// Author:      AUTHOR
+// Author:      David Elliott

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     2003/08/02 (stubs from 22.03.2003)

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence

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

-#ifndef _WX_PEN_H_
-#define _WX_PEN_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "pen.h"
-#endif
+#ifndef __WX_COCOA_PEN_H__
+#define __WX_COCOA_PEN_H__

 
 #include "wx/gdiobj.h"
 
 #include "wx/gdiobj.h"

-#include "wx/colour.h"
-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxPen;
-
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxPen;
-public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
-
-    wxPenRefData& operator=(const wxPenRefData& data);
-
-protected:
-  int           m_width;
-  int           m_style;
-  int           m_join ;
-  int           m_cap ;
-  wxBitmap      m_stipple ;
-  int           m_nbDash ;
-  wxDash *      m_dash ;
-  wxColour      m_colour;
-/* TODO: implementation
-  WXHPEN        m_hPen;
-*/
-};
+#include "wx/gdicmn.h"

 
 

-#define M_PENDATA ((wxPenRefData *)m_refData)
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 
 

-// Pen
+// ========================================================================
+// wxPen
+// ========================================================================

 class WXDLLEXPORT wxPen: public wxGDIObject
 {
 class WXDLLEXPORT wxPen: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxPen)

 public:
 public:

-  wxPen();
-  wxPen(const wxColour& col, int width, int style);
-  wxPen(const wxBitmap& stipple, int width);
-  wxPen(const wxPen& pen)
-      : wxGDIObject()
-      { Ref(pen); }
-  ~wxPen();
-
-  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-  // Override in order to recreate the pen
-  void SetColour(const wxColour& col) ;
-  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-
-  void SetWidth(int width)  ;
-  void SetStyle(int style)  ;
-  void SetStipple(const wxBitmap& stipple)  ;
-  void SetDashes(int nb_dashes, const wxDash *dash)  ;
-  void SetJoin(int join)  ;
-  void SetCap(int cap)  ;
-
-  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
-  }
-
-  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
-
-// Implementation
+    wxPen();
+    wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) );
+#endif
+    wxPen(const wxBitmap& stipple, int width);
+    virtual ~wxPen();
+
+    // FIXME: operator==() is wrong
+    bool operator==(const wxPen& pen) const { return m_refData == pen.m_refData; }
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }
+
+    void SetColour(const wxColour& col) ;
+    void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+
+    void SetWidth(int width);
+    void SetStyle(wxPenStyle style);
+    void SetStipple(const wxBitmap& stipple);
+    void SetDashes(int nb_dashes, const wxDash *dash);
+    void SetJoin(wxPenJoin join);
+    void SetCap(wxPenCap cap);
+
+    wxColour& GetColour() const;
+    int GetWidth() const;
+    wxPenStyle GetStyle() const;
+    wxPenJoin GetJoin() const;
+    wxPenCap GetCap() const;
+    int GetDashes(wxDash **ptr) const;
+    wxBitmap *GetStipple() const;
+
+    WX_NSColor GetNSColor();
+    int GetCocoaLineDash(const CGFloat **pattern);

 
 

-  // Useful helper: create the brush resource
-  bool RealizeResource();
+protected:
+    wxGDIRefData *CreateGDIRefData() const;
+    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 

-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 };
 

-#endif
-    // _WX_PEN_H_
+#endif // __WX_COCOA_PEN_H__