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

Compilation fix for old GCC versions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-10-30 08:07:51 +00:00
parent 53a64063c8
commit 4a4bf7eefb
5 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/gtk/bitmap.h
View File

@@ -54,6 +54,13 @@ public:
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits ); wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
// needed for old GCC
wxBitmap(char** data)
{
*this = wxBitmap(wx_const_cast(const char* const*, data));
}
#endif
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap(); virtual ~wxBitmap();

7
include/wx/gtk1/bitmap.h
View File

@@ -68,6 +68,13 @@ public:
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits ); wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
// needed for old GCC
wxBitmap(char** data)
{
*this = wxBitmap(wx_const_cast(const char* const*, data));
}
#endif
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap(); virtual ~wxBitmap();

2
include/wx/msw/bitmap.h
View File

@@ -45,7 +45,7 @@ public:
// Initialize with XPM data // Initialize with XPM data
wxBitmap(const char* const* data); wxBitmap(const char* const* data);
#ifdef __BORLANDC__ #if defined(__BORLANDC__) || (defined (__GNUC__) && __GNUC__ < 3)
// needed for Borland 5.5 // needed for Borland 5.5
wxBitmap(char** data) wxBitmap(char** data)
{ {

7
include/wx/os2/bitmap.h
View File

@@ -85,6 +85,13 @@ public:
// Initialize with XPM data // Initialize with XPM data
wxBitmap(const char* const* bits); wxBitmap(const char* const* bits);
#if defined (__GNUC__) && __GNUC__ < 3
// needed for old GCC
wxBitmap(char** data)
{
*this = wxBitmap(wx_const_cast(const char* const*, data));
}
#endif
// Load a resource // Load a resource
wxBitmap( int nId wxBitmap( int nId

7
include/wx/x11/bitmap.h
View File

@@ -74,6 +74,13 @@ public:
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits ); wxBitmap( const char* const* bits );
#if defined (__GNUC__) && __GNUC__ < 3
// needed for old GCC
wxBitmap(char** data)
{
*this = wxBitmap(wx_const_cast(const char* const*, data));
}
#endif
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
virtual ~wxBitmap(); virtual ~wxBitmap();