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

Deprecate Set{Height,Width,Depth} for other platforms as well

Browse Source 
Fixes GTK build with --disable-compat30
See https://github.com/wxWidgets/wxWidgets/pull/925
This commit is contained in:
Paul Cornett
2018-09-23 20:02:21 -07:00
parent 6bc086747e
commit 7872b9fd38
8 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/dfb/bitmap.h
View File

@@ -75,9 +75,11 @@ public:
bool HasAlpha() const;
// implementation:
virtual void SetHeight(int height);
virtual void SetWidth(int width);
virtual void SetDepth(int depth);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED(virtual void SetHeight(int height));
wxDEPRECATED(virtual void SetWidth(int width));
wxDEPRECATED(virtual void SetDepth(int depth));
#endif
// get underlying native representation:
wxIDirectFBSurfacePtr GetDirectFBSurface() const;

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

@@ -126,9 +126,11 @@ public:
// implementation
// --------------
void SetHeight( int height ) wxOVERRIDE;
void SetWidth( int width ) wxOVERRIDE;
void SetDepth( int depth ) wxOVERRIDE;
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED(void SetHeight( int height ) wxOVERRIDE);
wxDEPRECATED(void SetWidth( int width ) wxOVERRIDE);
wxDEPRECATED(void SetDepth( int depth ) wxOVERRIDE);
#endif
#ifdef __WXGTK3__
GdkPixbuf* GetPixbufNoMask() const;

8
include/wx/qt/bitmap.h
View File

@@ -66,9 +66,11 @@ public:
virtual bool CopyFromIcon(const wxIcon& icon);
// implementation:
virtual void SetHeight(int height);
virtual void SetWidth(int width);
virtual void SetDepth(int depth);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED(virtual void SetHeight(int height));
wxDEPRECATED(virtual void SetWidth(int width));
wxDEPRECATED(virtual void SetDepth(int depth));
#endif
void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data);

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

@@ -124,9 +124,11 @@ public:
// implementation
// --------------
void SetHeight( int height );
void SetWidth( int width );
void SetDepth( int depth );
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED(void SetHeight( int height ));
wxDEPRECATED(void SetWidth( int width ));
wxDEPRECATED(void SetDepth( int depth ));
#endif
void SetPixmap( WXPixmap pixmap );
void SetBitmap( WXPixmap bitmap );