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

fix for gcc warning about base class initialization in copy ctors given with -Wall

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-30 00:48:34 +00:00
parent 3c542a4de0
commit f0794a4ccd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/mac/carbon/bitmap.h
View File

@@ -110,7 +110,10 @@ public:
// Copy constructors // Copy constructors
wxBitmap(const wxBitmap& bitmap) wxBitmap(const wxBitmap& bitmap)
{ Ref(bitmap); } : wxBitmapBase()
{
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);

7
include/wx/mac/carbon/icon.h
View File

@@ -26,7 +26,10 @@ public:
// Copy constructors // Copy constructors
wxIcon(const wxIcon& icon) wxIcon(const wxIcon& icon)
{ Ref(icon); } : wxGDIObject()
{
Ref(icon);
}
wxIcon(const char **data); wxIcon(const char **data);
wxIcon(char **data); wxIcon(char **data);
@@ -62,7 +65,7 @@ public:
void SetHeight(int h); void SetHeight(int h);
void SetDepth(int d); void SetDepth(int d);
void SetOk(bool isOk); void SetOk(bool isOk);
WXHICON GetHICON() const ; WXHICON GetHICON() const ;
DECLARE_DYNAMIC_CLASS(wxIcon) DECLARE_DYNAMIC_CLASS(wxIcon)