Forgot to update this enhancement from last weekend
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -55,6 +55,7 @@ public:
|
||||
|
||||
wxDC* m_pSelectedInto;
|
||||
HPS m_hPresentationSpace;
|
||||
LONG m_lId;
|
||||
|
||||
// optional mask for transparent drawing
|
||||
wxMask* m_pBitmapMask;
|
||||
@@ -210,6 +211,10 @@ public:
|
||||
// An OS/2 version that probably doesn't do anything like the msw version
|
||||
wxBitmap GetBitmapForDC(wxDC& rDc) const;
|
||||
|
||||
inline LONG GetId() const
|
||||
{ return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
|
||||
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
@@ -24,73 +24,88 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
|
||||
friend class WXDLLEXPORT wxPen;
|
||||
public:
|
||||
wxPenRefData();
|
||||
wxPenRefData(const wxPenRefData& data);
|
||||
wxPenRefData(const wxPenRefData& rData);
|
||||
~wxPenRefData();
|
||||
|
||||
protected:
|
||||
int m_width;
|
||||
int m_style;
|
||||
int m_join ;
|
||||
int m_cap ;
|
||||
wxBitmap m_stipple ;
|
||||
int m_nbDash ;
|
||||
wxPMDash * 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
|
||||
class WXDLLEXPORT wxPen: public wxGDIObject
|
||||
class WXDLLEXPORT wxPen : public wxGDIObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxPen)
|
||||
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();
|
||||
wxPen();
|
||||
wxPen( const wxColour& rColour
|
||||
,int nWidth
|
||||
,int nStyle
|
||||
);
|
||||
wxPen( const wxBitmap& rStipple
|
||||
,int nWidth
|
||||
);
|
||||
inline wxPen(const wxPen& rPen) { Ref(rPen); }
|
||||
~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; }
|
||||
inline wxPen& operator = (const wxPen& rPen) { if (*this == rPen) return (*this); Ref(rPen); return *this; }
|
||||
inline bool operator == (const wxPen& rPen) { return m_refData == rPen.m_refData; }
|
||||
inline bool operator != (const wxPen& rPen) { return m_refData != rPen.m_refData; }
|
||||
|
||||
virtual bool Ok() const { return (m_refData != NULL) ; }
|
||||
virtual bool Ok(void) 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) ;
|
||||
//
|
||||
// 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 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) ;
|
||||
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() 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 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() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
|
||||
inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); };
|
||||
|
||||
// Implementation
|
||||
//
|
||||
// Implementation
|
||||
//
|
||||
|
||||
// Useful helper: create the brush resource
|
||||
bool RealizeResource();
|
||||
bool FreeResource(bool force = FALSE);
|
||||
WXHANDLE GetResourceHandle() ;
|
||||
bool IsFree() const;
|
||||
void Unshare();
|
||||
};
|
||||
//
|
||||
// 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
|
||||
|
||||
#endif
|
||||
// _WX_PEN_H_
|
||||
|
Reference in New Issue
Block a user