Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h
index 35247eb99c2ef628dc31c9bd4368ac14180d24d6..7e31ff6d1da0c3ce8d9a2f724ce2354bb70299e1 100644 (file)
--- a/include/wx/x11/pen.h
+++ b/include/wx/x11/pen.h
@@ -1,102 +1,79 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.h
+// Name:        wx/x11/pen.h
 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
-#pragma interface "pen.h"
-#endif
-
+#include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
 
-typedef char wxMOTIFDash;
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_FWD_CORE wxPen;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
-class WXDLLEXPORT wxPen;
+typedef char wxX11Dash;
 
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
+//-----------------------------------------------------------------------------
+// wxPen
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxPen: public wxPenBase
 {
-    friend class WXDLLEXPORT wxPen;
 public:
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
-    
-protected:
-    int           m_width;
-    int           m_style;
-    int           m_join ;
-    int           m_cap ;
-    wxBitmap      m_stipple ;
-    int           m_nbDash ;
-    wxMOTIFDash  *m_dash ;
-    wxColour      m_colour;
-};
+    wxPen() { }
+
+    wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
 
-#define M_PENDATA ((wxPenRefData *)m_refData)
+    wxPen( const wxBitmap &stipple, int width );
+    virtual ~wxPen();
+
+    bool operator == ( const wxPen& pen ) const;
+    bool operator != (const wxPen& pen) const { return !(*this == pen); }
+
+    void SetColour( const wxColour &colour );
+    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
+    void SetCap( wxPenCap capStyle );
+    void SetJoin( wxPenJoin joinStyle );
+    void SetStyle( wxPenStyle style );
+    void SetWidth( int width );
+    void SetDashes( int number_of_dashes, const wxDash *dash );
+    void SetStipple( const wxBitmap& stipple );
+
+    wxColour GetColour() const;
+    wxPenCap GetCap() const;
+    wxPenJoin GetJoin() const;
+    wxPenStyle GetStyle() const;
+    int GetWidth() const;
+    int GetDashes(wxDash **ptr) const;
+    int GetDashCount() const;
+    wxDash* GetDash() const;
+    wxBitmap* GetStipple() const;
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxPenStyle)style); }
+#endif
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-// Pen
-class WXDLLEXPORT wxPen: public wxGDIObject
-{
     DECLARE_DYNAMIC_CLASS(wxPen)
-public:
-    wxPen();
-    wxPen(const wxColour& col, int width, int style);
-    wxPen(const wxBitmap& stipple, int width);
-    inline wxPen(const wxPen& pen) { Ref(pen); }
-    ~wxPen();
-    
-    inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-    inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
-    inline bool operator != (const wxPen& pen) const { 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 ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
-        return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
-    }
-    inline int GetDashCount() const { return (M_PENDATA->m_nbDash); }
-    inline wxDash* GetDash() const { return (wxDash*)M_PENDATA->m_dash; }
-    
-    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
-    
-    // Implementation
-    
-    // Useful helper: create the brush resource
-    bool RealizeResource();
-    
-    // When setting properties, we must make sure we're not changing
-    // another object
-    void Unshare();
 };
 
-#endif
-// _WX_PEN_H_
+#endif // _WX_PEN_H_