Reapply wxWeakRef patch again

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 5c0b38ec68ec937583d7a9dfbc28b099602e7347..f05f6382f6cfbd17dfde32d069e9d45dbe7d056a 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPen class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxPen class
 // Author:      David Webster
 // Modified by:


@@ -15,80 +15,87 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-typedef    long wxDash ;
+typedef long wxPMDash;

 
 

-class WXDLLEXPORT wxPen;
+// ----------------------------------------------------------------------------
+// Pen
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPen : public wxPenBase

 {
 {

-    friend class WXDLLEXPORT wxPen;

 public:
 public:

-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
+  wxPen() { }
+    wxPen( const wxColour& rColour
+          ,int             nWidth = 1
+          ,wxPenStyle      nStyle = wxPENSTYLE_SOLID
+         );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
+#endif
+
+    wxPen( const wxBitmap& rStipple
+          ,int             nWidth
+         );
+    virtual ~wxPen() { }
+
+    bool   operator == (const wxPen& rPen) const;
+    inline bool   operator != (const wxPen& rPen) const
+        { return !(*this == rPen); }
+
+    //
+    // Override in order to recreate the pen
+    //
+    void SetColour(const wxColour& rColour);
+    void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
+
+    void SetWidth(int nWidth);
+    void SetStyle(wxPenStyle nStyle);
+    void SetStipple(const wxBitmap& rStipple);
+    void SetDashes( int           nNbDashes
+                   ,const wxDash* pDash
+                  );
+    void SetJoin(wxPenJoin nJoin);
+    void SetCap(wxPenCap nCap);
+    void SetPS(HPS hPS);
+
+    wxColour GetColour(void) const;
+    int       GetWidth(void) const;
+    wxPenStyle GetStyle(void) const;
+    wxPenJoin  GetJoin(void) const;
+    wxPenCap   GetCap(void) const;
+    int       GetPS(void) const;
+    int       GetDashes(wxDash **ptr) const;
+    wxDash*   GetDash() const;
+    int       GetDashCount() const;
+    wxBitmap* GetStipple(void) const;
+
+    //
+    // Implementation
+    //
+
+    //
+    // Useful helper: create the brush resource
+    //
+    bool     RealizeResource(void);
+    bool     FreeResource(bool bForce = false);
+    virtual WXHANDLE GetResourceHandle(void) const;
+    bool     IsFree(void) const;
+
+private:
+    LINEBUNDLE                     m_vLineBundle;
+    AREABUNDLE                     m_vAreaBundle;

 
 protected:
 
 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;
-  WXHPEN        m_hPen;
-};
-
-#define M_PENDATA ((wxPenRefData *)m_refData)
+    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) { 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
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-  bool FreeResource(bool force = FALSE);
-  WXHANDLE GetResourceHandle() ;
-  bool IsFree() const;
-  void Unshare();
-};
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();
+
+    DECLARE_DYNAMIC_CLASS(wxPen)
+}; // end of CLASS wxPen
+
+extern int wx2os2PenStyle(wxPenStyle nWxStyle);

 
 #endif
     // _WX_PEN_H_
 
 #endif
     // _WX_PEN_H_