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

fixed operator=(), ==() and !=() for wxPen

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-08 14:20:50 +00:00
parent 6c6bf502f9
commit 5c57bf07fa
1 changed files with 95 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
include/wx/msw/pen.h
View File

@@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pen.h // Name: wx/pen.h
// Purpose: wxPen class // Purpose: wxPen class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
// Created: 01/02/97 // Created: 01/02/97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
@@ -13,7 +13,7 @@
#define _WX_PEN_H_ #define _WX_PEN_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "pen.h" #pragma interface "pen.h"
#endif #endif
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
@@ -24,109 +24,122 @@ typedef WXDWORD wxMSWDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
class WXDLLEXPORT wxPenRefData: public wxGDIRefData // VZ: this class should be made private
class WXDLLEXPORT wxPenRefData : public wxGDIRefData
{ {
friend class WXDLLEXPORT wxPen;
public: public:
wxPenRefData(); wxPenRefData();
wxPenRefData(const wxPenRefData& data); wxPenRefData(const wxPenRefData& data);
~wxPenRefData(); virtual ~wxPenRefData();
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 == data.m_stipple) &&
(m_style != wxUSER_DASH ||
(m_nbDash == data.m_nbDash &&
memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
}
protected: protected:
int m_width; int m_width;
int m_style; int m_style;
int m_join ; int m_join;
int m_cap ; int m_cap;
wxBitmap m_stipple ; wxBitmap m_stipple;
int m_nbDash ; int m_nbDash;
wxDash * m_dash ; wxDash * m_dash;
wxColour m_colour; wxColour m_colour;
WXHPEN m_hPen; WXHPEN m_hPen;
private: private:
// Cannot use friend class WXDLLEXPORT wxPen;
// DECLARE_NO_COPY_CLASS(wxPenRefData)
// because copy constructor is explicitly declared above; // Cannot use
// but no copy assignment operator is defined, so declare // DECLARE_NO_COPY_CLASS(wxPenRefData)
// it private to prevent the compiler from defining it: // because copy constructor is explicitly declared above;
// but no copy assignment operator is defined, so declare
// it private to prevent the compiler from defining it:
wxPenRefData& operator=(const wxPenRefData&); wxPenRefData& operator=(const wxPenRefData&);
}; };
#define M_PENDATA ((wxPenRefData *)m_refData) #define M_PENDATA ((wxPenRefData *)m_refData)
#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData) #define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)
// ----------------------------------------------------------------------------
// Pen // Pen
class WXDLLEXPORT wxPen: public wxGDIObject // ----------------------------------------------------------------------------
class WXDLLEXPORT wxPen : public wxGDIObject
{ {
DECLARE_DYNAMIC_CLASS(wxPen)
public: public:
wxPen(); wxPen();
wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
wxPen(const wxBitmap& stipple, int width); wxPen(const wxBitmap& stipple, int width);
inline wxPen(const wxPen& pen) { Ref(pen); } wxPen(const wxPen& pen) { Ref(pen); }
~wxPen(); virtual ~wxPen();
inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } wxPen& operator=(const wxPen& pen)
inline bool operator == (const wxPen& pen) const {
{ if ( this != &pen )
// It is impossible to know if the user dashes have changed, Ref(pen);
// so we must assume that they have
if ( m_refData && pen.m_refData )
{
if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
return false;
}
return m_refData == pen.m_refData;
}
inline bool operator != (const wxPen& pen) const
{
// It is impossible to know if the user dashes have changed,
// so we must assume that they have
if ( m_refData && pen.m_refData )
{
if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
return true;
}
return m_refData != pen.m_refData;
}
virtual bool Ok() const { return (m_refData != NULL) ; } return *this;
}
// Override in order to recreate the pen bool operator==(const wxPen& pen) const
void SetColour(const wxColour& col) ; {
void SetColour(unsigned char r, unsigned char g, unsigned char b); const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
void SetWidth(int width) ; // an invalid pen is only equal to another invalid pen
void SetStyle(int style) ; return m_refData ? penData && *M_PENDATA == *penData : !penData;
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); }; bool operator!=(const wxPen& pen) const { return !(*this == pen); }
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);
}
wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; virtual bool Ok() const { return (m_refData != NULL); }
// Internal // Override in order to recreate the pen
bool RealizeResource(); void SetColour(const wxColour& col);
bool FreeResource(bool force = FALSE); void SetColour(unsigned char r, unsigned char g, unsigned char b);
WXHANDLE GetResourceHandle() const;
bool IsFree() const; void SetWidth(int width);
void Unshare(); 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 { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
int GetDashes(wxDash **ptr) const
{
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
}
wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
inline int GetDashCount() const { 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();
private:
DECLARE_DYNAMIC_CLASS(wxPen)
}; };
int wx2msPenStyle(int wx_style); #endif // _WX_PEN_H_
#endif
// _WX_PEN_H_