Better fix

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 938908b56be96ad67d784c31278619e7fd13ef5a..30aed3bbe469497301109a6e46b45d15a9467bff 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -1,101 +1,144 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/10/99

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 

-#ifdef __GNUG__
-#pragma interface "pen.h"
-#endif
-

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

-#include "wx/colour.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-typedef    long wxDash ;
+typedef long wxPMDash;

 
 

-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;

 public:
     wxPenRefData();
 public:
     wxPenRefData();

-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
+    wxPenRefData(const wxPenRefData& rData);
+    virtual ~wxPenRefData();
+
+    bool operator==(const wxPenRefData& data) const
+    {
+        // we intentionally don't compare m_hPen fields here
+        return m_nStyle == data.m_nStyle &&
+               m_nWidth == data.m_nWidth &&
+               m_nJoin == data.m_nJoin &&
+               m_nCap == data.m_nCap &&
+               m_vColour == data.m_vColour &&
+               (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
+               (m_nStyle != wxUSER_DASH ||
+                (m_dash == data.m_dash &&
+                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }

 
 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;
-/* TODO: implementation
-  WXHPEN        m_hPen;
-*/
+    int                             m_nWidth;
+    int                             m_nStyle;
+    int                             m_nJoin;
+    int                             m_nCap;
+    wxBitmap                        m_vStipple;
+    int                             m_nbDash;
+    wxDash *                        m_dash;
+    wxColour                        m_vColour;
+    WXHPEN                          m_hPen;// in OS/2 GPI this will be the PS the pen is associated with

 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 // Pen
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
 
 // Pen

-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);
-  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();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
-};
+    wxPen();
+    wxPen( const wxColour& rColour
+          ,int             nWidth = 1
+          ,int             nStyle = wxSOLID
+         );
+    wxPen( const wxBitmap& rStipple
+          ,int             nWidth
+         );
+    virtual ~wxPen();
+
+    inline bool   operator == (const wxPen& rPen) const
+    {
+        const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;
+
+        // an invalid pen is only equal to another invalid pen
+        return m_refData ? penData && *M_PENDATA == *penData : !penData;
+    }
+
+    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(int nStyle);
+    void SetStipple(const wxBitmap& rStipple);
+    void SetDashes( int           nNbDashes
+                   ,const wxDash* pDash
+                  );
+    void SetJoin(int nJoin);
+    void SetCap(int nCap);
+    void SetPS(HPS hPS);
+
+    inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_vColour : wxNullColour); };
+    inline int       GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_nWidth : 0); };
+    inline int       GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_nStyle : 0); };
+    inline int       GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); };
+    inline int       GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); };
+    inline int       GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 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 wxDash*   GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
+    inline int       GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
+
+    inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); };
+
+    //
+    // 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:
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();
+
+    DECLARE_DYNAMIC_CLASS(wxPen)
+}; // end of CLASS wxPen
+
+extern int wx2os2PenStyle(int nWxStyle);

 
 #endif
     // _WX_PEN_H_
 
 #endif
     // _WX_PEN_H_