fixed gcc warnings about not calling base class ctor explicitly in copy ctors (patch 1028986)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,7 +27,7 @@ public:
|
|||||||
wxAcceleratorTable();
|
wxAcceleratorTable();
|
||||||
|
|
||||||
// copy ctor
|
// copy ctor
|
||||||
wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
|
wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); }
|
||||||
|
|
||||||
// load from .rc resource (Windows specific)
|
// load from .rc resource (Windows specific)
|
||||||
wxAcceleratorTable(const wxString& resource);
|
wxAcceleratorTable(const wxString& resource);
|
||||||
|
@@ -46,7 +46,7 @@ public:
|
|||||||
wxBitmap() { Init(); }
|
wxBitmap() { Init(); }
|
||||||
|
|
||||||
// Copy constructors
|
// Copy constructors
|
||||||
wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
|
wxBitmap(const wxBitmap& bitmap) : wxGDIImage(bitmap) { Init(); Ref(bitmap); }
|
||||||
|
|
||||||
// Initialize with raw data
|
// Initialize with raw data
|
||||||
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
||||||
|
@@ -32,7 +32,7 @@ public:
|
|||||||
wxBrush();
|
wxBrush();
|
||||||
wxBrush(const wxColour& col, int style = wxSOLID);
|
wxBrush(const wxColour& col, int style = wxSOLID);
|
||||||
wxBrush(const wxBitmap& stipple);
|
wxBrush(const wxBitmap& stipple);
|
||||||
wxBrush(const wxBrush& brush) { Ref(brush); }
|
wxBrush(const wxBrush& brush) : wxGDIObject(brush) { Ref(brush); }
|
||||||
virtual ~wxBrush();
|
virtual ~wxBrush();
|
||||||
|
|
||||||
virtual void SetColour(const wxColour& col);
|
virtual void SetColour(const wxColour& col);
|
||||||
|
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxCursor : public wxGDIImage
|
|||||||
public:
|
public:
|
||||||
// constructors
|
// constructors
|
||||||
wxCursor();
|
wxCursor();
|
||||||
wxCursor(const wxCursor& cursor) { Ref(cursor); }
|
wxCursor(const wxCursor& cursor) : wxGDIImage(cursor) { Ref(cursor); }
|
||||||
wxCursor(const wxImage& image);
|
wxCursor(const wxImage& image);
|
||||||
wxCursor(const char bits[], int width, int height,
|
wxCursor(const char bits[], int width, int height,
|
||||||
int hotSpotX = -1, int hotSpotY = -1,
|
int hotSpotX = -1, int hotSpotY = -1,
|
||||||
|
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
|
|||||||
public:
|
public:
|
||||||
// ctors and such
|
// ctors and such
|
||||||
wxFont() { Init(); }
|
wxFont() { Init(); }
|
||||||
wxFont(const wxFont& font) { Init(); Ref(font); }
|
wxFont(const wxFont& font) : wxFontBase(font) { Init(); Ref(font); }
|
||||||
|
|
||||||
wxFont(int size,
|
wxFont(int size,
|
||||||
int family,
|
int family,
|
||||||
|
@@ -44,7 +44,7 @@ public:
|
|||||||
m_handle = 0;
|
m_handle = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxGDIImageRefData(const wxGDIImageRefData& data)
|
wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData(data)
|
||||||
{
|
{
|
||||||
m_width = data.m_width;
|
m_width = data.m_width;
|
||||||
m_height = data.m_height;
|
m_height = data.m_height;
|
||||||
|
@@ -49,7 +49,7 @@ public:
|
|||||||
wxIcon() { }
|
wxIcon() { }
|
||||||
|
|
||||||
// copy
|
// copy
|
||||||
wxIcon(const wxIcon& icon) { Ref(icon); }
|
wxIcon(const wxIcon& icon) : wxGDIImage(icon) { Ref(icon); }
|
||||||
|
|
||||||
// from raw data
|
// from raw data
|
||||||
wxIcon(const char bits[], int width, int height);
|
wxIcon(const char bits[], int width, int height);
|
||||||
|
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
wxPalette(void);
|
wxPalette(void);
|
||||||
inline wxPalette(const wxPalette& palette) { Ref(palette); }
|
inline wxPalette(const wxPalette& palette) : wxGDIObject(palette) { Ref(palette); }
|
||||||
|
|
||||||
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||||
~wxPalette(void);
|
~wxPalette(void);
|
||||||
|
@@ -81,7 +81,7 @@ 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);
|
||||||
wxPen(const wxPen& pen) { Ref(pen); }
|
wxPen(const wxPen& pen) : wxGDIObject(pen) { Ref(pen); }
|
||||||
virtual ~wxPen();
|
virtual ~wxPen();
|
||||||
|
|
||||||
wxPen& operator=(const wxPen& pen)
|
wxPen& operator=(const wxPen& pen)
|
||||||
|
@@ -61,7 +61,7 @@ public:
|
|||||||
virtual ~wxRegion();
|
virtual ~wxRegion();
|
||||||
|
|
||||||
// Copying
|
// Copying
|
||||||
wxRegion(const wxRegion& r)
|
wxRegion(const wxRegion& r) : wxGDIObject(r)
|
||||||
{ Ref(r); }
|
{ Ref(r); }
|
||||||
wxRegion& operator = (const wxRegion& r)
|
wxRegion& operator = (const wxRegion& r)
|
||||||
{ Ref(r); return (*this); }
|
{ Ref(r); return (*this); }
|
||||||
@@ -152,7 +152,7 @@ class WXDLLEXPORT wxRegionIterator : public wxObject
|
|||||||
public:
|
public:
|
||||||
wxRegionIterator() { Init(); }
|
wxRegionIterator() { Init(); }
|
||||||
wxRegionIterator(const wxRegion& region);
|
wxRegionIterator(const wxRegion& region);
|
||||||
wxRegionIterator(const wxRegionIterator& ri) { Init(); *this = ri; }
|
wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; }
|
||||||
|
|
||||||
wxRegionIterator& operator=(const wxRegionIterator& ri);
|
wxRegionIterator& operator=(const wxRegionIterator& ri);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user