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

Allow using wxBitmapBundle for wxButton bitmaps

Browse Source 
Take wxBitmapBundle in wxButton::SetBitmapLabel() and related functions
in order to be able to associate several bitmaps to be used in different
resolutions with the button, instead of just a single bitmap.
This commit is contained in:
Vadim Zeitlin
2021-10-10 19:32:43 +01:00
parent 2910327ef3
commit 4e5d2d97e2
36 changed files with 223 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/osx/cocoa/private.h
View File

@@ -140,7 +140,7 @@ public :
wxInt32 GetValue() const wxOVERRIDE;
void SetValue( wxInt32 v ) wxOVERRIDE;
wxBitmap GetBitmap() const wxOVERRIDE;
void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void SetBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE;
void SetBitmapPosition( wxDirection dir ) wxOVERRIDE;
void SetupTabs( const wxNotebook &notebook ) wxOVERRIDE;
void GetBestRect( wxRect *r ) const wxOVERRIDE;
@@ -356,12 +356,12 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
{
public:
wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetBitmap(const wxBitmapBundle& bitmap) wxOVERRIDE;
#if wxUSE_MARKUP
virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP
void SetPressedBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void SetPressedBitmap( const wxBitmapBundle& bitmap ) wxOVERRIDE;
void GetLayoutInset(int &left, int &top, int &right, int &bottom) const wxOVERRIDE;
void SetAcceleratorFromLabel(const wxString& label);