compilation fix after wxCmdLineEntryDesc changes

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index a653d39db0a8975e033754576290dd7852320c4c..95c50c06ab00924dfbfc0cf9699d335ebeeffdb1 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -1,100 +1,73 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Purpose:     wxPen class
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// 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/bitmap.h"
-
-typedef WXDWORD wxMSWDash;
+#include "wx/gdicmn.h"

 
 

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

 
 

-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
+class WXDLLEXPORT wxPen : public wxGDIObject

 {
 {

-    friend class WXDLLEXPORT wxPen;

 public:
 public:

-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
+    wxPen() { }
+    wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
+    wxPen(const wxBitmap& stipple, int width);
+    virtual ~wxPen() { }
+
+    bool operator==(const wxPen& pen) const;
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() 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);
+
+    wxColour& GetColour() const;
+    int GetWidth() const;
+    int GetStyle() const;
+    int GetJoin() const;
+    int GetCap() const;
+    int GetDashes(wxDash** ptr) const;
+    wxDash* GetDash() const;
+    int GetDashCount() const;
+    wxBitmap* GetStipple() const;
+
+    // internal: wxGDIObject methods
+    virtual bool RealizeResource();
+    virtual bool FreeResource(bool force = false);
+    virtual WXHANDLE GetResourceHandle() const;
+    virtual bool IsFree() const;

 
 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;
-};
+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;

 
 

-#define M_PENDATA ((wxPenRefData *)m_refData)
-
-// 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();
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();

 
 

-  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 wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
-
-  // Internal
-  bool RealizeResource();
-  bool FreeResource(bool force = FALSE);
-  WXHANDLE GetResourceHandle() const;
-  bool IsFree() const;
-  void Unshare();
+    DECLARE_DYNAMIC_CLASS(wxPen)

 };
 
 };
 

-int wx2msPenStyle(int wx_style);
-
-#endif
-    // _WX_PEN_H_
+#endif // _WX_PEN_H_