great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,11 +75,9 @@ public:
|
||||
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
||||
wxBitmap(const char **bits) { CreateFromXpm(bits); }
|
||||
wxBitmap(char **bits) { CreateFromXpm((const char **)bits); }
|
||||
wxBitmap(const wxBitmap& bmp);
|
||||
wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
|
||||
wxBitmap(const wxImage& image, int depth = -1);
|
||||
~wxBitmap() {}
|
||||
wxBitmap& operator = (const wxBitmap& bmp);
|
||||
bool operator == (const wxBitmap& bmp) const;
|
||||
bool operator != (const wxBitmap& bmp) const;
|
||||
bool Ok() const;
|
||||
|
@@ -33,9 +33,7 @@ public:
|
||||
wxBrush() {}
|
||||
wxBrush(const wxColour &colour, int style = wxSOLID);
|
||||
wxBrush(const wxBitmap &stippleBitmap);
|
||||
wxBrush(const wxBrush &brush);
|
||||
~wxBrush() {}
|
||||
wxBrush& operator = (const wxBrush& brush);
|
||||
bool operator == (const wxBrush& brush) const;
|
||||
bool operator != (const wxBrush& brush) const;
|
||||
bool Ok() const;
|
||||
|
@@ -26,7 +26,6 @@ public:
|
||||
|
||||
wxCursor();
|
||||
wxCursor(int cursorId);
|
||||
wxCursor(const wxCursor &cursor);
|
||||
wxCursor(const char bits[], int width, int height,
|
||||
int hotSpotX=-1, int hotSpotY=-1,
|
||||
const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);
|
||||
@@ -34,7 +33,6 @@ public:
|
||||
long flags = wxBITMAP_TYPE_CUR_RESOURCE,
|
||||
int hotSpotX = 0, int hotSpotY = 0);
|
||||
~wxCursor();
|
||||
wxCursor& operator = ( const wxCursor& cursor );
|
||||
bool operator == (const wxCursor& cursor) const;
|
||||
bool operator != (const wxCursor& cursor) const;
|
||||
bool Ok() const;
|
||||
|
@@ -30,13 +30,10 @@ class WXDLLEXPORT wxFont : public wxFontBase
|
||||
{
|
||||
public:
|
||||
// ctors and such
|
||||
wxFont() { Init(); }
|
||||
wxFont(const wxFont& font) { Init(); Ref(font); }
|
||||
wxFont() { }
|
||||
|
||||
wxFont(const wxNativeFontInfo& info)
|
||||
{
|
||||
Init();
|
||||
|
||||
(void)Create(info);
|
||||
}
|
||||
|
||||
@@ -48,8 +45,6 @@ public:
|
||||
const wxString& face = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
|
||||
{
|
||||
Init();
|
||||
|
||||
(void)Create(size, family, style, weight, underlined, face, encoding);
|
||||
}
|
||||
|
||||
@@ -65,9 +60,6 @@ public:
|
||||
|
||||
~wxFont() {}
|
||||
|
||||
// assignment
|
||||
wxFont& operator=(const wxFont& font);
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
virtual int GetFamily() const;
|
||||
@@ -90,9 +82,6 @@ public:
|
||||
struct font_t *GetMGLfont_t(float scale, bool antialiased);
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init() {}
|
||||
|
||||
// ref counting code
|
||||
virtual wxObjectRefData *CreateRefData() const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
|
@@ -28,7 +28,6 @@ class WXDLLEXPORT wxIcon: public wxBitmap
|
||||
{
|
||||
public:
|
||||
wxIcon() : wxBitmap() {}
|
||||
wxIcon(const wxIcon& icon);
|
||||
wxIcon(const char **bits, int width=-1, int height=-1);
|
||||
wxIcon(char **bits, int width=-1, int height=-1);
|
||||
|
||||
@@ -43,7 +42,6 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
wxIcon& operator=(const wxIcon& icon);
|
||||
bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
|
||||
bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
|
||||
|
||||
|
@@ -34,9 +34,7 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
|
||||
public:
|
||||
wxPalette();
|
||||
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||
wxPalette(const wxPalette& palette);
|
||||
~wxPalette();
|
||||
wxPalette& operator = (const wxPalette& palette);
|
||||
bool operator == (const wxPalette& palette) const;
|
||||
bool operator != (const wxPalette& palette) const;
|
||||
virtual bool Ok() const;
|
||||
|
@@ -33,9 +33,7 @@ public:
|
||||
wxPen() {}
|
||||
wxPen(const wxColour &colour, int width = 1, int style = wxSOLID);
|
||||
wxPen(const wxBitmap& stipple, int width);
|
||||
wxPen(const wxPen& pen);
|
||||
~wxPen() {}
|
||||
wxPen& operator = (const wxPen& pen);
|
||||
bool operator == (const wxPen& pen) const;
|
||||
bool operator != (const wxPen& pen) const;
|
||||
|
||||
|
@@ -49,12 +49,6 @@ public:
|
||||
wxRegion();
|
||||
~wxRegion();
|
||||
|
||||
//# Copying
|
||||
inline wxRegion(const wxRegion& r)
|
||||
{ Ref(r); }
|
||||
inline wxRegion& operator = (const wxRegion& r)
|
||||
{ Ref(r); return (*this); }
|
||||
|
||||
//# Modify region
|
||||
// Clear current region
|
||||
void Clear(void);
|
||||
|
Reference in New Issue
Block a user