Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot to update this enhancement from last weekend

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-11-27 20:01:19 +00:00
parent bf2c4b942a
commit fd368161d9
2 changed files with 69 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/os2/bitmap.h
View File

@@ -55,6 +55,7 @@ public:
wxDC* m_pSelectedInto; wxDC* m_pSelectedInto;
HPS m_hPresentationSpace; HPS m_hPresentationSpace;
LONG m_lId;
// optional mask for transparent drawing // optional mask for transparent drawing
wxMask* m_pBitmapMask; wxMask* m_pBitmapMask;
@@ -210,6 +211,10 @@ public:
// An OS/2 version that probably doesn't do anything like the msw version // An OS/2 version that probably doesn't do anything like the msw version
wxBitmap GetBitmapForDC(wxDC& rDc) const; wxBitmap GetBitmapForDC(wxDC& rDc) const;
inline LONG GetId() const
{ return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();

99
include/wx/os2/pen.h
View File

@@ -24,19 +24,17 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
friend class WXDLLEXPORT wxPen; friend class WXDLLEXPORT wxPen;
public: public:
wxPenRefData(); wxPenRefData();
wxPenRefData(const wxPenRefData& data); wxPenRefData(const wxPenRefData& rData);
~wxPenRefData(); ~wxPenRefData();
protected: protected:
int m_width; int m_nWidth;
int m_style; int m_nStyle;
int m_join ; int m_nJoin;
int m_cap ; int m_nCap;
wxBitmap m_stipple ; wxBitmap m_vStipple;
int m_nbDash ; wxColour m_vColour;
wxPMDash * m_dash ; WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
wxColour m_colour;
WXHPEN m_hPen;
}; };
#define M_PENDATA ((wxPenRefData *)m_refData) #define M_PENDATA ((wxPenRefData *)m_refData)
@@ -47,50 +45,67 @@ class WXDLLEXPORT wxPen: public wxGDIObject
DECLARE_DYNAMIC_CLASS(wxPen) DECLARE_DYNAMIC_CLASS(wxPen)
public: public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width, int style); wxPen( const wxColour& rColour
wxPen(const wxBitmap& stipple, int width); ,int nWidth
inline wxPen(const wxPen& pen) { Ref(pen); } ,int nStyle
);
wxPen( const wxBitmap& rStipple
,int nWidth
);
inline wxPen(const wxPen& rPen) { Ref(rPen); }
~wxPen(); ~wxPen();
inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } inline wxPen& operator = (const wxPen& rPen) { if (*this == rPen) return (*this); Ref(rPen); return *this; }
inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; } inline bool operator == (const wxPen& rPen) { return m_refData == rPen.m_refData; }
inline bool operator != (const wxPen& pen) { return m_refData != pen.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 // Override in order to recreate the pen
void SetColour(const wxColour& col) ; //
void SetColour(unsigned char r, unsigned char g, unsigned char b) ; void SetColour(const wxColour& rColour);
void SetColour( unsigned char cRed
,unsigned char cGreen
,unsigned char cBlue
);
void SetWidth(int width) ; void SetWidth(int nWidth);
void SetStyle(int style) ; void SetStyle(int nStyle);
void SetStipple(const wxBitmap& stipple) ; void SetStipple(const wxBitmap& rStipple);
void SetDashes(int nb_dashes, const wxDash *dash) ; void SetDashes( int nNbDashes
void SetJoin(int join) ; ,const wxDash* pDash
void SetCap(int cap) ; );
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 wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_vColour : wxNullColour); };
inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_nWidth : 0); };
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_nStyle : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); };
inline int GetDashes(wxDash **ptr) const inline int GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 0); };
{
*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); }; inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); };
//
// Implementation // Implementation
//
//
// Useful helper: create the brush resource // Useful helper: create the brush resource
bool RealizeResource(); //
bool FreeResource(bool force = FALSE); bool RealizeResource(void);
WXHANDLE GetResourceHandle() ; bool FreeResource(bool bForce = FALSE);
bool IsFree() const; WXHANDLE GetResourceHandle(void);
void Unshare(); bool IsFree(void) const;
}; void Unshare(void);
private:
LINEBUNDLE m_vLineBundle;
AREABUNDLE m_vAreaBundle;
}; // end of CLASS wxPen
#endif #endif
// _WX_PEN_H_ // _WX_PEN_H_