GCC 4.0 (Apple 4059) is a little bit pickier than 3.3.

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 5c0b38ec68ec937583d7a9dfbc28b099602e7347..fe4c3460ef02eb201a439ac14355c4c97e1dbdaf 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,7 +15,7 @@
 #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;
 
 
 class WXDLLEXPORT wxPen;
 


@@ -24,71 +24,93 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPen;
 public:
     wxPenRefData();
     friend class WXDLLEXPORT wxPen;
 public:
     wxPenRefData();

-    wxPenRefData(const wxPenRefData& data);
+    wxPenRefData(const wxPenRefData& rData);

     ~wxPenRefData();
 
 protected:
     ~wxPenRefData();
 
 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;
+    int                             m_nWidth;
+    int                             m_nStyle;
+    int                             m_nJoin;
+    int                             m_nCap;
+    wxBitmap                        m_vStipple;
+    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)
+    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();
-  bool FreeResource(bool force = FALSE);
-  WXHANDLE GetResourceHandle() ;
-  bool IsFree() const;
-  void Unshare();
-};
+    wxPen();
+    wxPen( const wxColour& rColour
+          ,int             nWidth = 1
+          ,int             nStyle = wxSOLID
+         );
+    wxPen( const wxBitmap& rStipple
+          ,int             nWidth
+         );
+    inline wxPen(const wxPen& rPen) { Ref(rPen); }
+    ~wxPen();
+
+    inline wxPen& operator =  (const wxPen& rPen)
+        { if (*this == rPen) return (*this); Ref(rPen); return *this; }
+    inline bool   operator == (const wxPen& rPen) const
+        { return m_refData == rPen.m_refData; }
+    inline bool   operator != (const wxPen& rPen) const
+        { return m_refData != rPen.m_refData; }
+
+    virtual bool Ok(void) const { return (m_refData != NULL); }
+
+    //
+    // 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 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);
+    WXHANDLE GetResourceHandle(void);
+    bool     IsFree(void) const;
+    void     Unshare(void);
+
+private:
+    LINEBUNDLE                     m_vLineBundle;
+    AREABUNDLE                     m_vAreaBundle;
+}; // end of CLASS wxPen
+
+extern int wx2os2PenStyle(int nWxStyle);

 
 #endif
     // _WX_PEN_H_
 
 #endif
     // _WX_PEN_H_