AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moving common code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2007-12-10 20:09:53 +00:00
parent 43cf637fac
commit 05b735af0d
2 changed files with 9 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/carbon/brush.h
View File

@ -23,7 +23,6 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
{ {
public: public:
wxBrush(); wxBrush();
wxBrush(short macThemeBrush ) ;
wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxColour& col, int style = wxSOLID);
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
virtual ~wxBrush(); virtual ~wxBrush();
@ -41,9 +40,6 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
virtual int GetStyle() const ; virtual int GetStyle() const ;
wxBitmap *GetStipple() const ; wxBitmap *GetStipple() const ;
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const { return (m_refData != NULL) ; }
protected: protected:
virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

70
include/wx/mac/carbon/pen.h
View File

@ -18,46 +18,6 @@
class WXDLLIMPEXP_FWD_CORE wxPen; class WXDLLIMPEXP_FWD_CORE wxPen;
class WXDLLEXPORT wxPenRefData: public wxGDIRefData
{
friend class WXDLLIMPEXP_FWD_CORE wxPen;
public:
wxPenRefData();
wxPenRefData(const wxPenRefData& data);
virtual ~wxPenRefData();
wxPenRefData& operator=(const wxPenRefData& data);
bool operator==(const wxPenRefData& data) const
{
// we intentionally don't compare m_hPen fields here
return m_style == data.m_style &&
m_width == data.m_width &&
m_join == data.m_join &&
m_cap == data.m_cap &&
m_colour == data.m_colour &&
(m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
(m_style != wxUSER_DASH ||
(m_nbDash == data.m_nbDash &&
memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
}
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;
*/
};
#define M_PENDATA ((wxPenRefData *)m_refData)
// Pen // Pen
class WXDLLEXPORT wxPen: public wxGDIObject class WXDLLEXPORT wxPen: public wxGDIObject
{ {
@ -68,18 +28,8 @@ public:
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
virtual ~wxPen(); virtual ~wxPen();
inline bool operator == (const wxPen& pen) const bool operator == (const wxPen& pen) const;
{ bool operator != (const wxPen& pen) const { return !(*this == pen); }
const wxPenRefData *penData = (wxPenRefData *)pen.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& 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 // Override in order to recreate the pen
void SetColour(const wxColour& col) ; void SetColour(const wxColour& col) ;
@ -92,16 +42,14 @@ public:
void SetJoin(int join) ; void SetJoin(int join) ;
void SetCap(int cap) ; void SetCap(int cap) ;
inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; wxColour& GetColour() const ;
inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; int GetWidth() const;
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; int GetStyle() const;
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; int GetJoin() const;
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; int GetCap() const;
inline int GetDashes(wxDash **ptr) const { 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); }; wxBitmap *GetStipple() const ;
// Implementation // Implementation